Skip to content

Commit 05643a0

Browse files
Copilotnicosammito
andauthored
fix: address reviewer feedback on undefined providers and misleading fallbacks
Agent-Logs-Url: https://github.com/code0-tech/sculptor/sessions/048cca08-92f4-4fa2-8a78-2b41441cbd7a Co-authored-by: nicosammito <60352747+nicosammito@users.noreply.github.com>
1 parent 649cf78 commit 05643a0

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

src/instrumentation-client.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import initializeTraces, {openTelemetryClientTracesProvider} from "@core/util/op
44
import {logs} from "@opentelemetry/api-logs"
55
import {trace} from "@opentelemetry/api"
66

7-
if (process.env)
87
initializeLogs("client")
9-
logs.setGlobalLoggerProvider(openTelemetryClientLogsProvider)
8+
if (openTelemetryClientLogsProvider) logs.setGlobalLoggerProvider(openTelemetryClientLogsProvider)
109

1110
initializeTraces("client")
12-
trace.setGlobalTracerProvider(openTelemetryClientTracesProvider)
11+
if (openTelemetryClientTracesProvider) trace.setGlobalTracerProvider(openTelemetryClientTracesProvider)

src/instrumentation.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ import initializeTraces, {openTelemetryServerTracesProvider} from "@core/util/op
66

77
export function register() {
88

9-
10-
metrics.setGlobalMeterProvider(openTelemetryMetricProvider)
9+
if (openTelemetryMetricProvider) metrics.setGlobalMeterProvider(openTelemetryMetricProvider)
1110
initializeMetrics()
1211

13-
logs.setGlobalLoggerProvider(openTelemetryServerLogsProvider)
12+
if (openTelemetryServerLogsProvider) logs.setGlobalLoggerProvider(openTelemetryServerLogsProvider)
1413
initializeLogs()
1514

16-
trace.setGlobalTracerProvider(openTelemetryServerTracesProvider)
15+
if (openTelemetryServerTracesProvider) trace.setGlobalTracerProvider(openTelemetryServerTracesProvider)
1716
initializeTraces()
1817

19-
2018
}
2119

2220

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {resourceFromAttributes} from "@opentelemetry/resources";
22

33
export const resource = resourceFromAttributes({
4-
'service.name': process.env.NEXT_PUBLIC_OTEL_SERVICE_NAME || "service.name",
4+
...(process.env.NEXT_PUBLIC_OTEL_SERVICE_NAME ? {'service.name': process.env.NEXT_PUBLIC_OTEL_SERVICE_NAME} : {}),
55
'service.version': (process.env.NEXT_PUBLIC_SCULPTOR_VERSION ?? "0.0.0") + "-" + (process.env.NEXT_PUBLIC_EDITION ?? "edition"),
6-
'deployment.environment.name': process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT || "deployment.environment.name",
6+
...(process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT ? {'deployment.environment.name': process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT} : {}),
77
});
88

99
export const serverResource = resourceFromAttributes({
10-
'service.name': process.env.OTEL_SERVICE_NAME || "service.name",
10+
...(process.env.OTEL_SERVICE_NAME ? {'service.name': process.env.OTEL_SERVICE_NAME} : {}),
1111
'service.version': (process.env.NEXT_PUBLIC_SCULPTOR_VERSION ?? "0.0.0") + "-" + (process.env.NEXT_PUBLIC_EDITION ?? "edition"),
12-
'deployment.environment.name': process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT || "deployment.environment.name",
12+
...(process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT ? {'deployment.environment.name': process.env.NEXT_PUBLIC_OTEL_ENVIRONMENT} : {}),
1313
});

0 commit comments

Comments
 (0)