From aeaf9f55e44a885c72f5e97b430b4e5033e2f8dd Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Tue, 20 Feb 2024 13:14:27 +0000
Subject: [PATCH] Add OpenTelemetry HTTP and Express instrumentations

---
 CommonServer/Utils/OpenTelemetry.ts | 4 +++-
 OTelCollector/config.yaml           | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CommonServer/Utils/OpenTelemetry.ts b/CommonServer/Utils/OpenTelemetry.ts
index 6fcd49820c..84ce4f500a 100644
--- a/CommonServer/Utils/OpenTelemetry.ts
+++ b/CommonServer/Utils/OpenTelemetry.ts
@@ -3,6 +3,8 @@ import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentation
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
 import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import logger from './Logger';
 import Dictionary from 'Common/Types/Dictionary';
 
@@ -39,7 +41,7 @@ if (
         headers: headers,
       }),
     }) as any,
-    instrumentations: [getNodeAutoInstrumentations()],
+    instrumentations: [getNodeAutoInstrumentations(), new HttpInstrumentation(), new ExpressInstrumentation()],
   });
 
   sdk.start();
diff --git a/OTelCollector/config.yaml b/OTelCollector/config.yaml
index b925ce56d7..5872f93f11 100644
--- a/OTelCollector/config.yaml
+++ b/OTelCollector/config.yaml
@@ -25,9 +25,9 @@ exporters:
       authenticator: headers_setter
 
 service:
-  telemetry:
-    logs:
-      level: "debug"
+  # telemetry:
+  #   logs:
+  #     level: "debug"
   extensions: [ headers_setter ]
   pipelines:
     traces: