Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0a00912
feat(sdk-logs): sdk-logs init
fuaiyi Jan 17, 2023
0a8910d
feat(sdk-logs): sdk-logs init
fuaiyi Jan 17, 2023
f25e7cf
feat(sdk-logs): sdk-logs init
fuaiyi Jan 17, 2023
b50422e
feat(sdk-logs): sdk-logs init
fuaiyi Jan 18, 2023
5fb3f64
feat(sdk-logs): sdk-logs init
fuaiyi Jan 18, 2023
76e66c1
feat(sdk-logs): sdk-logs init
fuaiyi Jan 18, 2023
2214a51
feat(sdk-logs): sdk-logs init
fuaiyi Jan 18, 2023
b5a51b4
fix compile errors
martinkuba Feb 18, 2023
f1f34a8
Merge remote-tracking branch 'upstream/main' into logs-sdk
fuaiyi Feb 18, 2023
8f8d25e
feat(sdk-logs): sdk-logs init
fuaiyi Feb 18, 2023
999f971
feat(sdk-logs): sdk-logs init
fuaiyi Feb 18, 2023
097d15d
feat(sdk-logs): sdk-logs init
fuaiyi Feb 18, 2023
1e1263b
feat(sdk-logs): sdk-logs init
fuaiyi Feb 18, 2023
66090b0
feat(sdk-logs): sdk-logs init
fuaiyi Feb 18, 2023
f045cf6
feat(sdk-logs): sdk-logs init
fuaiyi Feb 26, 2023
8196379
feat(sdk-logs): sdk-logs init
fuaiyi Feb 26, 2023
af2ae70
feat(sdk-logs): sdk-logs init
fuaiyi Feb 27, 2023
4a54b6f
Merge remote-tracking branch 'upstream/main' into logs-sdk
fuaiyi Feb 28, 2023
681d937
feat(sdk-logs): sdk-logs init
fuaiyi Feb 28, 2023
b06e7f3
feat(sdk-logs): sdk-logs init
fuaiyi Feb 28, 2023
6448b43
feat(sdk-logs): sdk-logs init
fuaiyi Feb 28, 2023
03ff511
feat(sdk-logs): add browser test config
fuaiyi Mar 1, 2023
a29f149
feat: add test-utils compatible assert.rejects
fuaiyi Mar 1, 2023
7803d66
feat(sdk-logs): fix writing errors in README
fuaiyi Mar 21, 2023
1a9a89e
Merge remote-tracking branch 'upstream/main' into logs-sdk
fuaiyi Mar 21, 2023
bb051ee
feat(sdk-logs): update version to 0.36.1
fuaiyi Mar 21, 2023
8bcb18d
feat(sdk-logs): add examples
fuaiyi Mar 21, 2023
413025f
feat(sdk-logs): fix LogRecord default timestamp to Date.now()
fuaiyi Mar 21, 2023
314ff95
feat(sdk-logs): logRecord support rewrite time/body/severityNumber/ne…
fuaiyi Mar 21, 2023
8d476d2
feat(sdk-logs): add logs processor environments
fuaiyi Mar 21, 2023
e579b13
feat(sdk-logs): modify export style
fuaiyi Mar 21, 2023
ab3b861
feat(sdk-logs): update version to 0.36.1
fuaiyi Mar 21, 2023
2501941
feat(sdk-logs): remove exporter factory
fuaiyi Mar 21, 2023
c0c1320
feat(sdk-logs): update CHANGELOG
fuaiyi Mar 21, 2023
14b1a55
feat(sdk-logs): change the processing of schemeUrl
fuaiyi Mar 21, 2023
e8ced53
feat(sdk-logs): split LoggerProviderConfig and LoggerConfig
fuaiyi Mar 28, 2023
8363356
feat(sdk-logs): getLogger with default name when name is invalid
fuaiyi Mar 28, 2023
b7e399e
feat(sdk-logs): improve the shutdown logic of LoggerProvider
fuaiyi Mar 28, 2023
b43efff
feat(sdk-logs): improve the shutdown logic of LoggerProvider
fuaiyi Mar 29, 2023
74fc360
Merge remote-tracking branch 'upstream/main' into logs-sdk
fuaiyi Apr 8, 2023
f423693
feat(sdk-logs): make log record read-only after it has been emitted
fuaiyi Apr 9, 2023
4cca19f
feat(sdk-logs): logger option support includeTraceContext & LogRecord…
fuaiyi Apr 12, 2023
4cb0337
feat(sdk-logs): update version
fuaiyi Apr 12, 2023
dcc1c6a
feat(sdk-logs): update version
fuaiyi Apr 12, 2023
0c3e7b3
feat(sdk-logs): update logs example with typescript
fuaiyi Apr 12, 2023
6d0cc64
feat(sdk-logs): update peerDependencies
fuaiyi Apr 12, 2023
e01b734
feat(sdk-logs): peer-api-check support @opentelemetry/api-logs
fuaiyi Apr 12, 2023
d8d8a95
feat(sdk-logs): update peerDependencies
fuaiyi Apr 12, 2023
fc2e666
Merge branch 'main' into logs-sdk
dyladan Apr 12, 2023
0c1c95a
Merge branch 'main' into logs-sdk
dyladan Apr 13, 2023
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
Prev Previous commit
Next Next commit
feat(sdk-logs): sdk-logs init
  • Loading branch information
fuaiyi committed Jan 17, 2023
commit 0a8910d633950478588facdb750168bd32534590
6 changes: 3 additions & 3 deletions experimental/packages/sdk-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
"@opentelemetry/api": ">=1.3.0 <1.4.0"
},
"dependencies": {
"@opentelemetry/core": "1.8.0",
"@opentelemetry/resources": "1.8.0",
"@opentelemetry/api-logs": "0.34.0"
"@opentelemetry/core": "1.9.0",
"@opentelemetry/resources": "1.9.0",
"@opentelemetry/api-logs": "0.35.0"
}
}
32 changes: 10 additions & 22 deletions experimental/packages/sdk-logs/src/LogRecord.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,20 @@ export class LogRecord implements ReadableLogRecord {
logRecord: logsAPI.LogRecord
) {
const {
time = hrTime(),
observedTime,
// if includeTraceContext is true, Gets the current trace context by default
context = this.config.includeTraceContext
? api.context.active()
: undefined,
timestamp = hrTime(),
severityNumber,
severityText,
body,
attributes = {},
spanId,
traceFlags,
traceId,
} = logRecord;
this.time = timeInputToHrTime(time);
this.observedTime =
observedTime === undefined
? observedTime
: timeInputToHrTime(observedTime);

if (context) {
const spanContext = api.trace.getSpanContext(context);
if (spanContext && api.isSpanContextValid(spanContext)) {
this.spanId = spanContext.spanId;
this.traceId = spanContext.traceId;
this.traceFlags = spanContext.traceFlags;
}
}
this.time = timeInputToHrTime(timestamp);

this.spanId = spanId;
this.traceId = traceId;
this.traceFlags = traceFlags;
this.severityNumber = severityNumber;
this.severityText = severityText;
this.body = body;
Expand All @@ -94,7 +82,7 @@ export class LogRecord implements ReadableLogRecord {
this.config.loggerSharedState.activeProcessor.onEmit(this);
}

private setAttribute(key: string, value?: AttributeValue): LogRecord {
public setAttribute(key: string, value?: AttributeValue): LogRecord {
if (value === null || this._isLogRecordEmitted()) {
return this;
}
Expand All @@ -117,7 +105,7 @@ export class LogRecord implements ReadableLogRecord {
return this;
}

private setAttributes(attributes: Attributes): LogRecord {
public setAttributes(attributes: Attributes): LogRecord {
for (const [k, v] of Object.entries(attributes)) {
this.setAttribute(k, v);
}
Expand Down
4 changes: 4 additions & 0 deletions experimental/packages/sdk-logs/src/Logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ import { LogRecord } from './LogRecord';
export class Logger implements logsAPI.Logger {
constructor(private readonly config: LoggerConfig) {}

public emitEvent(event: logsAPI.LogEvent): void {
new LogRecord(this.config, event).emit();
}

public emitLogRecord(logRecord: logsAPI.LogRecord): void {
new LogRecord(this.config, logRecord).emit();
}
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/sdk-logs/src/LoggerProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,14 @@ export class LoggerProvider implements logsAPI.LoggerProvider {
version?: string,
options?: logsAPI.LoggerOptions
): Logger {
const { schemaUrl = '', includeTraceContext = true } = options || {};
const { schemaUrl = '' } = options || {};
const key = `${name}@${version || ''}:${schemaUrl}`;
if (!this._loggers.has(key)) {
this._loggers.set(
key,
new Logger({
loggerSharedState: this._loggerSharedState,
instrumentationScope: { name, version, schemaUrl },
includeTraceContext,
})
);
}
Expand Down
2 changes: 0 additions & 2 deletions experimental/packages/sdk-logs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

export * from "./types";
export * from "./LoggerProvider";
export * from "./EventLoggerProvider";
export * from "./Logger";
export * from "./EventLogger";
export * from "./LogRecord";
export * from "./LogRecordProcessor";
export * from "./export/ReadableLogRecord";
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/sdk-logs/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export interface LogRecordLimits {
export interface LoggerConfig {
loggerSharedState: LoggerSharedState;
instrumentationScope: InstrumentationScope;
includeTraceContext: boolean;
}

/** Interface configuration for a buffer. */
Expand Down