Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logs API: Add emitEvent to Logs API #5050

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions experimental/packages/api-events/src/types/Event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import { Attributes, Context, TimeInput } from '@opentelemetry/api';
import { AnyValue, SeverityNumber } from '@opentelemetry/api-logs';

// NOTE: this file will be moved to api-logs/EventRecord

export interface Event {
/**
* The time when the event occurred as UNIX Epoch time in nanoseconds.
Expand Down
3 changes: 3 additions & 0 deletions experimental/packages/api-logs/src/NoopLogger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
* limitations under the License.
*/

import { EventRecord } from './types/EventRecord';
import { Logger } from './types/Logger';
import { LogRecord } from './types/LogRecord';

export class NoopLogger implements Logger {
emit(_logRecord: LogRecord): void {}

emitEvent(_name: string, _eventRecord?: EventRecord): void {}
}

export const NOOP_LOGGER = new NoopLogger();
5 changes: 5 additions & 0 deletions experimental/packages/api-logs/src/ProxyLogger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import { NOOP_LOGGER } from './NoopLogger';
import { EventRecord } from './types/EventRecord';
import { Logger } from './types/Logger';
import { LoggerOptions } from './types/LoggerOptions';
import { LogRecord } from './types/LogRecord';
Expand All @@ -39,6 +40,10 @@ export class ProxyLogger implements Logger {
this._getLogger().emit(logRecord);
}

emitEvent(name: string, eventRecord?: EventRecord): void {
this._getLogger().emitEvent(name, eventRecord);
}

/**
* Try to get a logger from the proxy logger provider.
* If the proxy logger provider has no delegate, return a noop logger.
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/api-logs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
LogRecord,
SeverityNumber,
} from './types/LogRecord';
export { EventRecord } from './types/EventRecord';
export { LoggerOptions } from './types/LoggerOptions';
export { AnyValue, AnyValueMap } from './types/AnyValue';
export { NOOP_LOGGER, NoopLogger } from './NoopLogger';
Expand Down
52 changes: 52 additions & 0 deletions experimental/packages/api-logs/src/types/EventRecord.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { Attributes, Context, TimeInput } from '@opentelemetry/api';
import { AnyValue } from './AnyValue';
import { SeverityNumber } from './LogRecord';

export interface EventRecord {

/**
* The time when the event occurred as UNIX Epoch time in nanoseconds.
*/
timestamp?: TimeInput;

/**
* Data that describes the event.
* Intended to be used by instrumentation libraries.
*/
data?: AnyValue;

/**
* Additional attributes that describe the event.
*/
attributes?: Attributes;

/**
* Numerical value of the severity.
*/
severityNumber?: SeverityNumber;

/**
* The Context associated with the Event.
*/
context?: Context;
}




6 changes: 6 additions & 0 deletions experimental/packages/api-logs/src/types/Logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/

import { EventRecord } from './EventRecord';
import { LogRecord } from './LogRecord';

export interface Logger {
Expand All @@ -23,4 +24,9 @@ export interface Logger {
* @param logRecord
*/
emit(logRecord: LogRecord): void;

/**
* Emit an event. Event Name is required.
*/
emitEvent(name: string, eventRecord?: EventRecord): void;
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ describe('ProxyLogger', () => {
emit() {
emitCalled = true;
},
emitEvent() {
// TODO: add tests
}
};

logger = provider.getLogger('test');
Expand Down
3 changes: 2 additions & 1 deletion experimental/packages/sdk-events/test/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
* limitations under the License.
*/

import { LogRecord, Logger } from '@opentelemetry/api-logs';
import { EventRecord, LogRecord, Logger } from '@opentelemetry/api-logs';

export class TestLogger implements Logger {
emit(logRecord: LogRecord): void {}
emitEvent(name: string, eventRecord?: EventRecord | undefined): void {}
}
20 changes: 20 additions & 0 deletions experimental/packages/sdk-logs/src/Logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { context } from '@opentelemetry/api';

import { LogRecord } from './LogRecord';
import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState';
import { SeverityNumber } from '@opentelemetry/api-logs';

export class Logger implements logsAPI.Logger {
constructor(
Expand Down Expand Up @@ -53,4 +54,23 @@ export class Logger implements logsAPI.Logger {
*/
logRecordInstance._makeReadonly();
}

public emitEvent(name: string, eventRecord?: logsAPI.EventRecord): void {
const curEvtRecord = eventRecord || {};
const attributes = curEvtRecord.attributes || {};
attributes['event.name'] = name;

const logRecord: logsAPI.LogRecord = {
attributes: attributes,
context: curEvtRecord.context || context.active(),
severityNumber: curEvtRecord.severityNumber || SeverityNumber.INFO,
timestamp: curEvtRecord.timestamp || Date.now(),
};

if (curEvtRecord.data) {
logRecord.body = curEvtRecord.data;
}

this.emit(logRecord);
}
}