Merge a7c96b0 into 7ca5a00

open-telemetry · Jul 26, 2021 · 82142be · 82142be
2 parents 7ca5a00 + a7c96b0
commit 82142be
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/api/trace.ts b/src/api/trace.ts
@@ -63,12 +63,15 @@ export class TraceAPI {
    * @returns true if the tracer provider was successfully registered, else false
    */
   public setGlobalTracerProvider(provider: TracerProvider): boolean {
-    this._proxyTracerProvider.setDelegate(provider);
-    return registerGlobal(
+    const success = registerGlobal(
       API_NAME,
       this._proxyTracerProvider,
       DiagAPI.instance()
     );
+    if (success) {
+      this._proxyTracerProvider.setDelegate(provider);
+    }
+    return success;
   }
 
   /**

diff --git a/test/api/api.test.ts b/test/api/api.test.ts
@@ -93,6 +93,18 @@ describe('API', () => {
       assert.deepStrictEqual(span, dummySpan);
     });
 
+    it('should set delegate only on success', () => {
+      assert.strictEqual(
+        api.trace.setGlobalTracerProvider(new TestTracerProvider()),
+        true
+      );
+      assert.strictEqual(
+        api.trace.setGlobalTracerProvider(new NoopTracerProvider()),
+        false
+      );
+      assert.ok(api.trace.getTracer('name') instanceof TestTracer);
+    });
+
     class TestTracer extends NoopTracer {
       override startSpan(name: string, options?: SpanOptions): Span {
         return dummySpan;