chore: config management cleanup

Author: abhishekg999

src/tracer/BrowserTracer.ts

@@ -2,7 +2,7 @@ import { resourceFromAttributes } from "@opentelemetry/resources";
 import { WebTracerProvider } from "@opentelemetry/sdk-trace-web";
 import { VERSION } from "../version";
 import { OpenTelemetryKeys } from "./OpenTelemetryKeys";
-import { Tracer, TracerInitializeOptions, TracerOptions } from "./Tracer";
+import { Tracer, TracerInitializeOptions } from "./Tracer";
 import { TracerConfiguration } from "./TracerConfiguration";
 
 export type BrowserTracerInitializeOptions = TracerInitializeOptions & {};
@@ -11,15 +11,16 @@ export class BrowserTracer extends Tracer {
   private webTracerProvider?: WebTracerProvider;
 
   public async initialize(
-    options: BrowserTracerInitializeOptions = {},
+    options: BrowserTracerInitializeOptions = {}
   ): Promise<BrowserTracer> {
     if (this._initialized) {
       return this;
     }
 
     try {
       const resourceAttributes = {
-        [OpenTelemetryKeys.ResourceKeys.SERVICE_NAME]: this.projectName,
+        [OpenTelemetryKeys.ResourceKeys.SERVICE_NAME]:
+          this.configuration.projectName,
         [OpenTelemetryKeys.ResourceKeys.TELEMETRY_SDK_VERSION]: VERSION,
         ...options.resourceAttributes,
       };
@@ -30,44 +31,33 @@ export class BrowserTracer extends Tracer {
 
       this.webTracerProvider.register();
 
-      this.configuration = TracerConfiguration.builder()
-        .projectName(this.projectName)
-        .apiKey(this.apiKey)
-        .organizationId(this.organizationId)
-        .enableEvaluation(this.enableEvaluation)
-        .build();
-
       this._initialized = true;
       return this;
     } catch (error) {
       throw new Error(
-        `Failed to initialize browser tracer: ${error instanceof Error ? error.message : String(error)}`,
+        `Failed to initialize browser tracer: ${error instanceof Error ? error.message : String(error)}`
       );
     }
   }
 
-  public static getInstance(
-    projectName: string,
-    options: TracerOptions = {},
-  ): BrowserTracer {
-    const key = `BrowserTracer:${projectName}`;
+  public static getInstance(configuration: TracerConfiguration): BrowserTracer {
+    const key = `BrowserTracer:${configuration.projectName}`;
     if (!Tracer.instances.has(key)) {
-      Tracer.instances.set(key, new BrowserTracer(projectName, options));
+      Tracer.instances.set(key, new BrowserTracer(configuration));
     }
     return Tracer.instances.get(key) as BrowserTracer;
   }
 
   public static createDefault(projectName: string): BrowserTracer {
-    return BrowserTracer.getInstance(projectName);
+    const configuration = TracerConfiguration.builder()
+      .projectName(projectName)
+      .build();
+    return BrowserTracer.getInstance(configuration);
   }
 
   public static createWithConfiguration(
-    configuration: TracerConfiguration,
+    configuration: TracerConfiguration
   ): BrowserTracer {
-    return BrowserTracer.getInstance(configuration.projectName, {
-      apiKey: configuration.apiKey,
-      organizationId: configuration.organizationId,
-      enableEvaluation: configuration.enableEvaluation,
-    });
+    return new BrowserTracer(configuration);
   }
 }

src/tracer/NodeTracer.ts

@@ -2,7 +2,7 @@ import { resourceFromAttributes } from "@opentelemetry/resources";
 import { NodeSDK, NodeSDKConfiguration } from "@opentelemetry/sdk-node";
 import { VERSION } from "../version";
 import { OpenTelemetryKeys } from "./OpenTelemetryKeys";
-import { Tracer, TracerInitializeOptions, TracerOptions } from "./Tracer";
+import { Tracer, TracerInitializeOptions } from "./Tracer";
 import { TracerConfiguration } from "./TracerConfiguration";
 
 export type NodeTracerInitializeOptions = TracerInitializeOptions & {
@@ -14,15 +14,16 @@ export class NodeTracer extends Tracer {
   private nodeSDK?: NodeSDK;
 
   public async initialize(
-    options: NodeTracerInitializeOptions = {},
+    options: NodeTracerInitializeOptions = {}
   ): Promise<NodeTracer> {
     if (this._initialized) {
       return this;
     }
 
     try {
       const resourceAttributes = {
-        [OpenTelemetryKeys.ResourceKeys.SERVICE_NAME]: this.projectName,
+        [OpenTelemetryKeys.ResourceKeys.SERVICE_NAME]:
+          this.configuration.projectName,
         [OpenTelemetryKeys.ResourceKeys.TELEMETRY_SDK_VERSION]: VERSION,
         ...options.resourceAttributes,
       };
@@ -35,45 +36,35 @@ export class NodeTracer extends Tracer {
 
       this.nodeSDK.start();
 
-      this.configuration = TracerConfiguration.builder()
-        .projectName(this.projectName)
-        .apiKey(this.apiKey)
-        .organizationId(this.organizationId)
-        .enableEvaluation(this.enableEvaluation)
-        .build();
-
       this._initialized = true;
       return this;
     } catch (error) {
       throw new Error(
-        `Failed to initialize node tracer: ${error instanceof Error ? error.message : String(error)}`,
+        `Failed to initialize node tracer: ${error instanceof Error ? error.message : String(error)}`
       );
     }
   }
 
-  public static getInstance(
-    projectName: string,
-    options: TracerOptions = {},
-  ): NodeTracer {
-    const key = `NodeTracer:${projectName}`;
+  public static getInstance(configuration: TracerConfiguration): NodeTracer {
+    const key = `NodeTracer:${configuration.projectName}`;
     if (!Tracer.instances.has(key)) {
-      Tracer.instances.set(key, new NodeTracer(projectName, options));
+      Tracer.instances.set(key, new NodeTracer(configuration));
     }
     return Tracer.instances.get(key) as NodeTracer;
   }
 
   public static createDefault(projectName: string): NodeTracer {
-    return NodeTracer.getInstance(projectName);
+    const configuration = TracerConfiguration.builder()
+      .projectName(projectName)
+      .enableEvaluation(true)
+      .build();
+    return NodeTracer.getInstance(configuration);
   }
 
   public static createWithConfiguration(
-    configuration: TracerConfiguration,
+    configuration: TracerConfiguration
   ): NodeTracer {
-    return NodeTracer.getInstance(configuration.projectName, {
-      apiKey: configuration.apiKey,
-      organizationId: configuration.organizationId,
-      enableEvaluation: configuration.enableEvaluation,
-    });
+    return new NodeTracer(configuration);
   }
 
   public async shutdown(): Promise<void> {