Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,11 @@ describe('BaggageLogRecordProcessor with all keys', () => {
});

it('onEmit adds current Baggage entries to a log record as attributes', () => {
const loggerProvider = new LoggerProvider();
const exporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(baggageProcessor);
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(exporter)
);
const loggerProvider = new LoggerProvider({
processors: [baggageProcessor, new SimpleLogRecordProcessor(exporter)],
});

const logger = loggerProvider.getLogger('my-logger');
const ctx = propagation.setBaggage(ROOT_CONTEXT, bag);

Expand Down Expand Up @@ -75,12 +74,10 @@ describe('BaggageLogRecordProcessor startWith key filter', () => {
});

it('onEmit adds current filtered by startWith Baggage entries to a log record as attributes', () => {
const loggerProvider = new LoggerProvider();
const exporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(baggageProcessor);
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(exporter)
);
const loggerProvider = new LoggerProvider({
processors: [baggageProcessor, new SimpleLogRecordProcessor(exporter)],
});
const logger = loggerProvider.getLogger('my-logger');
const ctx = propagation.setBaggage(ROOT_CONTEXT, bag);

Expand Down Expand Up @@ -114,12 +111,10 @@ describe('BaggageLogRecordProcessor with regex key filter', () => {
});

it('onEmit adds current filtered by regex Baggage entries to a log record as attributes', () => {
const loggerProvider = new LoggerProvider();
const exporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(baggageProcessor);
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(exporter)
);
const loggerProvider = new LoggerProvider({
processors: [baggageProcessor, new SimpleLogRecordProcessor(exporter)],
});
const logger = loggerProvider.getLogger('my-logger');
const ctx = propagation.setBaggage(ROOT_CONTEXT, bag);

Expand Down
9 changes: 4 additions & 5 deletions packages/winston-transport/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ const winston = require('winston');


// To start a logger, you first need to initialize the Logger provider.
const loggerProvider = new LoggerProvider();
// Add a processor to export log record
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
);
// And add a processor to export log record.
const loggerProvider = new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())],
});
logsAPI.logs.setGlobalLoggerProvider(loggerProvider);

const logger = winston.createLogger({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ import * as assert from 'assert';
import * as sinon from 'sinon';
import { OpenTelemetryTransportV3 } from '../src';

const loggerProvider = new LoggerProvider();
const memoryLogExporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(memoryLogExporter)
);
const loggerProvider = new LoggerProvider({
processors: [new SimpleLogRecordProcessor(memoryLogExporter)],
});
logs.setGlobalLoggerProvider(loggerProvider);

const kMessage = 'log-message';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ const tracer = tracerProvider.getTracer('default');
const resource = resourceFromAttributes({
[ATTR_SERVICE_NAME]: 'test-instrumentation-bunyan',
});
const loggerProvider = new LoggerProvider({ resource });
const memExporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(new SimpleLogRecordProcessor(memExporter));
const loggerProvider = new LoggerProvider({
resource,
processors: [new SimpleLogRecordProcessor(memExporter)],
});
logs.setGlobalLoggerProvider(loggerProvider);

const instrumentation = new BunyanInstrumentation();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ const tracer = tracerProvider.getTracer('default');
const resource = resourceFromAttributes({
[ATTR_SERVICE_NAME]: 'test-instrumentation-pino',
});
const loggerProvider = new LoggerProvider({ resource });
const memExporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(new SimpleLogRecordProcessor(memExporter));
const loggerProvider = new LoggerProvider({
resource,
processors: [new SimpleLogRecordProcessor(memExporter)],
});
logs.setGlobalLoggerProvider(loggerProvider);

const instrumentation = new PinoInstrumentation();
Expand Down
16 changes: 7 additions & 9 deletions plugins/node/opentelemetry-instrumentation-winston/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ const tracerProvider = new NodeTracerProvider();
tracerProvider.register();

// To start a logger, you first need to initialize the Logger provider.
const loggerProvider = new LoggerProvider();
// Add a processor to export log record
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
);
// Add a processor to export log record.
const loggerProvider = new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())],
});
logsAPI.logs.setGlobalLoggerProvider(loggerProvider);

registerInstrumentations({
Expand Down Expand Up @@ -122,11 +121,10 @@ const winston = require('winston');


// To start a logger, you first need to initialize the Logger provider.
const loggerProvider = new LoggerProvider();
// Add a processor to export log record
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
);
const loggerProvider = new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())],
});
logsAPI.logs.setGlobalLoggerProvider(loggerProvider);

const logger = winston.createLogger({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ const provider = new NodeTracerProvider({
const tracer = provider.getTracer('default');
context.setGlobalContextManager(new AsyncLocalStorageContextManager());

const loggerProvider = new LoggerProvider();
const memoryLogExporter = new InMemoryLogRecordExporter();
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(memoryLogExporter)
);
const loggerProvider = new LoggerProvider({
processors: [new SimpleLogRecordProcessor(memoryLogExporter)],
});
logs.setGlobalLoggerProvider(loggerProvider);

const kMessage = 'log-message';
Expand Down