Skip to content
Draft
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
8 changes: 4 additions & 4 deletions ci/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.')
Expand All @@ -57,7 +57,7 @@ if (isTestWorker) {
}
} else {
if (isAgentlessEnabled) {
if (getEnvironmentVariable('DD_API_KEY')) {
if (getAPIKey()) {
baseOptions.experimental = {
exporter: 'datadog'
}
Expand Down
12 changes: 12 additions & 0 deletions packages/dd-trace/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -1464,6 +1464,18 @@ class Config {
}
}
}

isCIVisibilityEnabled () {
return this.isCiVisibility
}

isCiVisibilityAgentlessEnabled () {
return this.isCiVisibilityAgentless
}

getAPIKey () {
return this.apiKey
}
}

function handleOtel (tagString) {
Expand Down
Loading