Skip to content

Commit 22d7455

Browse files
authored
Merge branch 'main' into feature/add-optional-selectors
2 parents ac5c4d1 + be24d69 commit 22d7455

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

experimental/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ All notable changes to experimental packages in this project will be documented
3939
* `NoopObservableUpDownCounterMetric`
4040
* `NoopUpDownCounterMetric`
4141
* feat(sdk-metrics): align MetricReader with specification and other language implementations [#3225](https://github.com/open-telemetry/opentelemetry-js/pull/3225) @pichlermarc
42+
* chore(sdk-metrics): remove accidental export of the SDK `Meter` class [#3243](https://github.com/open-telemetry/opentelemetry-js/pull/3243) @pichlermarc
4243

4344
### :rocket: (Enhancement)
4445

experimental/packages/opentelemetry-sdk-metrics/src/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ export {
6868
InstrumentType,
6969
} from './InstrumentDescriptor';
7070

71-
export {
72-
Meter,
73-
} from './Meter';
74-
7571
export {
7672
MeterProvider,
7773
MeterProviderOptions,

experimental/packages/opentelemetry-sdk-metrics/test/MeterProvider.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import * as assert from 'assert';
18-
import { Meter, MeterProvider, InstrumentType, DataPointType } from '../src';
18+
import { MeterProvider, InstrumentType, DataPointType } from '../src';
1919
import {
2020
assertScopeMetrics,
2121
assertMetricData,
@@ -25,6 +25,7 @@ import {
2525
import { TestMetricReader } from './export/TestMetricReader';
2626
import * as sinon from 'sinon';
2727
import { View } from '../src/view/View';
28+
import { Meter } from '../src/Meter';
2829

2930
describe('MeterProvider', () => {
3031
afterEach(() => {

experimental/packages/opentelemetry-sdk-metrics/test/state/MeterSharedState.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import * as assert from 'assert';
1818
import * as sinon from 'sinon';
1919
import {
20-
Meter,
2120
MeterProvider,
2221
DataPointType,
2322
View,
@@ -29,6 +28,7 @@ import { assertMetricData, defaultInstrumentationScope, defaultResource, sleep }
2928
import { TestDeltaMetricReader, TestMetricReader } from '../export/TestMetricReader';
3029
import { MeterSharedState } from '../../src/state/MeterSharedState';
3130
import { CollectionResult } from '../../src/export/MetricData';
31+
import { Meter } from '../../src/Meter';
3232

3333
describe('MeterSharedState', () => {
3434
afterEach(() => {

0 commit comments

Comments
 (0)