Skip to content

Commit 81110f5

Browse files
committed
Use otlp collector for logs
1 parent 144864d commit 81110f5

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,13 @@ private void run() {
269269
.enableTracing()
270270
.sdk(AutoConfiguredOpenTelemetrySdk.builder()
271271
.addPropertiesSupplier(() -> ImmutableMap.of(
272-
"otel.logs.exporter", "otlp",
273272
"otel.metrics.exporter", "prometheus",
273+
"otel.logs.exporter", "otlp",
274274
"otel.traces.exporter", "otlp",
275+
// Only handles traces
275276
"otel.exporter.otlp.endpoint", "https://telemetry.googleapis.com",
277+
// Set logs endpoint to the OTLP default Collector
278+
"otel.exporter.otlp.logs.endpoint", "http://localhost:4317",
276279
"otel.exporter.otlp.protocol", "http/protobuf"))
277280
.build()
278281
.getOpenTelemetrySdk())

opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ final class OpenTelemetryTracingModule {
106106
.setInstrumentationVersion(IMPLEMENTATION_VERSION)
107107
.build();
108108
this.contextPropagators = checkNotNull(openTelemetry.getPropagators(), "contextPropagators");
109-
this.otelLogger = openTelemetry.getLogsBridge().loggerBuilder("grpc-java-client-scope")
110-
.setInstrumentationVersion("1.0.0")
111-
.build();
109+
110+
// 3. Get a Logger from the Bridge API
111+
this.otelLogger = openTelemetry.getLogsBridge().get("io.grpc.opentelemetry");
112112
}
113113

114114
@VisibleForTesting
@@ -121,7 +121,7 @@ Tracer getTracer() {
121121
*/
122122
@VisibleForTesting
123123
CallAttemptsTracerFactory newClientCallTracer(Span clientSpan, MethodDescriptor<?, ?> method) {
124-
return new CallAttemptsTracerFactory(clientSpan, method, otelLogger);
124+
return new CallAttemptsTracerFactory(clientSpan, method);
125125
}
126126

127127
/**
@@ -147,14 +147,11 @@ final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory {
147147
volatile int callEnded;
148148
private final Span clientSpan;
149149
private final String fullMethodName;
150-
private final io.opentelemetry.api.logs.Logger otelLogger;
151150

152-
CallAttemptsTracerFactory(Span clientSpan, MethodDescriptor<?, ?> method,
153-
io.opentelemetry.api.logs.Logger otelLogger) {
151+
CallAttemptsTracerFactory(Span clientSpan, MethodDescriptor<?, ?> method) {
154152
checkNotNull(method, "method");
155153
this.fullMethodName = checkNotNull(method.getFullMethodName(), "fullMethodName");
156154
this.clientSpan = checkNotNull(clientSpan, "clientSpan");
157-
this.otelLogger = otelLogger;
158155
}
159156

160157
@Override

0 commit comments

Comments
 (0)