From f8c2afe95dbcd4acd2a7d939ec80da6f16773aec Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Tue, 10 Dec 2024 16:17:00 -0500 Subject: [PATCH] adding test --- packages/dd-trace/src/config.js | 3 +-- packages/dd-trace/test/config.spec.js | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/dd-trace/src/config.js b/packages/dd-trace/src/config.js index 794d058426f..02c24207939 100644 --- a/packages/dd-trace/src/config.js +++ b/packages/dd-trace/src/config.js @@ -740,8 +740,7 @@ class Config { this._setBoolean(env, 'crashtracking.enabled', DD_CRASHTRACKING_ENABLED) this._setBoolean(env, 'codeOriginForSpans.enabled', DD_CODE_ORIGIN_FOR_SPANS_ENABLED) this._setString(env, 'dbmPropagationMode', DD_DBM_PROPAGATION_MODE) - this._setString(env, 'dogstatsd.hostname', DD_DOGSTATSD_HOSTNAME) - if (DD_DOGSTATSD_HOST) this._setString(env, 'dogstatsd.hostname', DD_DOGSTATSD_HOST) + this._setString(env, 'dogstatsd.hostname', DD_DOGSTATSD_HOST || DD_DOGSTATSD_HOSTNAME) this._setString(env, 'dogstatsd.port', DD_DOGSTATSD_PORT) this._setBoolean(env, 'dsmEnabled', DD_DATA_STREAMS_ENABLED) this._setBoolean(env, 'dynamicInstrumentationEnabled', DD_DYNAMIC_INSTRUMENTATION_ENABLED) diff --git a/packages/dd-trace/test/config.spec.js b/packages/dd-trace/test/config.spec.js index 62fe403eaa8..7734708832e 100644 --- a/packages/dd-trace/test/config.spec.js +++ b/packages/dd-trace/test/config.spec.js @@ -1836,6 +1836,15 @@ describe('Config', () => { expect(config.appsec.apiSecurity.enabled).to.be.true }) + it('should prioritize DD_DOGSTATSD_HOST over DD_DOGSTATSD_HOSTNAME', () => { + process.env.DD_DOGSTATSD_HOSTNAME = 'dsd-agent' + process.env.DD_DOGSTATSD_HOST = 'localhost' + + const config = new Config() + + expect(config).to.have.nested.property('dogstatsd.hostname', 'localhost') + }) + context('auto configuration w/ unix domain sockets', () => { context('on windows', () => { it('should not be used', () => {