fixup!

experimental/packages/opentelemetry-api-metrics/src/NoopMeter.ts

@@ -212,17 +212,17 @@ export const NOOP_HISTOGRAM_METRIC = new NoopHistogramMetric(
   NOOP_BOUND_HISTOGRAM
 );
 
-export const NOOP_BOUND_BASE_OBSERVER = new NoopBoundBaseObservable();
+export const NOOP_BOUND_BASE_OBSERVABLE = new NoopBoundBaseObservable();
 export const NOOP_OBSERVABLE_GAUGE_METRIC = new NoopBaseObservableMetric(
-  NOOP_BOUND_BASE_OBSERVER
+  NOOP_BOUND_BASE_OBSERVABLE
 );
 
 export const NOOP_OBSERVABLE_UP_DOWN_COUNTER_METRIC = new NoopBaseObservableMetric(
-  NOOP_BOUND_BASE_OBSERVER
+  NOOP_BOUND_BASE_OBSERVABLE
 );
 
 export const NOOP_OBSERVABLE_COUNTER_METRIC = new NoopBaseObservableMetric(
-  NOOP_BOUND_BASE_OBSERVER
+  NOOP_BOUND_BASE_OBSERVABLE
 );
 
 export const NOOP_BATCH_OBSERVER = new NoopBatchObserver();

experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts

@@ -145,16 +145,16 @@ const testOTLPMetricExporter = (params: TestParams) =>
         observerResult.observe(3, {});
         observerResult.observe(6, {});
       });
-      const recorder: metrics.Metric<metrics.BoundHistogram> &
+      const histogram: metrics.Metric<metrics.BoundHistogram> &
         Histogram = mockHistogram();
 
       counter.add(1);
-      recorder.record(7);
-      recorder.record(14);
+      histogram.record(7);
+      histogram.record(14);
 
       metrics.push((await counter.getMetricRecord())[0]);
       metrics.push((await observableGauge.getMetricRecord())[0]);
-      metrics.push((await recorder.getMetricRecord())[0]);
+      metrics.push((await histogram.getMetricRecord())[0]);
     });
 
     afterEach(() => {

experimental/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts

@@ -78,13 +78,13 @@ export function mockCounter(): metrics.Metric<metrics.BoundCounter> & Counter {
 export function mockObservableGauge(
   callback: (observerResult: ObserverResult) => void
 ): metrics.Metric<metrics.BoundCounter> & ObservableGauge {
-  const name = 'double-observable';
+  const name = 'double-observable-gauge';
   const metric =
     meter['_metrics'].get(name) ||
     meter.createObservableGauge(
       name,
       {
-        description: 'sample observable description',
+        description: 'sample observable gauge description',
         valueType: ValueType.DOUBLE,
       },
       callback
@@ -96,11 +96,11 @@ export function mockObservableGauge(
 
 export function mockHistogram(): metrics.Metric<metrics.BoundHistogram> &
   Histogram {
-  const name = 'int-recorder';
+  const name = 'int-histogram';
   const metric =
     meter['_metrics'].get(name) ||
     meter.createHistogram(name, {
-      description: 'sample recorder description',
+      description: 'sample histogram description',
       valueType: ValueType.INT,
       boundaries: [0, 100],
     });
@@ -357,8 +357,8 @@ export function ensureExportedObservableGaugeIsCorrect(
   time?: number
 ) {
   assert.deepStrictEqual(metric, {
-    name: 'double-observable',
-    description: 'sample observable description',
+    name: 'double-observable-gauge',
+    description: 'sample observable gauge description',
     unit: '1',
     data: 'doubleGauge',
     doubleGauge: {
@@ -382,8 +382,8 @@ export function ensureExportedHistogramIsCorrect(
   bucketCounts: string[] = ['2', '0']
 ) {
   assert.deepStrictEqual(metric, {
-    name: 'int-recorder',
-    description: 'sample recorder description',
+    name: 'int-histogram',
+    description: 'sample histogram description',
     unit: '1',
     data: 'intHistogram',
     intHistogram: {

experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts

@@ -37,11 +37,11 @@ import {
   ensureCounterIsCorrect,
   ensureExportMetricsServiceRequestIsSet,
   ensureHeadersContain,
-  ensureObserverIsCorrect,
+  ensureObservableGaugeIsCorrect,
   ensureHistogramIsCorrect,
   ensureWebResourceIsCorrect,
   mockCounter,
-  mockObserver,
+  mockObservableGauge,
   mockHistogram,
 } from '../helper';
 
@@ -57,22 +57,22 @@ describe('OTLPMetricExporter - web', () => {
     stubBeacon = sinon.stub(navigator, 'sendBeacon');
     metrics = [];
     const counter: Metric<BoundCounter> & Counter = mockCounter();
-    const observer: Metric<BoundObservable> & ObservableGauge = mockObserver(
+    const observerGauge: Metric<BoundObservable> & ObservableGauge = mockObservableGauge(
       observerResult => {
         observerResult.observe(3, {});
         observerResult.observe(6, {});
       },
-      'double-observer2'
+      'double-observable-gauge2'
     );
-    const recorder: Metric<BoundHistogram> &
+    const histogram: Metric<BoundHistogram> &
       Histogram = mockHistogram();
     counter.add(1);
-    recorder.record(7);
-    recorder.record(14);
+    histogram.record(7);
+    histogram.record(14);
 
     metrics.push((await counter.getMetricRecord())[0]);
-    metrics.push((await observer.getMetricRecord())[0]);
-    metrics.push((await recorder.getMetricRecord())[0]);
+    metrics.push((await observerGauge.getMetricRecord())[0]);
+    metrics.push((await histogram.getMetricRecord())[0]);
   });
 
   afterEach(() => {
@@ -121,11 +121,11 @@ describe('OTLPMetricExporter - web', () => {
             "second metric doesn't exist"
           );
           if (metric2) {
-            ensureObserverIsCorrect(
+            ensureObservableGaugeIsCorrect(
               metric2,
               hrTimeToNanoseconds(metrics[1].aggregator.toPoint().timestamp),
               6,
-              'double-observer2'
+              'double-observable-gauge2'
             );
           }
 
@@ -234,11 +234,11 @@ describe('OTLPMetricExporter - web', () => {
             "second metric doesn't exist"
           );
           if (metric2) {
-            ensureObserverIsCorrect(
+            ensureObservableGaugeIsCorrect(
               metric2,
               hrTimeToNanoseconds(metrics[1].aggregator.toPoint().timestamp),
               6,
-              'double-observer2'
+              'double-observable-gauge2'
             );
           }
 

experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts

@@ -27,7 +27,7 @@ import * as sinon from 'sinon';
 import { OTLPExporterBase } from '../../src/OTLPExporterBase';
 import * as otlpTypes from '../../src/types';
 import { OTLPExporterConfigBase } from '../../src/types';
-import { mockCounter, mockObserver } from '../helper';
+import { mockCounter, mockObservableGauge } from '../helper';
 
 type CollectorExporterConfig = OTLPExporterConfigBase;
 class OTLPMetricExporter extends OTLPExporterBase<
@@ -70,17 +70,17 @@ describe('OTLPMetricExporter - common', () => {
       collectorExporter = new OTLPMetricExporter(collectorExporterConfig);
       metrics = [];
       const counter: Metric<BoundCounter> & Counter = mockCounter();
-      const observer: Metric<BoundObservable> & ObservableGauge = mockObserver(
+      const observableGauge: Metric<BoundObservable> & ObservableGauge = mockObservableGauge(
         observerResult => {
           observerResult.observe(3, {});
           observerResult.observe(6, {});
         },
-        'double-observer3'
+        'double-observable-gauge3'
       );
       counter.add(1);
 
       metrics.push((await counter.getMetricRecord())[0]);
-      metrics.push((await observer.getMetricRecord())[0]);
+      metrics.push((await observableGauge.getMetricRecord())[0]);
     });
 
     it('should create an instance', () => {

experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts

@@ -34,15 +34,15 @@ import * as transform from '../../src/transformMetrics';
 import {
   ensureCounterIsCorrect,
   ensureDoubleCounterIsCorrect,
-  ensureObserverIsCorrect,
+  ensureObservableGaugeIsCorrect,
   ensureObservableCounterIsCorrect,
   ensureObservableUpDownCounterIsCorrect,
   ensureHistogramIsCorrect,
   mockCounter,
   mockDoubleCounter,
   mockedInstrumentationLibraries,
   mockedResources,
-  mockObserver,
+  mockObservableGauge,
   mockObservableCounter,
   mockObservableUpDownCounter,
   mockHistogram,
@@ -54,10 +54,10 @@ describe('transformMetrics', () => {
   describe('toCollectorMetric', async () => {
     let counter: Metric<BoundCounter> & Counter;
     let doubleCounter: Metric<BoundCounter> & Counter;
-    let observer: Metric<BoundObservable> & ObservableGauge;
+    let observableGauge: Metric<BoundObservable> & ObservableGauge;
     let observableCounter: Metric<BoundObservable> & ObservableCounter;
     let observableUpDownCounter: Metric<BoundObservable> & ObservableUpDownCounter;
-    let recorder: Metric<BoundHistogram> & Histogram;
+    let histogram: Metric<BoundHistogram> & Histogram;
     beforeEach(() => {
       counter = mockCounter();
       doubleCounter = mockDoubleCounter();
@@ -72,7 +72,7 @@ describe('transformMetrics', () => {
         return -1;
       }
 
-      observer = mockObserver(observerResult => {
+      observableGauge = mockObservableGauge(observerResult => {
         count1++;
         observerResult.observe(getValue(count1), {});
       });
@@ -87,7 +87,7 @@ describe('transformMetrics', () => {
         observerResult.observe(getValue(count3), {});
       });
 
-      recorder = mockHistogram();
+      histogram = mockHistogram();
 
       // Counter
       counter.add(1);
@@ -96,8 +96,8 @@ describe('transformMetrics', () => {
       doubleCounter.add(8);
 
       // Histogram
-      recorder.record(7);
-      recorder.record(14);
+      histogram.record(7);
+      histogram.record(14);
     });
 
     it('should convert metric', async () => {
@@ -113,10 +113,10 @@ describe('transformMetrics', () => {
         hrTimeToNanoseconds(doubleCounterMetric.aggregator.toPoint().timestamp)
       );
 
-      await observer.getMetricRecord();
-      await observer.getMetricRecord();
-      const observerMetric = (await observer.getMetricRecord())[0];
-      ensureObserverIsCorrect(
+      await observableGauge.getMetricRecord();
+      await observableGauge.getMetricRecord();
+      const observerMetric = (await observableGauge.getMetricRecord())[0];
+      ensureObservableGaugeIsCorrect(
         transform.toCollectorMetric(observerMetric, 1592602232694000000),
         hrTimeToNanoseconds(observerMetric.aggregator.toPoint().timestamp),
         -1
@@ -149,10 +149,10 @@ describe('transformMetrics', () => {
         -1
       );
 
-      const recorderMetric = (await recorder.getMetricRecord())[0];
+      const histogramMetric = (await histogram.getMetricRecord())[0];
       ensureHistogramIsCorrect(
-        transform.toCollectorMetric(recorderMetric, 1592602232694000000),
-        hrTimeToNanoseconds(recorderMetric.aggregator.toPoint().timestamp),
+        transform.toCollectorMetric(histogramMetric, 1592602232694000000),
+        hrTimeToNanoseconds(histogramMetric.aggregator.toPoint().timestamp),
         [0, 100],
         [0, 2, 0]
       );