chore: use api-metrics for MeterProvider

open-telemetry · Jan 30, 2021 · a916c67 · a916c67
1 parent 4755762
commit a916c67
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json
@@ -68,6 +68,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.15.0",
+    "@opentelemetry/api-metrics": "^0.15.0",
     "@opentelemetry/instrumentation": "^0.15.0",
     "@opentelemetry/semantic-conventions": "^0.15.0"
   }

diff --git a/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
@@ -20,6 +20,7 @@ import { VERSION } from './version';
 import { GrpcNativeInstrumentation } from './grpc';
 import { GrpcJsInstrumentation } from './grpc-js';
 import * as api from '@opentelemetry/api';
+import { MeterProvider } from '@opentelemetry/api-metrics';
 
 /** The metadata key under which span context is stored as a binary value. */
 export const GRPC_TRACE_KEY = 'grpc-trace-bin';
@@ -83,7 +84,7 @@ export class GrpcInstrumentation {
    * Sets MeterProvider to this plugin
    * @param meterProvider
    */
-  public setMeterProvider(meterProvider: api.MeterProvider) {
+  public setMeterProvider(meterProvider: MeterProvider) {
     this._grpcJsInstrumentation.setMeterProvider(meterProvider);
     this._grpcNativeInstrumentation.setMeterProvider(meterProvider);
   }

diff --git a/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/packages/opentelemetry-instrumentation-grpc/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../opentelemetry-api"
     },
+    {
+      "path": "../opentelemetry-api-metrics"
+    },
     {
       "path": "../opentelemetry-context-async-hooks"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,9 @@ @@
         {
           "path": "../opentelemetry-api"
         },
+        {
+          "path": "../opentelemetry-api-metrics"
+        },
         {
           "path": "../opentelemetry-context-async-hooks"
         },
@@ Expand Down @@