Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkuba committed Jun 22, 2024
1 parent 4a10055 commit d2eabdd
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 16 deletions.
34 changes: 21 additions & 13 deletions experimental/packages/opentelemetry-sdk-web/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ import {
} from '@opentelemetry/sdk-trace-web';
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
import { WebSDKConfiguration } from './types';
import { BatchLogRecordProcessor, LogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';
import {
BatchLogRecordProcessor,
LogRecordProcessor,
LoggerProvider,
} from '@opentelemetry/sdk-logs';
import { EventLoggerProvider } from '@opentelemetry/sdk-events';

/** This class represents everything needed to register a fully configured OpenTelemetry Web SDK */
Expand All @@ -51,11 +55,11 @@ export class WebSDK {
contextManager?: ContextManager;
textMapPropagator?: TextMapPropagator;
};

private _eventLoggerProviderConfig?: {
logRecordProcessors: LogRecordProcessor[];
}
};

private _instrumentations: Instrumentation[];

private _resource: IResource;
Expand Down Expand Up @@ -105,15 +109,18 @@ export class WebSDK {
textMapPropagator: configuration.textMapPropagator,
};
}

if (configuration.eventsLogRecordProcessors || configuration.eventsLogRecordExporter) {

if (
configuration.eventsLogRecordProcessors ||
configuration.eventsLogRecordExporter
) {
const logRecordProcessors = configuration.eventsLogRecordProcessors ?? [
new BatchLogRecordProcessor(configuration.eventsLogRecordExporter!)
]
new BatchLogRecordProcessor(configuration.eventsLogRecordExporter!),
];

this._eventLoggerProviderConfig = {
logRecordProcessors: logRecordProcessors
}
logRecordProcessors: logRecordProcessors,
};
}

this._instrumentations = configuration.instrumentations?.flat() ?? [];
Expand Down Expand Up @@ -164,11 +171,12 @@ export class WebSDK {

if (this._eventLoggerProviderConfig) {
const loggerProvider = new LoggerProvider({
resource: this._resource
resource: this._resource,
});

this._loggerProviderForEvents = loggerProvider;
for (const logRecordProcessor of this._eventLoggerProviderConfig.logRecordProcessors) {
for (const logRecordProcessor of this._eventLoggerProviderConfig
.logRecordProcessors) {
loggerProvider.addLogRecordProcessor(logRecordProcessor);
}

Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-sdk-web/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
SpanProcessor,
IdGenerator,
} from '@opentelemetry/sdk-trace-base';
import { LogRecordProcessor, LogRecordExporter } from '@opentelemetry/sdk-logs';
import { LogRecordProcessor, LogRecordExporter } from '@opentelemetry/sdk-logs';

export interface WebSDKConfiguration {
autoDetectResources: boolean;
Expand Down
10 changes: 8 additions & 2 deletions experimental/packages/opentelemetry-sdk-web/test/sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ import {
} from '@opentelemetry/semantic-conventions';
import { events } from '@opentelemetry/api-events';
import { EventLoggerProvider } from '@opentelemetry/sdk-events';
import { ConsoleLogRecordExporter, InMemoryLogRecordExporter, SimpleLogRecordProcessor } from '@opentelemetry/sdk-logs';
import {
ConsoleLogRecordExporter,
InMemoryLogRecordExporter,
SimpleLogRecordProcessor,
} from '@opentelemetry/sdk-logs';

describe('Web SDK', () => {
let ctxManager: any;
Expand Down Expand Up @@ -80,7 +84,9 @@ describe('Web SDK', () => {
'tracer provider should not have changed'
);

assert.ok(!(events.getEventLoggerProvider() instanceof EventLoggerProvider));
assert.ok(
!(events.getEventLoggerProvider() instanceof EventLoggerProvider)
);

await sdk.shutdown();
});
Expand Down

0 comments on commit d2eabdd

Please sign in to comment.