Merge branch 'main' into feature/add-optional-selectors

open-telemetry · Sep 12, 2022 · 22d7455 · 22d7455
2 parents ac5c4d1 + be24d69
commit 22d7455
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -39,6 +39,7 @@ All notable changes to experimental packages in this project will be documented
     * `NoopObservableUpDownCounterMetric`
     * `NoopUpDownCounterMetric`
 * feat(sdk-metrics): align MetricReader with specification and other language implementations [#3225](https://github.com/open-telemetry/opentelemetry-js/pull/3225) @pichlermarc
+* chore(sdk-metrics): remove accidental export of the SDK `Meter` class [#3243](https://github.com/open-telemetry/opentelemetry-js/pull/3243) @pichlermarc
 
 ### :rocket: (Enhancement)
 

diff --git a/experimental/packages/opentelemetry-sdk-metrics/src/index.ts b/experimental/packages/opentelemetry-sdk-metrics/src/index.ts
@@ -68,10 +68,6 @@ export {
   InstrumentType,
 } from './InstrumentDescriptor';
 
-export {
-  Meter,
-} from './Meter';
-
 export {
   MeterProvider,
   MeterProviderOptions,

diff --git a/experimental/packages/opentelemetry-sdk-metrics/test/MeterProvider.test.ts b/experimental/packages/opentelemetry-sdk-metrics/test/MeterProvider.test.ts
@@ -15,7 +15,7 @@
  */
 
 import * as assert from 'assert';
-import { Meter, MeterProvider, InstrumentType, DataPointType } from '../src';
+import { MeterProvider, InstrumentType, DataPointType } from '../src';
 import {
   assertScopeMetrics,
   assertMetricData,
@@ -25,6 +25,7 @@ import {
 import { TestMetricReader } from './export/TestMetricReader';
 import * as sinon from 'sinon';
 import { View } from '../src/view/View';
+import { Meter } from '../src/Meter';
 
 describe('MeterProvider', () => {
   afterEach(() => {

diff --git a/experimental/packages/opentelemetry-sdk-metrics/test/state/MeterSharedState.test.ts b/experimental/packages/opentelemetry-sdk-metrics/test/state/MeterSharedState.test.ts
@@ -17,7 +17,6 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import {
-  Meter,
   MeterProvider,
   DataPointType,
   View,
@@ -29,6 +28,7 @@ import { assertMetricData, defaultInstrumentationScope, defaultResource, sleep }
 import { TestDeltaMetricReader, TestMetricReader } from '../export/TestMetricReader';
 import { MeterSharedState } from '../../src/state/MeterSharedState';
 import { CollectionResult } from '../../src/export/MetricData';
+import { Meter } from '../../src/Meter';
 
 describe('MeterSharedState', () => {
   afterEach(() => {