Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion experimental/packages/api-logs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export type { LogAttributes, LogBody, LogRecord } from './types/LogRecord';
export type { LoggerOptions } from './types/LoggerOptions';
export type { AnyValue, AnyValueMap } from './types/AnyValue';
export { NOOP_LOGGER, NoopLogger } from './NoopLogger';
export { ProxyLoggerProvider } from './ProxyLoggerProvider';

import { LogsAPI } from './api/logs';
export const logs = LogsAPI.getInstance();
3 changes: 2 additions & 1 deletion experimental/packages/api-logs/test/api/api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

import * as assert from 'assert';
import { Logger, ProxyLoggerProvider, logs } from '../../src';
import { Logger, logs } from '../../src';
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';
import { NoopLogger } from '../../src/NoopLogger';
import { NoopLoggerProvider } from '../../src/NoopLoggerProvider';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import * as assert from 'assert';
import { _global, GLOBAL_LOGS_API_KEY } from '../../src/internal/global-utils';
import { NoopLoggerProvider } from '../../src/NoopLoggerProvider';
import { ProxyLoggerProvider } from '../../src';
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

import * as assert from 'assert';
import * as sinon from 'sinon';
import { Logger, LoggerProvider, ProxyLoggerProvider } from '../../src';
import { Logger, LoggerProvider } from '../../src';
import { NoopLogger } from '../../src/NoopLogger';
import { ProxyLogger } from '../../src/ProxyLogger';
import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider';

describe('ProxyLogger', () => {
let provider: ProxyLoggerProvider;
Expand Down
24 changes: 16 additions & 8 deletions packages/opentelemetry-sdk-trace-node/test/registration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ describe('API registration', function () {
propagation['_getGlobalPropagator'](),
CompositePropagator
);
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

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

assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);

@david-luna david-luna Jan 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note for reviewer: this and the changes below are leftovers from a previous PR. See #6319 (comment)

assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

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

assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

it('should skip null propagator', function () {
Expand All @@ -121,7 +127,9 @@ describe('API registration', function () {
AsyncLocalStorageContextManager
);

assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ describe('Node Globals Foolproofing', function () {
);

assert.ok(context['_getContextManager']() instanceof StackContextManager);
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

it('Can get TraceProvider with custom id generator and without node globals such as process', function () {
Expand Down
24 changes: 16 additions & 8 deletions packages/opentelemetry-sdk-trace-web/test/registration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ describe('API registration', function () {
assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
);
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

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

assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

it('should skip null context manager', function () {
Expand All @@ -80,8 +84,10 @@ describe('API registration', function () {
assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
);
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});

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

assert.ok(context['_getContextManager']() instanceof StackContextManager);
assert.strictEqual(setGlobalTracerProviderSpy.callCount, 1);
assert.ok(setGlobalTracerProviderSpy.lastCall.args[0] === tracerProvider);
sinon.assert.calledOnceWithMatch(
setGlobalTracerProviderSpy,
(provider: any) => provider === tracerProvider
);
});
});
Loading