File tree Expand file tree Collapse file tree 2 files changed +14
-4
lines changed
Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -627,8 +627,12 @@ class Config {
627627 target . otelMaxExportBatchSize = nonNegInt ( OTEL_BSP_MAX_EXPORT_BATCH_SIZE , 'OTEL_BSP_MAX_EXPORT_BATCH_SIZE' , false )
628628 target . otelMaxQueueSize = nonNegInt ( OTEL_BSP_MAX_QUEUE_SIZE , 'OTEL_BSP_MAX_QUEUE_SIZE' , false )
629629
630- const otelMetricsExporter = ! OTEL_METRICS_EXPORTER || OTEL_METRICS_EXPORTER . toLowerCase ( ) !== 'none'
631- this . #setBoolean( target , 'otelMetricsEnabled' , DD_METRICS_OTEL_ENABLED && otelMetricsExporter )
630+ const otelMetricsExporterEnabled = OTEL_METRICS_EXPORTER ?. toLowerCase ( ) !== 'none'
631+ this . #setBoolean(
632+ target ,
633+ 'otelMetricsEnabled' ,
634+ DD_METRICS_OTEL_ENABLED && isTrue ( DD_METRICS_OTEL_ENABLED ) && otelMetricsExporterEnabled
635+ )
632636 // Set OpenTelemetry metrics configuration with specific _METRICS_ vars
633637 // taking precedence over generic _EXPORTERS_ vars
634638 if ( OTEL_EXPORTER_OTLP_ENDPOINT || OTEL_EXPORTER_OTLP_METRICS_ENDPOINT ) {
Original file line number Diff line number Diff line change @@ -834,11 +834,17 @@ describe('OpenTelemetry Meter Provider', () => {
834834 } )
835835
836836 describe ( 'Initialization' , ( ) => {
837- it ( 'does not initialize when OTEL metrics are disabled ' , ( ) => {
837+ it ( 'does not initialize when OTEL metrics configuration is unset ' , ( ) => {
838838 const { meterProvider } = setupTracer ( { DD_METRICS_OTEL_ENABLED : undefined } )
839839 const { MeterProvider } = require ( '../../src/opentelemetry/metrics' )
840840
841- // Should return no-op provider when disabled, not our custom MeterProvider
841+ assert . strictEqual ( meterProvider instanceof MeterProvider , false )
842+ } )
843+
844+ it ( 'does not initialize when OTEL metrics are explicitly disabled' , ( ) => {
845+ const { meterProvider } = setupTracer ( { DD_METRICS_OTEL_ENABLED : 'false' } )
846+ const { MeterProvider } = require ( '../../src/opentelemetry/metrics' )
847+
842848 assert . strictEqual ( meterProvider instanceof MeterProvider , false )
843849 } )
844850
You can’t perform that action at this time.
0 commit comments