feat(instrumentation): add new setMeterInstruments method

experimental/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to experimental packages in this project will be documented
 
 ## Unreleased
 
+* feat(instrumentation): add new `_setMeterInstruments` protected method that update the meter instruments every
+                         meter provider update.
+
+*
+
 ### :boom: Breaking Change
 
 * Add semver check to metrics API [#3357](https://github.com/open-telemetry/opentelemetry-js/pull/3357) @dyladan

experimental/packages/opentelemetry-instrumentation-http/src/http.ts

@@ -25,11 +25,8 @@ import {
   SpanStatus,
   SpanStatusCode,
   trace,
-  Histogram,
-  MeterProvider,
-  MetricAttributes,
-  ValueType,
 } from '@opentelemetry/api';
+import { Histogram, MetricAttributes, ValueType } from '@opentelemetry/api-metrics';
 import { hrTime, hrTimeDuration, hrTimeToMilliseconds, suppressTracing } from '@opentelemetry/core';
 import type * as http from 'http';
 import type * as https from 'https';
@@ -73,15 +70,9 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
       config
     );
     this._headerCapture = this._createHeaderCapture();
-    this._updateMetricInstruments();
   }
 
-  override setMeterProvider(meterProvider: MeterProvider) {
-    super.setMeterProvider(meterProvider);
-    this._updateMetricInstruments();
-  }
-
-  private _updateMetricInstruments() {
+  protected override _updateMetricInstruments() {
     this._httpServerDurationHistogram = this.meter.createHistogram('http.server.duration', {
       description: 'measures the duration of the inbound HTTP requests',
       unit: 'ms',

experimental/packages/opentelemetry-instrumentation/package.json

@@ -76,6 +76,7 @@
     "@opentelemetry/api": "^1.2.0"
   },
   "devDependencies": {
+    "@opentelemetry/sdk-metrics": "^0.32.0",
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.2.0",
     "@types/mocha": "10.0.0",

experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts

@@ -56,6 +56,7 @@ implements types.Instrumentation {
     this._tracer = trace.getTracer(instrumentationName, instrumentationVersion);
 
     this._meter = metrics.getMeter(instrumentationName, instrumentationVersion);
+    this._updateMetricInstruments();
   }
 
   /* Api to wrap instrumented method */
@@ -81,6 +82,15 @@ implements types.Instrumentation {
       this.instrumentationName,
       this.instrumentationVersion
     );
+
+    this._updateMetricInstruments();
+  }
+
+  /**
+   * Sets the new metric instruments with the current Meter.
+   */
+  protected _updateMetricInstruments(): void {
+    return;
   }
 
   /* Returns InstrumentationConfig */

experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts

@@ -21,6 +21,8 @@ import {
   InstrumentationConfig,
 } from '../../src';
 
+import { MeterProvider } from '@opentelemetry/sdk-metrics';
+
 interface TestInstrumentationConfig extends InstrumentationConfig {
   isActive?: boolean;
 }
@@ -54,13 +56,36 @@ describe('BaseInstrumentation', () => {
 
   describe('constructor', () => {
     it('should enable instrumentation by default', () => {
-      let called = false;
+      let enableCalled = false;
+      let updateMetricInstrumentsCalled = false;
       class TestInstrumentation2 extends TestInstrumentation {
         override enable() {
+          enableCalled = true;
+        }
+        override _updateMetricInstruments() {
+          updateMetricInstrumentsCalled = true;
+        }
+      }
+      instrumentation = new TestInstrumentation2();
+      assert.strictEqual(enableCalled, true);
+      assert.strictEqual(updateMetricInstrumentsCalled, true);
+    });
+  });
+
+  describe('setMeterProvider', () => {
+    let otelTestingMeterProvider: MeterProvider;
+    beforeEach(() => {
+      otelTestingMeterProvider = new MeterProvider();
+    });
+    it('should call _updateMetricInstruments', () => {
+      let called = true;
+      class TestInstrumentation2 extends TestInstrumentation {
+        override _updateMetricInstruments() {
           called = true;
         }
       }
       instrumentation = new TestInstrumentation2();
+      instrumentation.setMeterProvider(otelTestingMeterProvider);
       assert.strictEqual(called, true);
     });
   });