From cab3d4919c32f8bfb9db740fd2b982c7c155a193 Mon Sep 17 00:00:00 2001 From: illenko Date: Sat, 7 Dec 2024 14:55:42 +0200 Subject: [PATCH 1/2] Clean up ExtendedSpanBuilder call chain in HTTP Server Example --- .../java/io/opentelemetry/example/http/HttpServer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/http/src/main/java/io/opentelemetry/example/http/HttpServer.java b/http/src/main/java/io/opentelemetry/example/http/HttpServer.java index 9ea38b150..2b19ad8dc 100644 --- a/http/src/main/java/io/opentelemetry/example/http/HttpServer.java +++ b/http/src/main/java/io/opentelemetry/example/http/HttpServer.java @@ -48,15 +48,12 @@ private static class HelloHandler implements HttpHandler { @Override public void handle(HttpExchange exchange) throws IOException { - // TODO (trask) clean up chaining after - // https://github.com/open-telemetry/opentelemetry-java/pull/6514 - ((ExtendedSpanBuilder) - ((ExtendedSpanBuilder) tracer.spanBuilder("GET /")) + ((ExtendedSpanBuilder) tracer.spanBuilder("GET /")) .setParentFrom( openTelemetry.getPropagators(), exchange.getRequestHeaders().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get(0)))) - .setSpanKind(SpanKind.SERVER)) + .setSpanKind(SpanKind.SERVER) .startAndRun( () -> { // Set the Semantic Convention From 59a780a0505cffd6e5ff54faab4e06116e063a5d Mon Sep 17 00:00:00 2001 From: illenko Date: Sat, 7 Dec 2024 15:00:25 +0200 Subject: [PATCH 2/2] Fix code style --- .../java/io/opentelemetry/example/http/HttpServer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/http/src/main/java/io/opentelemetry/example/http/HttpServer.java b/http/src/main/java/io/opentelemetry/example/http/HttpServer.java index 2b19ad8dc..9efa4450d 100644 --- a/http/src/main/java/io/opentelemetry/example/http/HttpServer.java +++ b/http/src/main/java/io/opentelemetry/example/http/HttpServer.java @@ -49,11 +49,11 @@ private static class HelloHandler implements HttpHandler { @Override public void handle(HttpExchange exchange) throws IOException { ((ExtendedSpanBuilder) tracer.spanBuilder("GET /")) - .setParentFrom( - openTelemetry.getPropagators(), - exchange.getRequestHeaders().entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get(0)))) - .setSpanKind(SpanKind.SERVER) + .setParentFrom( + openTelemetry.getPropagators(), + exchange.getRequestHeaders().entrySet().stream() + .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get(0)))) + .setSpanKind(SpanKind.SERVER) .startAndRun( () -> { // Set the Semantic Convention