Adjust proposal

Author: 72636c

src/createStatsDClient.test.ts

@@ -12,18 +12,28 @@ describe('createStatsDClient', () => {
   });
 
   it('should handle null config values', () => {
-    expect(
-      createStatsDClient(StatsD, {
-        metricsServer: null,
-        name: 'test',
-      }),
-    ).toBeInstanceOf(Object);
+    delete process.env.DD_ENV;
+    delete process.env.DD_SERVICE;
+    delete process.env.DD_VERSION;
+
+    const client = createStatsDClient(StatsD, {
+      metricsServer: null,
+      name: 'test',
+    });
+
+    client.timing('timing', new Date(1));
+
+    expect(client.mockBuffer).toMatchInlineSnapshot(`
+      [
+        "test.timing:1754822723343|ms",
+      ]
+    `);
   });
 
   it('should support the environment config option', () => {
-    process.env.DD_ENV = 'my_env';
-    process.env.DD_SERVICE = 'my_service';
-    process.env.DD_VERSION = 'my_version';
+    delete process.env.DD_ENV;
+    delete process.env.DD_SERVICE;
+    delete process.env.DD_VERSION;
 
     const client = createStatsDClient(StatsD, {
       environment: 'deprecated-but-still-here',
@@ -40,14 +50,13 @@ describe('createStatsDClient', () => {
     `);
   });
 
-  it('should allow reading Datadog tags from environment', () => {
-    process.env.DD_ENV = 'my_env';
+  it('should append DD_ENV from environment', () => {
+    process.env.DD_ENV = 'env_var';
     process.env.DD_SERVICE = 'my_service';
     process.env.DD_VERSION = 'my_version';
 
     const client = createStatsDClient(StatsD, {
-      environment: 'dd_env_takes_precedence_over_me',
-      includeDataDogTags: true,
+      environment: 'client_config',
       metricsServer: null,
       name: 'test',
     });
@@ -56,7 +65,7 @@ describe('createStatsDClient', () => {
 
     expect(client.mockBuffer).toMatchInlineSnapshot(`
       [
-        "test.counter:1|c|#env:my_env,service:my_service,version:my_version",
+        "test.counter:1|c|#env:client_config,env:env_var",
       ]
     `);
   });

src/createStatsDClient.ts

@@ -21,20 +21,6 @@ type StatsD<T extends InternalStatsD> = new (options?: {
  * Configuration for building a StatsD client
  */
 export interface StatsDConfig extends AppConfig {
-  /**
-   * Whether to read `DD_ENV`, `DD_SERVICE`, `DD_VERSION` environment variables
-   * to populate global `env`, `service`, `version` tags.
-   *
-   * If this is set to `true`, `DD_ENV` will override the value provided in the
-   * `environment` config option.
-   *
-   * For Gantry this should be set to `false`, as unified service tags are
-   * automatically propagated to the Datadog agent sidecar during deployment.
-   *
-   * Defaults to `false`.
-   */
-  includeDataDogTags?: boolean;
-
   /**
    * Optional hostname of the metrics server
    *
@@ -67,7 +53,7 @@ export const createStatsDClient = <T extends InternalStatsD>(
     mock: !config.metricsServer,
     host,
     errorHandler,
-    includeDataDogTags: config.includeDataDogTags ?? false,
+    includeDataDogTags: false,
 
     prefix: `${config.name}.`,
     globalTags: globalTags(config),

src/globalTags.ts

@@ -3,5 +3,8 @@ import type { AppConfig } from './AppConfig.js';
 export const globalTags = (config: AppConfig): string[] => {
   const { environment } = config;
 
-  return environment ? [`env:${environment}`] : [];
+  return [
+    ...(environment ? [`env:${environment}`] : []),
+    ...(process?.env?.DD_ENV ? [`env:${process.env.DD_ENV}`] : []),
+  ];
 };