diff --git a/ci/init.js b/ci/init.js index a1ef9054f8b..83918486ccf 100644 --- a/ci/init.js +++ b/ci/init.js @@ -2,9 +2,9 @@ /* eslint-disable no-console */ const tracer = require('../packages/dd-trace') -const { isTrue, isFalse } = require('../packages/dd-trace/src/util') const log = require('../packages/dd-trace/src/log') const { getEnvironmentVariable } = require('../packages/dd-trace/src/config-helper') +const { isCIVisibilityEnabled, isCiVisibilityAgentlessEnabled, getAPIKey } = require('../packages/dd-trace/src/config') const PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm'] const DEFAULT_FLUSH_INTERVAL = 5000 @@ -42,8 +42,8 @@ const baseOptions = { flushInterval: isJestWorker ? JEST_FLUSH_INTERVAL : DEFAULT_FLUSH_INTERVAL } -let shouldInit = !isFalse(getEnvironmentVariable('DD_CIVISIBILITY_ENABLED')) -const isAgentlessEnabled = isTrue(getEnvironmentVariable('DD_CIVISIBILITY_AGENTLESS_ENABLED')) +let shouldInit = isCIVisibilityEnabled() +const isAgentlessEnabled = isCiVisibilityAgentlessEnabled() if (!isTestWorker && isPackageManager()) { log.debug('dd-trace is not initialized in a package manager.') @@ -57,7 +57,7 @@ if (isTestWorker) { } } else { if (isAgentlessEnabled) { - if (getEnvironmentVariable('DD_API_KEY')) { + if (getAPIKey()) { baseOptions.experimental = { exporter: 'datadog' } diff --git a/packages/dd-trace/src/config.js b/packages/dd-trace/src/config.js index fd02d3766ad..5111dd19754 100644 --- a/packages/dd-trace/src/config.js +++ b/packages/dd-trace/src/config.js @@ -1464,6 +1464,18 @@ class Config { } } } + + isCIVisibilityEnabled () { + return this.isCiVisibility + } + + isCiVisibilityAgentlessEnabled () { + return this.isCiVisibilityAgentless + } + + getAPIKey () { + return this.apiKey + } } function handleOtel (tagString) {