Skip to content

Commit f73f51d

Browse files
authored
chore(api-logs)!: remove ProxyLoggerProvider export (#6322)
1 parent 82ad3b7 commit f73f51d

8 files changed

Lines changed: 42 additions & 22 deletions

File tree

experimental/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
1010

1111
* fix(otlp-exporter-base)!: remove xhr transport [#6317](https://github.com/open-telemetry/opentelemetry-js/pull/6317) @cjihrig
1212
* (user-facing) The deprecated XHR-based transport has been removed and replaced with `fetch()`. This change affects users who relied on `XmlHttpRequest` instead of `fetch()` for sending headers with OTLP exports. To maintain compatibility on browsers without a `fetch()` implementation, include a `fetch()` polyfill.
13+
chore(api-logs)!: remove `ProxyLoggerProvider` export [#6322](https://github.com/open-telemetry/opentelemetry-js/pull/6322) @david-luna
1314

1415
### :rocket: Features
1516

experimental/packages/api-logs/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export type { LogAttributes, LogBody, LogRecord } from './types/LogRecord';
2121
export type { LoggerOptions } from './types/LoggerOptions';
2222
export type { AnyValue, AnyValueMap } from './types/AnyValue';
2323
export { NOOP_LOGGER, NoopLogger } from './NoopLogger';
24-
export { ProxyLoggerProvider } from './ProxyLoggerProvider';
2524

2625
import { LogsAPI } from './api/logs';
2726
export const logs = LogsAPI.getInstance();

experimental/packages/api-logs/test/api/api.test.ts

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

1717
import * as assert from 'assert';
18-
import { Logger, ProxyLoggerProvider, logs } from '../../src';
18+
import { Logger, logs } from '../../src';
19+
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';
1920
import { NoopLogger } from '../../src/NoopLogger';
2021
import { NoopLoggerProvider } from '../../src/NoopLoggerProvider';
2122

experimental/packages/api-logs/test/internal/global.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import * as assert from 'assert';
1818
import { _global, GLOBAL_LOGS_API_KEY } from '../../src/internal/global-utils';
1919
import { NoopLoggerProvider } from '../../src/NoopLoggerProvider';
20-
import { ProxyLoggerProvider } from '../../src';
20+
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';
2121

2222
const api1 = require('../../src') as typeof import('../../src');
2323

experimental/packages/api-logs/test/proxy-implementations/proxy-logger.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
import * as assert from 'assert';
1818
import * as sinon from 'sinon';
19-
import { Logger, LoggerProvider, ProxyLoggerProvider } from '../../src';
19+
import { Logger, LoggerProvider } from '../../src';
2020
import { NoopLogger } from '../../src/NoopLogger';
2121
import { ProxyLogger } from '../../src/ProxyLogger';
22+
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';
2223

2324
describe('ProxyLogger', () => {
2425
let provider: ProxyLoggerProvider;

packages/opentelemetry-sdk-trace-node/test/registration.test.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ describe('API registration', function () {
5959
propagation['_getGlobalPropagator'](),
6060
CompositePropagator
6161
);
62-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
63-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
62+
sinon.assert.calledOnceWithMatch(
63+
setGlobalTracerProviderSpy,
64+
(provider: any) => provider === tracerProvider
65+
);
6466
});
6567

6668
it('should register configured implementations', function () {
@@ -80,8 +82,10 @@ describe('API registration', function () {
8082
assert.strictEqual(context['_getContextManager'](), mockContextManager);
8183
assert.strictEqual(propagation['_getGlobalPropagator'](), mockPropagator);
8284

83-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
84-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
85+
sinon.assert.calledOnceWithMatch(
86+
setGlobalTracerProviderSpy,
87+
(provider: any) => provider === tracerProvider
88+
);
8589
});
8690

8791
it('should skip null context manager', function () {
@@ -102,8 +106,10 @@ describe('API registration', function () {
102106
CompositePropagator
103107
);
104108

105-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
106-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
109+
sinon.assert.calledOnceWithMatch(
110+
setGlobalTracerProviderSpy,
111+
(provider: any) => provider === tracerProvider
112+
);
107113
});
108114

109115
it('should skip null propagator', function () {
@@ -121,7 +127,9 @@ describe('API registration', function () {
121127
AsyncLocalStorageContextManager
122128
);
123129

124-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
125-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
130+
sinon.assert.calledOnceWithMatch(
131+
setGlobalTracerProviderSpy,
132+
(provider: any) => provider === tracerProvider
133+
);
126134
});
127135
});

packages/opentelemetry-sdk-trace-web/test/NodeGlobalsFoolProofing.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ describe('Node Globals Foolproofing', function () {
5757
);
5858

5959
assert.ok(context['_getContextManager']() instanceof StackContextManager);
60-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
61-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
60+
sinon.assert.calledOnceWithMatch(
61+
setGlobalTracerProviderSpy,
62+
(provider: any) => provider === tracerProvider
63+
);
6264
});
6365

6466
it('Can get TraceProvider with custom id generator and without node globals such as process', function () {

packages/opentelemetry-sdk-trace-web/test/registration.test.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ describe('API registration', function () {
4242
assert.ok(
4343
propagation['_getGlobalPropagator']() instanceof CompositePropagator
4444
);
45-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
46-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
45+
sinon.assert.calledOnceWithMatch(
46+
setGlobalTracerProviderSpy,
47+
(provider: any) => provider === tracerProvider
48+
);
4749
});
4850

4951
it('should register configured implementations', function () {
@@ -60,8 +62,10 @@ describe('API registration', function () {
6062
assert.ok(context['_getContextManager']() === contextManager);
6163
assert.ok(propagation['_getGlobalPropagator']() === propagator);
6264

63-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
64-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
65+
sinon.assert.calledOnceWithMatch(
66+
setGlobalTracerProviderSpy,
67+
(provider: any) => provider === tracerProvider
68+
);
6569
});
6670

6771
it('should skip null context manager', function () {
@@ -80,8 +84,10 @@ describe('API registration', function () {
8084
assert.ok(
8185
propagation['_getGlobalPropagator']() instanceof CompositePropagator
8286
);
83-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
84-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
87+
sinon.assert.calledOnceWithMatch(
88+
setGlobalTracerProviderSpy,
89+
(provider: any) => provider === tracerProvider
90+
);
8591
});
8692

8793
it('should skip null propagator', function () {
@@ -98,7 +104,9 @@ describe('API registration', function () {
98104
);
99105

100106
assert.ok(context['_getContextManager']() instanceof StackContextManager);
101-
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
102-
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
107+
sinon.assert.calledOnceWithMatch(
108+
setGlobalTracerProviderSpy,
109+
(provider: any) => provider === tracerProvider
110+
);
103111
});
104112
});

0 commit comments

Comments
 (0)