Skip to content

Commit f6a075b

Browse files
authored
Rename EventEmitter to EventLogger in the Events API (#4568)
* renamed EventEmitter to EventLogger * updated changelog * renamed remaining references to emitter * lint
1 parent 97af8e6 commit f6a075b

14 files changed

+124
-127
lines changed

experimental/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ All notable changes to experimental packages in this project will be documented
2020
* `compression`
2121
* was used internally to keep track of the compression to use but was unintentionally exposed to the users. It allowed to read and write the value, writing, however, would have no effect.
2222
* feat(api-events)!: removed domain from the Events API [#4569](https://github.com/open-telemetry/opentelemetry-js/pull/4569)
23+
* fix(events-api)!: renamed EventEmitter to EventLogger in the Events API [#4569](https://github.com/open-telemetry/opentelemetry-js/pull/4568)
2324

2425
### :rocket: (Enhancement)
2526

experimental/packages/api-events/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ If you are writing an instrumentation library, or prefer to call the API methods
2828
```javascript
2929
const api = require("@opentelemetry/api-events");
3030

31-
/* A specific implementation of EventEmitterProvider comes from an SDK */
32-
const eventEmitterProvider = createEventEmitterProvider();
31+
/* A specific implementation of EventLoggerProvider comes from an SDK */
32+
const eventLoggerProvider = createEventLoggerProvider();
3333

34-
/* Initialize EventEmitterProvider */
35-
api.events.setGlobalEventEmitterProvider(eventEmitterProvider);
36-
/* returns eventEmitterProvider (no-op if a working provider has not been initialized) */
37-
api.events.getEventEmitterProvider();
38-
/* returns an event emitter from the registered global event emitter provider (no-op if a working provider has not been initialized) */
39-
const eventEmitter = api.events.getEventEmitter(name, version);
34+
/* Initialize EventLoggerProvider */
35+
api.events.setGlobalEventLoggerProvider(eventLoggerProvider);
36+
/* returns eventLoggerProvider (no-op if a working provider has not been initialized) */
37+
api.events.getEventLoggerProvider();
38+
/* returns an event logger from the registered global event logger provider (no-op if a working provider has not been initialized) */
39+
const eventLogger = api.events.getEventLogger(name, version);
4040

4141
// logging an event in an instrumentation library
42-
eventEmitter.emit({ name: 'event-name' });
42+
eventLogger.emit({ name: 'event-name' });
4343
```
4444

4545
## Useful links

experimental/packages/api-events/src/NoopEventEmitter.ts renamed to experimental/packages/api-events/src/NoopEventLogger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { EventEmitter } from './types/EventEmitter';
17+
import { EventLogger } from './types/EventLogger';
1818
import { Event } from './types/Event';
1919

20-
export class NoopEventEmitter implements EventEmitter {
20+
export class NoopEventLogger implements EventLogger {
2121
emit(_event: Event): void {}
2222
}

experimental/packages/api-events/src/NoopEventEmitterProvider.ts renamed to experimental/packages/api-events/src/NoopEventLoggerProvider.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { EventEmitterProvider } from './types/EventEmitterProvider';
18-
import { EventEmitter } from './types/EventEmitter';
19-
import { EventEmitterOptions } from './types/EventEmitterOptions';
20-
import { NoopEventEmitter } from './NoopEventEmitter';
17+
import { EventLoggerProvider } from './types/EventLoggerProvider';
18+
import { EventLogger } from './types/EventLogger';
19+
import { EventLoggerOptions } from './types/EventLoggerOptions';
20+
import { NoopEventLogger } from './NoopEventLogger';
2121

22-
export class NoopEventEmitterProvider implements EventEmitterProvider {
23-
getEventEmitter(
22+
export class NoopEventLoggerProvider implements EventLoggerProvider {
23+
getEventLogger(
2424
_name: string,
2525
_version?: string | undefined,
26-
_options?: EventEmitterOptions | undefined
27-
): EventEmitter {
28-
return new NoopEventEmitter();
26+
_options?: EventLoggerOptions | undefined
27+
): EventLogger {
28+
return new NoopEventLogger();
2929
}
3030
}
3131

32-
export const NOOP_EVENT_EMITTER_PROVIDER = new NoopEventEmitterProvider();
32+
export const NOOP_EVENT_LOGGER_PROVIDER = new NoopEventLoggerProvider();

experimental/packages/api-events/src/api/events.ts

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import {
2020
_global,
2121
makeGetter,
2222
} from '../internal/global-utils';
23-
import { EventEmitterProvider } from '../types/EventEmitterProvider';
24-
import { NOOP_EVENT_EMITTER_PROVIDER } from '../NoopEventEmitterProvider';
25-
import { EventEmitter } from '../types/EventEmitter';
26-
import { EventEmitterOptions } from '../types/EventEmitterOptions';
23+
import { EventLoggerProvider } from '../types/EventLoggerProvider';
24+
import { NOOP_EVENT_LOGGER_PROVIDER } from '../NoopEventLoggerProvider';
25+
import { EventLogger } from '../types/EventLogger';
26+
import { EventLoggerOptions } from '../types/EventLoggerOptions';
2727

2828
export class EventsAPI {
2929
private static _instance?: EventsAPI;
@@ -38,52 +38,48 @@ export class EventsAPI {
3838
return this._instance;
3939
}
4040

41-
public setGlobalEventEmitterProvider(
42-
provider: EventEmitterProvider
43-
): EventEmitterProvider {
41+
public setGlobalEventLoggerProvider(
42+
provider: EventLoggerProvider
43+
): EventLoggerProvider {
4444
if (_global[GLOBAL_EVENTS_API_KEY]) {
45-
return this.getEventEmitterProvider();
45+
return this.getEventLoggerProvider();
4646
}
4747

48-
_global[GLOBAL_EVENTS_API_KEY] = makeGetter<EventEmitterProvider>(
48+
_global[GLOBAL_EVENTS_API_KEY] = makeGetter<EventLoggerProvider>(
4949
API_BACKWARDS_COMPATIBILITY_VERSION,
5050
provider,
51-
NOOP_EVENT_EMITTER_PROVIDER
51+
NOOP_EVENT_LOGGER_PROVIDER
5252
);
5353

5454
return provider;
5555
}
5656

5757
/**
58-
* Returns the global event emitter provider.
58+
* Returns the global event logger provider.
5959
*
60-
* @returns EventEmitterProvider
60+
* @returns EventLoggerProvider
6161
*/
62-
public getEventEmitterProvider(): EventEmitterProvider {
62+
public getEventLoggerProvider(): EventLoggerProvider {
6363
return (
6464
_global[GLOBAL_EVENTS_API_KEY]?.(API_BACKWARDS_COMPATIBILITY_VERSION) ??
65-
NOOP_EVENT_EMITTER_PROVIDER
65+
NOOP_EVENT_LOGGER_PROVIDER
6666
);
6767
}
6868

6969
/**
70-
* Returns a event emitter from the global event emitter provider.
70+
* Returns a event logger from the global event logger provider.
7171
*
72-
* @returns EventEmitter
72+
* @returns EventLogger
7373
*/
74-
public getEventEmitter(
74+
public getEventLogger(
7575
name: string,
7676
version?: string,
77-
options?: EventEmitterOptions
78-
): EventEmitter {
79-
return this.getEventEmitterProvider().getEventEmitter(
80-
name,
81-
version,
82-
options
83-
);
77+
options?: EventLoggerOptions
78+
): EventLogger {
79+
return this.getEventLoggerProvider().getEventLogger(name, version, options);
8480
}
8581

86-
/** Remove the global event emitter provider */
82+
/** Remove the global event logger provider */
8783
public disable(): void {
8884
delete _global[GLOBAL_EVENTS_API_KEY];
8985
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
export * from './types/EventEmitter';
18-
export * from './types/EventEmitterProvider';
17+
export * from './types/EventLogger';
18+
export * from './types/EventLoggerProvider';
1919
export * from './types/Event';
20-
export * from './types/EventEmitterOptions';
20+
export * from './types/EventLoggerOptions';
2121

2222
import { EventsAPI } from './api/events';
2323
export const events = EventsAPI.getInstance();

experimental/packages/api-events/src/internal/global-utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { EventEmitterProvider } from '../types/EventEmitterProvider';
17+
import { EventLoggerProvider } from '../types/EventLoggerProvider';
1818
import { _globalThis } from '../platform';
1919

2020
export const GLOBAL_EVENTS_API_KEY = Symbol.for(
@@ -23,7 +23,7 @@ export const GLOBAL_EVENTS_API_KEY = Symbol.for(
2323

2424
type Get<T> = (version: number) => T;
2525
type OtelGlobal = Partial<{
26-
[GLOBAL_EVENTS_API_KEY]: Get<EventEmitterProvider>;
26+
[GLOBAL_EVENTS_API_KEY]: Get<EventLoggerProvider>;
2727
}>;
2828

2929
export const _global = _globalThis as OtelGlobal;

experimental/packages/api-events/src/types/EventEmitter.ts renamed to experimental/packages/api-events/src/types/EventLogger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { Event } from './Event';
1818

19-
export interface EventEmitter {
19+
export interface EventLogger {
2020
/**
2121
* Emit an event. This method should only be used by instrumentations emitting events.
2222
*

experimental/packages/api-events/src/types/EventEmitterOptions.ts renamed to experimental/packages/api-events/src/types/EventLoggerOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { Attributes } from '@opentelemetry/api';
1818

19-
export interface EventEmitterOptions {
19+
export interface EventLoggerOptions {
2020
/**
2121
* The schemaUrl of the tracer or instrumentation library
2222
* @default ''

experimental/packages/api-events/src/types/EventEmitterProvider.ts renamed to experimental/packages/api-events/src/types/EventLoggerProvider.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { EventEmitter } from './EventEmitter';
18-
import { EventEmitterOptions } from './EventEmitterOptions';
17+
import { EventLogger } from './EventLogger';
18+
import { EventLoggerOptions } from './EventLoggerOptions';
1919

2020
/**
21-
* A registry for creating named {@link EventEmitter}s.
21+
* A registry for creating named {@link EventLogger}s.
2222
*/
23-
export interface EventEmitterProvider {
23+
export interface EventLoggerProvider {
2424
/**
25-
* Returns an EventEmitter, creating one if one with the given name, version, and
25+
* Returns an EventLogger, creating one if one with the given name, version, and
2626
* schemaUrl pair is not already created.
2727
*
28-
* @param name The name of the event emitter or instrumentation library.
29-
* @param version The version of the event emitter or instrumentation library.
30-
* @param options The options of the event emitter or instrumentation library.
31-
* @returns EventEmitter An event emitter with the given name and version.
28+
* @param name The name of the event logger or instrumentation library.
29+
* @param version The version of the event logger or instrumentation library.
30+
* @param options The options of the event logger or instrumentation library.
31+
* @returns EventLogger An event logger with the given name and version.
3232
*/
33-
getEventEmitter(
33+
getEventLogger(
3434
name: string,
3535
version?: string,
36-
options?: EventEmitterOptions
37-
): EventEmitter;
36+
options?: EventLoggerOptions
37+
): EventLogger;
3838
}

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,57 @@
1515
*/
1616

1717
import * as assert from 'assert';
18-
import { EventEmitter, events } from '../../src';
19-
import { NoopEventEmitter } from '../../src/NoopEventEmitter';
20-
import { NoopEventEmitterProvider } from '../../src/NoopEventEmitterProvider';
18+
import { EventLogger, events } from '../../src';
19+
import { NoopEventLogger } from '../../src/NoopEventLogger';
20+
import { NoopEventLoggerProvider } from '../../src/NoopEventLoggerProvider';
2121

2222
describe('API', () => {
23-
const dummyEventEmitter = new NoopEventEmitter();
23+
const dummyEventLogger = new NoopEventLogger();
2424

25-
it('should expose a event emitter provider via getEventEmitterProvider', () => {
26-
const provider = events.getEventEmitterProvider();
25+
it('should expose a event logger provider via getEventLoggerProvider', () => {
26+
const provider = events.getEventLoggerProvider();
2727
assert.ok(provider);
2828
assert.strictEqual(typeof provider, 'object');
2929
});
3030

31-
describe('GlobalEventEmitterProvider', () => {
31+
describe('GlobalEventLoggerProvider', () => {
3232
beforeEach(() => {
3333
events.disable();
3434
});
3535

36-
it('should use the global event emitter provider', () => {
37-
events.setGlobalEventEmitterProvider(new TestEventEmitterProvider());
38-
const eventEmitter = events
39-
.getEventEmitterProvider()
40-
.getEventEmitter('name');
41-
assert.deepStrictEqual(eventEmitter, dummyEventEmitter);
36+
it('should use the global event logger provider', () => {
37+
events.setGlobalEventLoggerProvider(new TestEventLoggerProvider());
38+
const eventLogger = events
39+
.getEventLoggerProvider()
40+
.getEventLogger('name');
41+
assert.deepStrictEqual(eventLogger, dummyEventLogger);
4242
});
4343

4444
it('should not allow overriding global provider if already set', () => {
45-
const provider1 = new TestEventEmitterProvider();
46-
const provider2 = new TestEventEmitterProvider();
47-
events.setGlobalEventEmitterProvider(provider1);
48-
assert.equal(events.getEventEmitterProvider(), provider1);
49-
events.setGlobalEventEmitterProvider(provider2);
50-
assert.equal(events.getEventEmitterProvider(), provider1);
45+
const provider1 = new TestEventLoggerProvider();
46+
const provider2 = new TestEventLoggerProvider();
47+
events.setGlobalEventLoggerProvider(provider1);
48+
assert.equal(events.getEventLoggerProvider(), provider1);
49+
events.setGlobalEventLoggerProvider(provider2);
50+
assert.equal(events.getEventLoggerProvider(), provider1);
5151
});
5252
});
5353

54-
describe('getEventEmitter', () => {
54+
describe('getEventLogger', () => {
5555
beforeEach(() => {
5656
events.disable();
5757
});
5858

59-
it('should return a event emitter instance from global provider', () => {
60-
events.setGlobalEventEmitterProvider(new TestEventEmitterProvider());
61-
const eventEmitter = events.getEventEmitter('myEventEmitter');
62-
assert.deepStrictEqual(eventEmitter, dummyEventEmitter);
59+
it('should return a event logger instance from global provider', () => {
60+
events.setGlobalEventLoggerProvider(new TestEventLoggerProvider());
61+
const eventLogger = events.getEventLogger('myEventLogger');
62+
assert.deepStrictEqual(eventLogger, dummyEventLogger);
6363
});
6464
});
6565

66-
class TestEventEmitterProvider extends NoopEventEmitterProvider {
67-
override getEventEmitter(): EventEmitter {
68-
return dummyEventEmitter;
66+
class TestEventLoggerProvider extends NoopEventLoggerProvider {
67+
override getEventLogger(): EventLogger {
68+
return dummyEventLogger;
6969
}
7070
}
7171
});

0 commit comments

Comments
 (0)