Sync SDK - Async resource detection

packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts

@@ -31,13 +31,13 @@ import {
   statusDescriptionTagName,
 } from '../../src/transform';
 import * as zipkinTypes from '../../src/types';
-import { Resource, TELEMETRY_SDK_RESOURCE } from '@opentelemetry/resources';
+import { Resource } from '@opentelemetry/resources';
 const logger = new NoopLogger();
 const tracer = new BasicTracerProvider({
   logger,
 }).getTracer('default');
 
-const language = tracer.resource.attributes[TELEMETRY_SDK_RESOURCE.LANGUAGE];
+const language = 'nodejs';
 
 const parentId = '5c1c63257de34c67';
 const spanContext: api.SpanContext = {
@@ -54,7 +54,7 @@ const DUMMY_RESOURCE = new Resource({
 
 describe('transform', () => {
   describe('toZipkinSpan', () => {
-    it('should convert an OpenTelemetry span to a Zipkin span', () => {
+    it('should convert an OpenTelemetry span to a Zipkin span', async () => {
       const span = new Span(
         tracer,
         'my-span',
@@ -70,7 +70,7 @@ describe('transform', () => {
       span.end();
 
       const zipkinSpan = toZipkinSpan(
-        span,
+        await span.toReadableSpan(),
         'my-service',
         statusCodeTagName,
         statusDescriptionTagName
@@ -104,7 +104,7 @@ describe('transform', () => {
         traceId: span.spanContext.traceId,
       });
     });
-    it("should skip parentSpanId if doesn't exist", () => {
+    it("should skip parentSpanId if doesn't exist", async () => {
       const span = new Span(
         tracer,
         'my-span',
@@ -114,7 +114,7 @@ describe('transform', () => {
       span.end();
 
       const zipkinSpan = toZipkinSpan(
-        span,
+        await span.toReadableSpan(),
         'my-service',
         statusCodeTagName,
         statusDescriptionTagName
@@ -151,12 +151,12 @@ describe('transform', () => {
     ].forEach(item =>
       it(`should map OpenTelemetry SpanKind ${
         api.SpanKind[item.ot]
-      } to Zipkin ${item.zipkin}`, () => {
+      } to Zipkin ${item.zipkin}`, async () => {
         const span = new Span(tracer, 'my-span', spanContext, item.ot);
         span.end();
 
         const zipkinSpan = toZipkinSpan(
-          span,
+          await span.toReadableSpan(),
           'my-service',
           statusCodeTagName,
           statusDescriptionTagName

packages/opentelemetry-grpc-utils/test/grpcUtils.test.ts

@@ -482,11 +482,12 @@ export const runTests = (
         const args = [client, method.request, method.metadata];
         await (method.method as any)
           .apply({}, args)
-          .then((result: TestRequestResponse | TestRequestResponse[]) => {
+          .then(async (result: TestRequestResponse | TestRequestResponse[]) => {
             assert.ok(
               checkEqual(result)(method.result),
               'gRPC call returns correct values'
             );
+            await new Promise(resolve => setTimeout(resolve));
             const spans = memoryExporter.getFinishedSpans();
             if (checkSpans) {
               const incomingSpan = spans[0];
@@ -516,7 +517,7 @@ export const runTests = (
           });
       });
 
-      it(`should raise an error for client childSpan/server rootSpan - ${method.description} - status = OK`, () => {
+      it(`should raise an error for client childSpan/server rootSpan - ${method.description} - status = OK`, async () => {
         const expectEmpty = memoryExporter.getFinishedSpans();
         assert.strictEqual(expectEmpty.length, 0);
 
@@ -533,9 +534,10 @@ export const runTests = (
           const args = [client, method.request, method.metadata];
           await (method.method as any)
             .apply({}, args)
-            .then(() => {
+            .then(async () => {
               // Assert
               if (checkSpans) {
+                await new Promise(resolve => setTimeout(resolve));
                 const spans = memoryExporter.getFinishedSpans();
                 assert.strictEqual(spans.length, 2);
                 const serverSpan = spans[0];

packages/opentelemetry-metrics/src/BaseObserverMetric.ts

@@ -37,7 +37,7 @@ export abstract class BaseObserverMetric
     name: string,
     options: api.MetricOptions,
     private readonly _batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     metricKind: MetricKind,
     instrumentationLibrary: InstrumentationLibrary,
     callback?: (observerResult: api.ObserverResult) => unknown

packages/opentelemetry-metrics/src/BatchObserverMetric.ts

@@ -37,7 +37,7 @@ export class BatchObserverMetric
     name: string,
     options: api.BatchMetricOptions,
     private readonly _batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary,
     callback?: (observerResult: api.BatchObserverResult) => void
   ) {

packages/opentelemetry-metrics/src/CounterMetric.ts

@@ -28,7 +28,7 @@ export class CounterMetric extends Metric<BoundCounter> implements api.Counter {
     name: string,
     options: api.MetricOptions,
     private readonly _batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary
   ) {
     super(name, options, MetricKind.COUNTER, resource, instrumentationLibrary);

packages/opentelemetry-metrics/src/Meter.ts

@@ -39,7 +39,7 @@ export class Meter implements api.Meter {
   private readonly _logger: api.Logger;
   private readonly _metrics = new Map<string, Metric<BaseBoundInstrument>>();
   private readonly _batcher: Batcher;
-  private readonly _resource: Resource;
+  private readonly _resource: Promise<Resource>;
   private readonly _instrumentationLibrary: InstrumentationLibrary;
   private readonly _controller: PushController;
   private _isShutdown = false;
@@ -54,7 +54,9 @@ export class Meter implements api.Meter {
   ) {
     this._logger = config.logger || new ConsoleLogger(config.logLevel);
     this._batcher = config.batcher ?? new UngroupedBatcher();
-    this._resource = config.resource || Resource.createTelemetrySDKResource();
+    this._resource = Promise.resolve(
+      config.resource || Resource.createTelemetrySDKResource()
+    );
     this._instrumentationLibrary = instrumentationLibrary;
     // start the push controller
     const exporter = config.exporter || new NoopExporter();

packages/opentelemetry-metrics/src/MeterProvider.ts

@@ -29,12 +29,14 @@ export class MeterProvider implements api.MeterProvider {
   private _cleanNotifyOnGlobalShutdown: Function | undefined;
   private _shuttingDownPromise: Promise<void> = Promise.resolve();
   private _isShutdown = false;
-  readonly resource: Resource;
+  readonly resource: Promise<Resource>;
   readonly logger: api.Logger;
 
   constructor(config: MeterConfig = DEFAULT_CONFIG) {
     this.logger = config.logger ?? new ConsoleLogger(config.logLevel);
-    this.resource = config.resource ?? Resource.createTelemetrySDKResource();
+    this.resource = Promise.resolve(
+      config.resource ?? Resource.createTelemetrySDKResource()
+    );
     this._config = Object.assign({}, config, {
       logger: this.logger,
       resource: this.resource,

packages/opentelemetry-metrics/src/Metric.ts

@@ -34,7 +34,7 @@ export abstract class Metric<T extends BaseBoundInstrument>
     private readonly _name: string,
     private readonly _options: api.MetricOptions,
     private readonly _kind: MetricKind,
-    readonly resource: Resource,
+    readonly resource: Promise<Resource>,
     readonly instrumentationLibrary: InstrumentationLibrary
   ) {
     this._disabled = !!_options.disabled;
@@ -85,17 +85,15 @@ export abstract class Metric<T extends BaseBoundInstrument>
   }
 
   getMetricRecord(): Promise<MetricRecord[]> {
-    return new Promise(resolve => {
-      resolve(
-        Array.from(this._instruments.values()).map(instrument => ({
-          descriptor: this._descriptor,
-          labels: instrument.getLabels(),
-          aggregator: instrument.getAggregator(),
-          resource: this.resource,
-          instrumentationLibrary: this.instrumentationLibrary,
-        }))
-      );
-    });
+    return this.resource.then(resource =>
+      Array.from(this._instruments.values()).map(instrument => ({
+        descriptor: this._descriptor,
+        labels: instrument.getLabels(),
+        aggregator: instrument.getAggregator(),
+        resource,
+        instrumentationLibrary: this.instrumentationLibrary,
+      }))
+    );
   }
 
   private _getMetricDescriptor(): MetricDescriptor {

packages/opentelemetry-metrics/src/SumObserverMetric.ts

@@ -31,7 +31,7 @@ export class SumObserverMetric
     name: string,
     options: api.MetricOptions,
     batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary,
     callback?: (observerResult: api.ObserverResult) => unknown
   ) {

packages/opentelemetry-metrics/src/UpDownCounterMetric.ts

@@ -30,7 +30,7 @@ export class UpDownCounterMetric
     name: string,
     options: api.MetricOptions,
     private readonly _batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary
   ) {
     super(

packages/opentelemetry-metrics/src/UpDownSumObserverMetric.ts

@@ -29,7 +29,7 @@ export class UpDownSumObserverMetric
     name: string,
     options: api.MetricOptions,
     batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary,
     callback?: (observerResult: api.ObserverResult) => unknown
   ) {

packages/opentelemetry-metrics/src/ValueObserverMetric.ts

@@ -28,7 +28,7 @@ export class ValueObserverMetric
     name: string,
     options: api.MetricOptions,
     batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary,
     callback?: (observerResult: api.ObserverResult) => unknown
   ) {

packages/opentelemetry-metrics/src/ValueRecorderMetric.ts

@@ -30,7 +30,7 @@ export class ValueRecorderMetric
     name: string,
     options: api.MetricOptions,
     private readonly _batcher: Batcher,
-    resource: Resource,
+    resource: Promise<Resource>,
     instrumentationLibrary: InstrumentationLibrary
   ) {
     super(

packages/opentelemetry-metrics/src/types.ts

@@ -35,7 +35,7 @@ export interface MeterConfig {
   interval?: number;
 
   /** Resource associated with metric telemetry */
-  resource?: Resource;
+  resource?: Resource | Promise<Resource>;
 
   /** Metric batcher. */
   batcher?: Batcher;

packages/opentelemetry-metrics/test/Meter.test.ts

@@ -135,7 +135,7 @@ describe('Meter', () => {
 
     it('should pipe through resource', async () => {
       const counter = meter.createCounter('name') as CounterMetric;
-      assert.ok(counter.resource instanceof Resource);
+      assert.ok((await counter.resource) instanceof Resource);
 
       counter.add(1, { foo: 'bar' });
 
@@ -349,7 +349,7 @@ describe('Meter', () => {
       const upDownCounter = meter.createUpDownCounter(
         'name'
       ) as UpDownCounterMetric;
-      assert.ok(upDownCounter.resource instanceof Resource);
+      assert.ok((await upDownCounter.resource) instanceof Resource);
 
       upDownCounter.add(1, { foo: 'bar' });
 
@@ -559,7 +559,7 @@ describe('Meter', () => {
       const valueRecorder = meter.createValueRecorder(
         'name'
       ) as ValueRecorderMetric;
-      assert.ok(valueRecorder.resource instanceof Resource);
+      assert.ok((await valueRecorder.resource) instanceof Resource);
 
       valueRecorder.record(1, { foo: 'bar' });
 
@@ -869,7 +869,7 @@ describe('Meter', () => {
         result.observe(42, { foo: 'bar' });
         return Promise.resolve();
       }) as SumObserverMetric;
-      assert.ok(sumObserver.resource instanceof Resource);
+      assert.ok((await sumObserver.resource) instanceof Resource);
 
       const [record] = await sumObserver.getMetricRecord();
       assert.ok(record.resource instanceof Resource);
@@ -950,7 +950,7 @@ describe('Meter', () => {
       const valueObserver = meter.createValueObserver('name', {}, result => {
         result.observe(42, { foo: 'bar' });
       }) as ValueObserverMetric;
-      assert.ok(valueObserver.resource instanceof Resource);
+      assert.ok((await valueObserver.resource) instanceof Resource);
 
       const [record] = await valueObserver.getMetricRecord();
       assert.ok(record.resource instanceof Resource);
@@ -1093,7 +1093,7 @@ describe('Meter', () => {
           return Promise.resolve();
         }
       ) as UpDownSumObserverMetric;
-      assert.ok(upDownSumObserver.resource instanceof Resource);
+      assert.ok((await upDownSumObserver.resource) instanceof Resource);
 
       const [record] = await upDownSumObserver.getMetricRecord();
       assert.ok(record.resource instanceof Resource);

packages/opentelemetry-node/test/NodeTracerProvider.test.ts

@@ -185,15 +185,16 @@ describe('NodeTracerProvider', () => {
       assert.strictEqual(span.isRecording(), true);
     });
 
-    it('should assign resource to span', () => {
+    it('should assign resource to span', async () => {
       provider = new NodeTracerProvider({
         logger: new NoopLogger(),
       });
       const span = provider.getTracer('default').startSpan('my-span') as Span;
       assert.ok(span);
-      assert.ok(span.resource instanceof Resource);
+      const resource = await span.resource;
+      assert.ok(resource instanceof Resource);
       assert.equal(
-        span.resource.attributes[TELEMETRY_SDK_RESOURCE.LANGUAGE],
+        resource.attributes[TELEMETRY_SDK_RESOURCE.LANGUAGE],
         'nodejs'
       );
     });