applied changes from open-telemetry#2496 to metricHelpers

willarmiros · Oct 26, 2021 · 8b3571f · 8b3571f
1 parent 9140258
commit 8b3571f
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 45 deletions.
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts
@@ -16,9 +16,9 @@
 
 import {
   Counter,
-  ObserverResult,
-  ValueObserver,
-  ValueRecorder,
+  ObservableResult,
+  ObservableGauge,
+  Histogram,
   ValueType,
 } from '@opentelemetry/api-metrics';
 import { otlpTypes } from '@opentelemetry/exporter-otlp-http';
@@ -52,16 +52,16 @@ export function mockCounter(): metrics.Metric<metrics.BoundCounter> & Counter {
   return metric;
 }
 
-export function mockObserver(
-  callback: (observerResult: ObserverResult) => void
-): metrics.Metric<metrics.BoundCounter> & ValueObserver {
-  const name = 'double-observer';
+export function mockObservableGauge(
+  callback: (observableResult: ObservableResult) => void
+): metrics.Metric<metrics.BoundCounter> & ObservableGauge {
+  const name = 'double-observable-gauge';
   const metric =
     meter['_metrics'].get(name) ||
-    meter.createValueObserver(
+    meter.createObservableGauge(
       name,
       {
-        description: 'sample observer description',
+        description: 'sample observable gauge description',
         valueType: ValueType.DOUBLE,
       },
       callback
@@ -71,13 +71,13 @@ export function mockObserver(
   return metric;
 }
 
-export function mockValueRecorder(): metrics.Metric<metrics.BoundValueRecorder> &
-  ValueRecorder {
-  const name = 'int-recorder';
+export function mockHistogram(): metrics.Metric<metrics.BoundHistogram> &
+  Histogram {
+  const name = 'int-histogram';
   const metric =
     meter['_metrics'].get(name) ||
-    meter.createValueRecorder(name, {
-      description: 'sample recorder description',
+    meter.createHistogram(name, {
+      description: 'sample histogram description',
       valueType: ValueType.INT,
       boundaries: [0, 100],
     });
@@ -129,13 +129,13 @@ export function ensureExportedCounterIsCorrect(
   });
 }
 
-export function ensureExportedObserverIsCorrect(
+export function ensureExportedObservableGaugeIsCorrect(
   metric: otlpTypes.opentelemetryProto.metrics.v1.Metric,
   time?: number
 ) {
   assert.deepStrictEqual(metric, {
-    name: 'double-observer',
-    description: 'sample observer description',
+    name: 'double-observable-gauge',
+    description: 'sample observable gauge description',
     unit: '1',
     data: 'doubleGauge',
     doubleGauge: {
@@ -152,15 +152,15 @@ export function ensureExportedObserverIsCorrect(
   });
 }
 
-export function ensureExportedValueRecorderIsCorrect(
+export function ensureExportedHistogramIsCorrect(
   metric: otlpTypes.opentelemetryProto.metrics.v1.Metric,
   time?: number,
   explicitBounds: number[] = [Infinity],
   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: {

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts
@@ -16,9 +16,9 @@
 
 import {
   Counter,
-  ObserverResult,
-  ValueObserver,
-  ValueRecorder,
+  ObservableResult,
+  ObservableGauge,
+  Histogram,
   ValueType,
 } from '@opentelemetry/api-metrics';
 import { otlpTypes } from '@opentelemetry/exporter-otlp-http';
@@ -51,16 +51,16 @@ export function mockCounter(): metrics.Metric<metrics.BoundCounter> & Counter {
   return metric;
 }
 
-export function mockObserver(
-  callback: (observerResult: ObserverResult) => void
-): metrics.Metric<metrics.BoundCounter> & ValueObserver {
-  const name = 'double-observer';
+export function mockObservableGauge(
+  callback: (observableResult: ObservableResult) => void
+): metrics.Metric<metrics.BoundCounter> & ObservableGauge {
+  const name = 'double-observable-gauge';
   const metric =
     meter['_metrics'].get(name) ||
-    meter.createValueObserver(
+    meter.createObservableGauge(
       name,
       {
-        description: 'sample observer description',
+        description: 'sample observable gauge description',
         valueType: ValueType.DOUBLE,
       },
       callback
@@ -70,13 +70,13 @@ export function mockObserver(
   return metric;
 }
 
-export function mockValueRecorder(): metrics.Metric<metrics.BoundValueRecorder> &
-  ValueRecorder {
-  const name = 'int-recorder';
+export function mockHistogram(): metrics.Metric<metrics.BoundHistogram> &
+  Histogram {
+  const name = 'int-histogram';
   const metric =
     meter['_metrics'].get(name) ||
-    meter.createValueRecorder(name, {
-      description: 'sample recorder description',
+    meter.createHistogram(name, {
+      description: 'sample histogram description',
       valueType: ValueType.INT,
       boundaries: [0, 100],
     });
@@ -124,13 +124,13 @@ export function ensureExportedCounterIsCorrect(
   });
 }
 
-export function ensureExportedObserverIsCorrect(
+export function ensureExportedObservableGaugeIsCorrect(
   metric: otlpTypes.opentelemetryProto.metrics.v1.Metric,
   time?: number
 ) {
   assert.deepStrictEqual(metric, {
-    name: 'double-observer',
-    description: 'sample observer description',
+    name: 'double-observable-gauge',
+    description: 'sample observable gauge description',
     unit: '1',
     doubleGauge: {
       dataPoints: [
@@ -144,15 +144,15 @@ export function ensureExportedObserverIsCorrect(
   });
 }
 
-export function ensureExportedValueRecorderIsCorrect(
+export function ensureExportedHistogramIsCorrect(
   metric: otlpTypes.opentelemetryProto.metrics.v1.Metric,
   time?: number,
   explicitBounds: number[] = [Infinity],
   bucketCounts: string[] = ['2', '0']
 ) {
   assert.deepStrictEqual(metric, {
-    name: 'int-recorder',
-    description: 'sample recorder description',
+    name: 'int-histogram',
+    description: 'sample histogram description',
     unit: '1',
     intHistogram: {
       dataPoints: [

diff --git a/...tal/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts b/...tal/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts
@@ -29,7 +29,7 @@ import {
   ensureWebResourceIsCorrect,
   ensureHeadersContain,
   mockedReadableSpan,
-} from '../helper';
+} from '../traceHelper';
 
 describe('OTLPTraceExporter - web', () => {
   let collectorTraceExporter: OTLPTraceExporter;

diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts
@@ -16,7 +16,7 @@
 
 import * as sinon from 'sinon';
 import { sendWithXhr } from '../../src/platform/browser/util';
-import { ensureHeadersContain } from '../helper';
+import { ensureHeadersContain } from '../traceHelper';
 
 describe('util - browser', () => {
   let server: any;

diff --git a/...ntal/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts b/...ntal/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts
@@ -20,7 +20,7 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { OTLPExporterBase } from '../../src/OTLPExporterBase';
 import { OTLPExporterConfigBase } from '../../src/types';
-import { mockedReadableSpan } from '../helper';
+import { mockedReadableSpan } from '../traceHelper';
 import * as otlpTypes from '../../src/types';
 
 type CollectorExporterConfig = OTLPExporterConfigBase;

diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts
@@ -25,7 +25,7 @@ import {
   mockedInstrumentationLibraries,
   multiResourceTrace,
   multiInstrumentationLibraryTrace,
-} from '../helper';
+} from '../traceHelper';
 import { Resource } from '@opentelemetry/resources';
 describe('transform', () => {
   describe('toCollectorAttributes', () => {

diff --git a/...mental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts b/...mental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts
@@ -34,7 +34,7 @@ import {
   ensureExportTraceServiceRequestIsSet,
   ensureSpanIsCorrect,
   mockedReadableSpan,
-} from '../helper';
+} from '../traceHelper';
 
 let fakeRequest: PassThrough;
 

diff --git a/...lemetry-exporter-otlp-http/test/helper.ts → ...ry-exporter-otlp-http/test/traceHelper.ts b/...lemetry-exporter-otlp-http/test/helper.ts → ...ry-exporter-otlp-http/test/traceHelper.ts