Skip to content

Commit 83e3cec

Browse files
khanayan123juan-fernandez
authored andcommitted
Add Support For Mapping OTEL_LOG_LEVEL='debug' (#4363)
* An OTEL_LOG_LEVEL of debug should also be mapped to DD_TRACE_DEBUG=true
1 parent a610ee2 commit 83e3cec

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

packages/dd-trace/src/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ class Config {
170170
// Configure the logger first so it can be used to warn about other configs
171171
this.debug = isTrue(coalesce(
172172
process.env.DD_TRACE_DEBUG,
173+
process.env.OTEL_LOG_LEVEL && process.env.OTEL_LOG_LEVEL === 'debug',
173174
false
174175
))
175176
this.logger = options.logger

packages/dd-trace/test/config.spec.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ describe('Config', () => {
7777
process.env.DD_SERVICE = 'service'
7878
process.env.OTEL_SERVICE_NAME = 'otel_service'
7979
process.env.DD_TRACE_LOG_LEVEL = 'error'
80+
process.env.DD_TRACE_DEBUG = 'false'
8081
process.env.OTEL_LOG_LEVEL = 'debug'
8182
process.env.DD_TRACE_SAMPLE_RATE = '0.5'
8283
process.env.OTEL_TRACES_SAMPLER = 'traceidratio'
@@ -93,6 +94,7 @@ describe('Config', () => {
9394

9495
const config = new Config()
9596

97+
expect(config).to.have.property('debug', false)
9698
expect(config).to.have.property('service', 'service')
9799
expect(config).to.have.property('logLevel', 'error')
98100
expect(config).to.have.property('sampleRate', 0.5)
@@ -109,7 +111,7 @@ describe('Config', () => {
109111

110112
it('should initialize with OTEL environment variables when DD env vars are not set', () => {
111113
process.env.OTEL_SERVICE_NAME = 'otel_service'
112-
process.env.OTEL_LOG_LEVEL = 'warn'
114+
process.env.OTEL_LOG_LEVEL = 'debug'
113115
process.env.OTEL_TRACES_SAMPLER = 'traceidratio'
114116
process.env.OTEL_TRACES_SAMPLER_ARG = '0.1'
115117
process.env.OTEL_TRACES_EXPORTER = 'none'
@@ -119,8 +121,9 @@ describe('Config', () => {
119121

120122
const config = new Config()
121123

124+
expect(config).to.have.property('debug', true)
122125
expect(config).to.have.property('service', 'otel_service')
123-
expect(config).to.have.property('logLevel', 'warn')
126+
expect(config).to.have.property('logLevel', 'debug')
124127
expect(config).to.have.property('sampleRate', 0.1)
125128
expect(config).to.have.property('runtimeMetrics', false)
126129
expect(config.tags).to.include({ foo: 'bar1', baz: 'qux1' })

0 commit comments

Comments
 (0)