Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/handler.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
getEnvValue,
emitTelemetryOnErrorOutsideHandler,
} from "./index.js";
import { logDebug, logError } from "./utils/index.js";
import { logDebug, logError, setFeatureFlagsBaseUrl } from "./utils/index.js";
import { load } from "./runtime/index.js";
import { initTracer } from "./runtime/module_importer.js";

Expand All @@ -20,6 +20,8 @@ if (process.env.DD_TRACE_STARTUP_LOGS === undefined) {
logDebug("disabled dd-trace startup logs");
}

setFeatureFlagsBaseUrl();

if (getEnvValue("DD_TRACE_ENABLED", "true").toLowerCase() === "true") {
initTracer();
}
Expand Down
31 changes: 31 additions & 0 deletions src/utils/feature-flags.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import fs from "fs";
import { setFeatureFlagsBaseUrl } from "./feature-flags";

const BASE_URL_ENV_VAR = "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL";

describe("setFeatureFlagsBaseUrl", () => {
const ORIGINAL_ENV = process.env;

afterEach(() => {
process.env = ORIGINAL_ENV;
jest.restoreAllMocks();
});

it.each([
[true, {}, "http://127.0.0.1:8126"],
[true, { DD_API_KEY: "" }, "http://127.0.0.1:8126"],
[true, { DD_API_KEY: " " }, "http://127.0.0.1:8126"],
[true, { DD_API_KEY_SECRET_ARN: "arn" }, "http://127.0.0.1:8126"],
[true, { DD_API_KEY: "key" }, undefined],
[true, { DATADOG_API_KEY: "key" }, undefined],
[true, { [BASE_URL_ENV_VAR]: "http://custom" }, "http://custom"],
[false, {}, undefined],
])("extension=%s env=%j sets %s", (extension, env, expected) => {
process.env = { ...env };
jest.spyOn(fs, "existsSync").mockReturnValue(extension);

setFeatureFlagsBaseUrl();

expect(process.env[BASE_URL_ENV_VAR]).toBe(expected);
});
});
20 changes: 20 additions & 0 deletions src/utils/feature-flags.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import fs from "fs";
import { logDebug } from "./log";

const BASE_URL_ENV_VAR = "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL";

// The extension forwards feature flag config requests with the API key it
// resolved (e.g. from DD_API_KEY_SECRET_ARN). Only use it when no API key is
// set: an extension without that route returns 404, and the tracer does not
// fall back to the default endpoint. dd-trace reads DATADOG_API_KEY as an alias.
export function setFeatureFlagsBaseUrl() {
if (
fs.existsSync("/opt/extensions/datadog-agent") &&
!process.env.DD_API_KEY?.trim() &&
!process.env.DATADOG_API_KEY?.trim() &&
!process.env[BASE_URL_ENV_VAR]?.trim()
) {
process.env[BASE_URL_ENV_VAR] = "http://127.0.0.1:8126";
logDebug("set feature flags configuration base URL to the extension");
}
}
1 change: 1 addition & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ export { logWarning, logError, logDebug, Logger, setLogLevel, setLogger, LogLeve
export { tagObject } from "./tag-object";
export { updateDDTags } from "./dd_tags";
export { batchItemFailureCount, isBatchItemFailure } from "./batch-item-failures";
export { setFeatureFlagsBaseUrl } from "./feature-flags";
Loading