rebase

open-telemetry · Oct 18, 2021 · f94dc85 · f94dc85
1 parent 947da06
commit f94dc85
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.../io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java b/.../io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
@@ -31,7 +31,7 @@ public class AkkaHttpClientSingletons {
                 GlobalOpenTelemetry.get(),
                 AkkaHttpUtil.instrumentationName(),
                 HttpSpanNameExtractor.create(httpAttributesExtractor))
-            .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
+            .setSpanStatusExtractor(HttpSpanStatusExtractor.createClient(httpAttributesExtractor))
             .addAttributesExtractor(httpAttributesExtractor)
             .addAttributesExtractor(netAttributesExtractor)
             .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))

diff --git a/.../io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java b/.../io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
@@ -25,7 +25,7 @@ public class AkkaHttpServerSingletons {
                 GlobalOpenTelemetry.get(),
                 AkkaHttpUtil.instrumentationName(),
                 unused -> "akka.request")
-            .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
+            .setSpanStatusExtractor(HttpSpanStatusExtractor.createServer(httpAttributesExtractor))
             .addAttributesExtractor(httpAttributesExtractor)
             .addRequestMetrics(HttpServerMetrics.get())
             .newServerInstrumenter(new AkkaHttpServerHeaders());

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java b/...a/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java
@@ -29,7 +29,7 @@ final class NettyClientSingletons {
                 GlobalOpenTelemetry.get(),
                 "io.opentelemetry.netty-3.8",
                 HttpSpanNameExtractor.create(httpClientAttributesExtractor))
-            .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpClientAttributesExtractor))
+            .setSpanStatusExtractor(HttpSpanStatusExtractor.createClient(httpClientAttributesExtractor))
             .addAttributesExtractor(httpClientAttributesExtractor)
             .addAttributesExtractor(netClientAttributesExtractor)
             .addAttributesExtractor(

diff --git a/...lemetry/javaagent/instrumentation/netty/common/client/NettyClientInstrumenterFactory.java b/...lemetry/javaagent/instrumentation/netty/common/client/NettyClientInstrumenterFactory.java
@@ -30,7 +30,7 @@ public Instrumenter<HttpRequestAndChannel, HttpResponse> createHttpInstrumenter(
             GlobalOpenTelemetry.get(),
             instrumentationName,
             HttpSpanNameExtractor.create(httpClientAttributesExtractor))
-        .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpClientAttributesExtractor))
+        .setSpanStatusExtractor(HttpSpanStatusExtractor.createClient(httpClientAttributesExtractor))
         .addAttributesExtractor(httpClientAttributesExtractor)
         .addAttributesExtractor(new NettyCommonNetAttributesExtractor())
         // TODO: add peer extractor attributes once Net*AttributesExtractors are refactored