Skip to content

Migrate to jsr specifiers #109

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate to jsr specifiers #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e4c93
Migrate to jsr specifiers
mcandeia May 15, 2024
2f154f2
Merge branch 'main' into use-jsr-update-logs
wrn14897 Jun 17, 2024
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
116 changes: 55 additions & 61 deletions packages/deno/mod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,70 @@
// Derived from https://github.com/denoland/deno_std/blob/main/log/handlers.ts
import * as log from 'https://deno.land/[email protected]/log/mod.ts';
import * as log from "jsr:@std/log";

import type { LogRecord } from 'https://deno.land/[email protected]/log/logger.ts';
import {
LevelName,
LogLevels,
} from 'https://deno.land/[email protected]/log/levels.ts';
import { LevelName, LogLevels } from "jsr:@std/log/levels";
import type { LogRecord } from "jsr:@std/log/logger";

import { SeverityNumber, logs } from 'npm:@opentelemetry/[email protected]';
import { OTLPLogExporter } from 'npm:@opentelemetry/[email protected]';
import { OTLPExporterNodeConfigBase } from 'npm:@opentelemetry/[email protected]';
import { logs, SeverityNumber } from "npm:@opentelemetry/[email protected]";
import { OTLPLogExporter } from "npm:@opentelemetry/[email protected]";
import { OTLPExporterNodeConfigBase } from "npm:@opentelemetry/[email protected]";
import {
Resource,
detectResourcesSync,
envDetectorSync,
hostDetectorSync,
osDetectorSync,
processDetector,
} from 'npm:@opentelemetry/[email protected]';
Resource,
} from "npm:@opentelemetry/[email protected]";
import {
BatchLogRecordProcessor,
ConsoleLogRecordExporter,
BufferConfig,
ConsoleLogRecordExporter,
LoggerProvider,
} from 'npm:@opentelemetry/[email protected]';
} from "npm:@opentelemetry/[email protected]";

import type { Logger } from 'npm:@opentelemetry/[email protected]';
import type { Attributes } from 'npm:@opentelemetry/[email protected]';
import type { Logger } from "npm:@opentelemetry/[email protected]";
import type { Attributes } from "npm:@opentelemetry/[email protected]";

const UNSPECIFIED_SEVERITY_TEXT = '';
const UNSPECIFIED_SEVERITY_TEXT = "";

// https://github.com/open-telemetry/opentelemetry-specification/blob/fc8289b8879f3a37e1eba5b4e445c94e74b20359/specification/logs/data-model.md#displaying-severity
const OTEL_SEVERITY_NAME_MAP = {
0: UNSPECIFIED_SEVERITY_TEXT, // XXX: This is not to spec
1: 'TRACE',
2: 'TRACE2',
3: 'TRACE3',
4: 'TRACE4',
5: 'DEBUG',
6: 'DEBUG2',
7: 'DEBUG3',
8: 'DEBUG4',
9: 'INFO',
10: 'INFO2',
11: 'INFO3',
12: 'INFO4',
13: 'WARN',
14: 'WARN2',
15: 'WARN3',
16: 'WARN4',
17: 'ERROR',
18: 'ERROR2',
19: 'ERROR3',
20: 'ERROR4',
21: 'FATAL',
22: 'FATAL2',
23: 'FATAL3',
24: 'FATAL4',
1: "TRACE",
2: "TRACE2",
3: "TRACE3",
4: "TRACE4",
5: "DEBUG",
6: "DEBUG2",
7: "DEBUG3",
8: "DEBUG4",
9: "INFO",
10: "INFO2",
11: "INFO3",
12: "INFO4",
13: "WARN",
14: "WARN2",
15: "WARN3",
16: "WARN4",
17: "ERROR",
18: "ERROR2",
19: "ERROR3",
20: "ERROR4",
21: "FATAL",
22: "FATAL2",
23: "FATAL3",
24: "FATAL4",
};

interface HandlerOptions extends log.HandlerOptions {
exporterProtocol?: 'http' | 'console';
interface HandlerOptions extends log.BaseHandlerOptions {
exporterProtocol?: "http" | "console";
httpExporterOptions?: OTLPExporterNodeConfigBase;
processorConfig?: BufferConfig;
resourceAttributes?: Attributes;
detectResources?: boolean;
}

export class OpenTelemetryHandler extends log.handlers.BaseHandler {
export class OpenTelemetryHandler extends log.BaseHandler {
protected _logger: Logger | undefined;
protected _processor: BatchLogRecordProcessor | undefined;

Expand All @@ -81,20 +78,17 @@ export class OpenTelemetryHandler extends log.handlers.BaseHandler {
const detectedResource = detectResourcesSync({
detectors:
// This will require a few extra deno permissions
options.detectResources === false
? []
: [
envDetectorSync,
hostDetectorSync,
osDetectorSync,
processDetector,
],
options.detectResources === false ? [] : [
envDetectorSync,
hostDetectorSync,
osDetectorSync,
processDetector,
],
});

const exporter =
options.exporterProtocol === 'console'
? new ConsoleLogRecordExporter()
: new OTLPLogExporter(options.httpExporterOptions);
const exporter = options.exporterProtocol === "console"
? new ConsoleLogRecordExporter()
: new OTLPLogExporter(options.httpExporterOptions);

const processor = new BatchLogRecordProcessor(
exporter,
Expand All @@ -112,12 +106,12 @@ export class OpenTelemetryHandler extends log.handlers.BaseHandler {

logs.setGlobalLoggerProvider(loggerProvider);

const logger = logs.getLogger('deno-logger');
const logger = logs.getLogger("deno-logger");
this._logger = logger;
}

override setup() {
addEventListener('unload', this.#unloadCallback);
addEventListener("unload", this.#unloadCallback);
}

private toOtelSeverityNumber(level: number): SeverityNumber {
Expand All @@ -126,7 +120,7 @@ export class OpenTelemetryHandler extends log.handlers.BaseHandler {
return SeverityNumber.DEBUG;
case LogLevels.INFO:
return SeverityNumber.INFO;
case LogLevels.WARNING:
case LogLevels.WARN:
return SeverityNumber.WARN;
case LogLevels.ERROR:
return SeverityNumber.ERROR;
Expand All @@ -144,8 +138,8 @@ export class OpenTelemetryHandler extends log.handlers.BaseHandler {

this._logger?.emit({
severityNumber: otelSeverityNumber,
severityText:
OTEL_SEVERITY_NAME_MAP[otelSeverityNumber] ?? UNSPECIFIED_SEVERITY_TEXT,
severityText: OTEL_SEVERITY_NAME_MAP[otelSeverityNumber] ??
UNSPECIFIED_SEVERITY_TEXT,
body: logRecord.msg,
attributes: {
loggerName: logRecord.loggerName,
Expand All @@ -159,6 +153,6 @@ export class OpenTelemetryHandler extends log.handlers.BaseHandler {
override destroy() {
this.flush();
this._processor?.shutdown();
removeEventListener('unload', this.#unloadCallback);
removeEventListener("unload", this.#unloadCallback);
}
}
Loading