chore: resolve conflicts

open-telemetry · Jun 12, 2020 · 8f73840 · 8f73840
1 parent 555d168
commit 8f73840
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/packages/opentelemetry-api/src/metrics/Metric.ts b/packages/opentelemetry-api/src/metrics/Metric.ts
@@ -120,18 +120,14 @@ export interface Counter extends UnboundMetric<BoundCounter> {
   add(value: number, labels?: Labels): void;
 }
 
-<<<<<<< HEAD
-export interface ValueRecorder extends UnboundMetric<BoundValueRecorder> {
-=======
 export interface UpDownCounter extends UnboundMetric<BoundCounter> {
   /**
    * Adds the given value to the current value. Values can be negative.
    */
   add(value: number, labels?: Labels): void;
 }
 
-export interface Measure extends UnboundMetric<BoundMeasure> {
->>>>>>> a7dbd0b... feat: add the UpDownCounter instrument
+export interface ValueRecorder extends UnboundMetric<BoundValueRecorder> {
   /**
    * Records the given value to this value recorder.
    */

diff --git a/packages/opentelemetry-metrics/src/Meter.ts b/packages/opentelemetry-metrics/src/Meter.ts
@@ -19,7 +19,12 @@ import { ConsoleLogger } from '@opentelemetry/core';
 import { Resource } from '@opentelemetry/resources';
 import { BaseBoundInstrument } from './BoundInstrument';
 import { UpDownCounterMetric } from './UpDownCounterMetric';
-import { Metric, CounterMetric, ValueRecorderMetric, ObserverMetric } from './Metric';
+import {
+  Metric,
+  CounterMetric,
+  ValueRecorderMetric,
+  ObserverMetric,
+} from './Metric';
 import {
   MetricOptions,
   DEFAULT_METRIC_OPTIONS,
@@ -68,9 +73,9 @@ export class Meter implements api.Meter {
       return api.NOOP_VALUE_RECORDER_METRIC;
     }
     const opt: MetricOptions = {
-      absolute: true, // value recorders are defined as absolute by default
       logger: this._logger,
       ...DEFAULT_METRIC_OPTIONS,
+      absolute: true, // value recorders are defined as absolute by default
       ...options,
     };
 

diff --git a/packages/opentelemetry-metrics/src/Metric.ts b/packages/opentelemetry-metrics/src/Metric.ts
@@ -95,7 +95,7 @@ export abstract class Metric<T extends BaseBoundInstrument>
       description: this._options.description,
       unit: this._options.unit,
       metricKind: this._kind,
-      valueType: this._valueType
+      valueType: this._valueType,
     };
   }
 
@@ -134,7 +134,8 @@ export class CounterMetric extends Metric<BoundCounter> implements api.Counter {
   }
 }
 
-export class MeasureMetric extends Metric<BoundMeasure> implements api.Measure {
+export class ValueRecorderMetric extends Metric<BoundValueRecorder>
+  implements api.ValueRecorder {
   protected readonly _absolute: boolean;
 
   constructor(

diff --git a/packages/opentelemetry-metrics/src/export/types.ts b/packages/opentelemetry-metrics/src/export/types.ts
@@ -82,11 +82,6 @@ export interface MetricDescriptor {
   readonly unit: string;
   readonly metricKind: MetricKind;
   readonly valueType: ValueType;
-<<<<<<< HEAD
-  readonly monotonic: boolean;
-=======
-  readonly labelKeys: string[];
->>>>>>> a7dbd0b... feat: add the UpDownCounter instrument
 }
 
 /**

diff --git a/packages/opentelemetry-metrics/test/Meter.test.ts b/packages/opentelemetry-metrics/test/Meter.test.ts
@@ -411,7 +411,6 @@ describe('Meter', () => {
         assert.strictEqual(record.length, 1);
         assert.deepStrictEqual(record[0].descriptor, {
           description: '',
-          labelKeys: [],
           metricKind: MetricKind.COUNTER,
           name: 'name1',
           unit: '1',