chore: merge branch 'master' into batch-observer

open-telemetry · mayurkale22 · Jun 30, 2020 · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020
commit 49831152c2e254753be9b06ef60d150acc85536d
diff --git a/packages/opentelemetry-exporter-prometheus/src/prometheus.ts b/packages/opentelemetry-exporter-prometheus/src/prometheus.ts
@@ -160,7 +160,7 @@ export class PrometheusExporter implements MetricExporter {
           );
           break;
 
-        case MetricKind.OBSERVER: // deprecated
+        case MetricKind.OBSERVER: // @TODO remove later #1146
         case MetricKind.VALUE_OBSERVER:
           metric.set(
             labelValues,

diff --git a/packages/opentelemetry-metrics/src/export/types.ts b/packages/opentelemetry-metrics/src/export/types.ts
@@ -23,7 +23,7 @@ export enum MetricKind {
   COUNTER,
   UP_DOWN_COUNTER,
   VALUE_RECORDER,
-  OBSERVER, // deprecated
+  OBSERVER, // @TODO remove later #1146
   SUM_OBSERVER,
   UP_DOWN_SUM_OBSERVER,
   VALUE_OBSERVER,