Refactor BearerTokenAuthorization and Telemetry classes

OneUptime · Feb 22, 2024 · 2ff93a1 · 2ff93a1
1 parent b9afe17
commit 2ff93a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts b/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts
@@ -1,6 +1,5 @@
 import BearerTokenAuthorization from '../../Middleware/BearerTokenAuthorization';
 import { OneUptimeRequest, ExpressResponse } from '../../Utils/Express';
-import ObjectID from 'Common/Types/ObjectID';
 import JSONWebToken from '../../Utils/JsonWebToken';
 import { JSONObject } from 'Common/Types/JSON';
 
@@ -9,7 +8,6 @@ describe('BearerTokenAuthorization', () => {
         it('adds decoded token data to request', () => {
             const jsonObj: JSONObject = { test: 'test' };
             const req: OneUptimeRequest = {
-                id: ObjectID.generate(),
                 headers: {
                     authorization: `Bearer ${JSONWebToken.signJsonPayload(
                         jsonObj,
@@ -30,7 +28,7 @@ describe('BearerTokenAuthorization', () => {
         it('calls next without arguments if token is valid', () => {
             const jsonObj: JSONObject = { test: 'test' };
             const req: OneUptimeRequest = {
-                id: ObjectID.generate(),
+
                 headers: {
                     authorization: `Bearer ${JSONWebToken.signJsonPayload(
                         jsonObj,
@@ -49,7 +47,7 @@ describe('BearerTokenAuthorization', () => {
         });
         it('calls next with exception if token is empty', () => {
             const req: OneUptimeRequest = {
-                id: ObjectID.generate(),
+
                 headers: {
                     authorization: '',
                 },
@@ -67,7 +65,7 @@ describe('BearerTokenAuthorization', () => {
         });
         it('calls next with exception if token is invalid', () => {
             const req: OneUptimeRequest = {
-                id: ObjectID.generate(),
+
                 headers: {
                     authorization: 'Bearer ',
                 },
@@ -85,7 +83,7 @@ describe('BearerTokenAuthorization', () => {
         });
         it('calls next with exception if token header is not present', () => {
             const req: OneUptimeRequest = {
-                id: ObjectID.generate(),
+
             } as OneUptimeRequest;
             const res: ExpressResponse = {} as ExpressResponse;
             const next: jest.Mock = jest.fn();

diff --git a/CommonServer/Utils/Telemetry.ts b/CommonServer/Utils/Telemetry.ts
@@ -100,12 +100,9 @@ export default class OneUptimeTelemetry {
         if (!this.sdk) {
             const headers: Dictionary<string> = this.getHeaders();
 
-            let traceExporter: SpanExporter = new ConsoleSpanExporter();
+            let traceExporter: SpanExporter | undefined = undefined;
 
-            let metricReader: PeriodicExportingMetricReader =
-                new PeriodicExportingMetricReader({
-                    exporter: new ConsoleMetricExporter(),
-                });
+            let metricReader: PeriodicExportingMetricReader | undefined = undefined;
 
             if (this.getOltpTracesEndpoint()) {
                 traceExporter = new OTLPTraceExporter({
@@ -147,19 +144,27 @@ export default class OneUptimeTelemetry {
 
             this.logger = logs.getLogger('default');
 
-            const sdk: opentelemetry.NodeSDK = new opentelemetry.NodeSDK({
+            const nodeSdkConfiguration: Partial<opentelemetry.NodeSDKConfiguration> = {
                 idGenerator: new AWSXRayIdGenerator(),
-                traceExporter: traceExporter,
-                metricReader: metricReader as any,
-                logRecordProcessor: loggerProvider as any,
                 instrumentations: [
                     new HttpInstrumentation(),
                     new ExpressInstrumentation(),
                 ],
                 resource: this.getResource({
                     serviceName: data.serviceName,
                 }),
-            });
+                logRecordProcessor: loggerProvider as any,
+            };
+
+            if(traceExporter) {
+                nodeSdkConfiguration.traceExporter = traceExporter;
+            }
+
+            if(metricReader) {
+                nodeSdkConfiguration.metricReader = metricReader as any;
+            }
+
+            const sdk: opentelemetry.NodeSDK = new opentelemetry.NodeSDK(nodeSdkConfiguration);
 
             process.on('SIGTERM', () => {
                 sdk.shutdown().finally(() => {