From 64cd327558790b725feedb0a152475751b5f5e82 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Fri, 29 Aug 2025 18:12:11 +0100
Subject: [PATCH] add env var to disable additional detectors

---
 apps/webapp/app/env.server.ts       |  1 +
 apps/webapp/app/v3/tracer.server.ts | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/webapp/app/env.server.ts b/apps/webapp/app/env.server.ts
index b3d69e176..f20c02f6a 100644
--- a/apps/webapp/app/env.server.ts
+++ b/apps/webapp/app/env.server.ts
@@ -354,6 +354,7 @@ const EnvironmentSchema = z.object({
   INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS: z.coerce.number().int().default(30_000),
   INTERNAL_OTEL_HOST_METRICS_ENABLED: BoolEnv.default(true),
   INTERNAL_OTEL_NODEJS_METRICS_ENABLED: BoolEnv.default(true),
+  INTERNAL_OTEL_ADDITIONAL_DETECTORS_ENABLED: BoolEnv.default(true),
 
   ORG_SLACK_INTEGRATION_CLIENT_ID: z.string().optional(),
   ORG_SLACK_INTEGRATION_CLIENT_SECRET: z.string().optional(),
diff --git a/apps/webapp/app/v3/tracer.server.ts b/apps/webapp/app/v3/tracer.server.ts
index fb332ceb8..1218e1627 100644
--- a/apps/webapp/app/v3/tracer.server.ts
+++ b/apps/webapp/app/v3/tracer.server.ts
@@ -36,7 +36,7 @@ import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
 import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import { HostMetrics } from "@opentelemetry/host-metrics";
-import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
+import { AwsInstrumentation as AwsSdkInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
 import { awsEcsDetector, awsEc2Detector } from "@opentelemetry/resource-detector-aws";
 import {
   detectResources,
@@ -45,6 +45,7 @@ import {
   osDetector,
   hostDetector,
   processDetector,
+  type ResourceDetector,
 } from "@opentelemetry/resources";
 import { env } from "~/env.server";
 import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
@@ -171,16 +172,13 @@ export async function emitWarnLog(message: string, params: Record<string, unknow
 }
 
 function getResource() {
-  const detectedResource = detectResources({
-    detectors: [
-      serviceInstanceIdDetector,
-      osDetector,
-      hostDetector,
-      processDetector,
-      awsEcsDetector,
-      awsEc2Detector,
-    ],
-  });
+  const detectors: ResourceDetector[] = [serviceInstanceIdDetector];
+
+  if (env.INTERNAL_OTEL_ADDITIONAL_DETECTORS_ENABLED) {
+    detectors.push(osDetector, hostDetector, processDetector, awsEcsDetector, awsEc2Detector);
+  }
+
+  const detectedResource = detectResources({ detectors });
 
   const baseResource = resourceFromAttributes({
     [ATTR_SERVICE_NAME]: env.SERVICE_NAME,
@@ -285,7 +283,7 @@ function setupTelemetry() {
   let instrumentations: Instrumentation[] = [
     new HttpInstrumentation(),
     new ExpressInstrumentation(),
-    new AwsInstrumentation({
+    new AwsSdkInstrumentation({
       suppressInternalInstrumentation: true,
     }),
   ];