fix: prevent duplicated resource creation

open-telemetry · May 4, 2020 · d4aa9e1 · d4aa9e1
1 parent 817397b
commit d4aa9e1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/packages/opentelemetry-metrics/src/MeterProvider.ts b/packages/opentelemetry-metrics/src/MeterProvider.ts
@@ -24,12 +24,18 @@ import { DEFAULT_CONFIG, MeterConfig } from './types';
  * This class represents a meter provider which platform libraries can extend
  */
 export class MeterProvider implements types.MeterProvider {
+  private readonly _config: MeterConfig;
   private readonly _meters: Map<string, Meter> = new Map();
-  readonly resource: Resource = Resource.createTelemetrySDKResource();
+  readonly resource: Resource;
   readonly logger: types.Logger;
 
-  constructor(private _config: MeterConfig = DEFAULT_CONFIG) {
-    this.logger = _config.logger || new ConsoleLogger(_config.logLevel);
+  constructor(config: MeterConfig = DEFAULT_CONFIG) {
+    this.logger = config.logger || new ConsoleLogger(config.logLevel);
+    this.resource = config.resource || Resource.createTelemetrySDKResource();
+    this._config = Object.assign({}, config, {
+      logger: this.logger,
+      resource: this.resource,
+    });
   }
 
   /**

diff --git a/packages/opentelemetry-metrics/test/MeterProvider.test.ts b/packages/opentelemetry-metrics/test/MeterProvider.test.ts
@@ -15,7 +15,7 @@
  */
 
 import * as assert from 'assert';
-import { MeterProvider, Meter } from '../src';
+import { MeterProvider, Meter, CounterMetric } from '../src';
 import { NoopLogger } from '@opentelemetry/core';
 
 describe('MeterProvider', () => {
@@ -39,6 +39,14 @@ describe('MeterProvider', () => {
       assert.ok(meter instanceof Meter);
     });
 
+    it('should propagate resources', () => {
+      const meterProvider = new MeterProvider();
+      const meter = meterProvider.getMeter('test-meter-provider');
+      const counter = meter.createCounter('test-counter') as CounterMetric;
+      assert.strictEqual((meter as any)._resource, meterProvider.resource);
+      assert.strictEqual(counter.resource, meterProvider.resource);
+    });
+
     it('should return the meter with default version without a version option', () => {
       const provider = new MeterProvider();
       const meter1 = provider.getMeter('default');

diff --git a/packages/opentelemetry-tracing/src/BasicTracerProvider.ts b/packages/opentelemetry-tracing/src/BasicTracerProvider.ts
@@ -27,16 +27,21 @@ import { Resource } from '@opentelemetry/resources';
  * This class represents a basic tracer provider which platform libraries can extend
  */
 export class BasicTracerProvider implements api.TracerProvider {
+  private readonly _config: TracerConfig;
   private readonly _registeredSpanProcessors: SpanProcessor[] = [];
   private readonly _tracers: Map<string, Tracer> = new Map();
 
   activeSpanProcessor = new NoopSpanProcessor();
   readonly logger: api.Logger;
   readonly resource: Resource;
 
-  constructor(private _config: TracerConfig = DEFAULT_CONFIG) {
-    this.logger = _config.logger || new ConsoleLogger(_config.logLevel);
-    this.resource = _config.resource || Resource.createTelemetrySDKResource();
+  constructor(config: TracerConfig = DEFAULT_CONFIG) {
+    this.logger = config.logger || new ConsoleLogger(config.logLevel);
+    this.resource = config.resource || Resource.createTelemetrySDKResource();
+    this._config = Object.assign({}, config, {
+      logger: this.logger,
+      resource: this.resource,
+    });
   }
 
   getTracer(name: string, version = '*', config?: TracerConfig): Tracer {

diff --git a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts b/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts
@@ -121,6 +121,14 @@ describe('BasicTracerProvider', () => {
       assert.ok(span instanceof Span);
     });
 
+    it('should propagate resources', () => {
+      const tracerProvider = new BasicTracerProvider();
+      const tracer = tracerProvider.getTracer('default');
+      const span = tracer.startSpan('my-span') as Span;
+      assert.strictEqual(tracer.resource, tracerProvider.resource);
+      assert.strictEqual(span.resource, tracerProvider.resource);
+    });
+
     it('should start a span with name and options', () => {
       const tracer = new BasicTracerProvider().getTracer('default');
       const span = tracer.startSpan('my-span', {});