Skip to content
Merged
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
22 changes: 12 additions & 10 deletions nodejs/packages/layer/src/wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
} from '@opentelemetry/instrumentation-aws-lambda';
import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
import { AWSXRayLambdaPropagator } from '@opentelemetry/propagator-aws-xray-lambda';
import { LogRecordProcessor } from '@opentelemetry/sdk-logs';

const defaultInstrumentationList = [
'dns',
Expand Down Expand Up @@ -503,25 +504,26 @@ async function initializeLoggerProvider(
);

const logExporter = new OTLPLogExporter();
const logRecordProcessors: LogRecordProcessor[] = [];
const loggerConfig = {
resource,
processors: logRecordProcessors,
};
const loggerProvider = new LoggerProvider(loggerConfig);
if (typeof configureLoggerProvider === 'function') {
configureLoggerProvider(loggerProvider);
} else {
loggerProvider.addLogRecordProcessor(
new BatchLogRecordProcessor(logExporter),
);
logs.setGlobalLoggerProvider(loggerProvider);
if (typeof configureLoggerProvider !== 'function') {
logRecordProcessors.push(new BatchLogRecordProcessor(logExporter));
}

// Logging for debug
if (logLevel === DiagLogLevel.DEBUG) {
loggerProvider.addLogRecordProcessor(
logRecordProcessors.push(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter()),
);
}
const loggerProvider = new LoggerProvider(loggerConfig);
if (typeof configureLoggerProvider === 'function') {
configureLoggerProvider(loggerProvider);
} else {
logs.setGlobalLoggerProvider(loggerProvider);
}

logsDisableFunction = () => {
logs.disable();
Expand Down