diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java index 6a725c5db909..4a2f5b3338e1 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java @@ -10,7 +10,6 @@ import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapGetter; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetAttributesExtractor; import io.opentelemetry.instrumentation.api.internal.ContextPropagationDebug; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; @@ -38,12 +37,9 @@ public Context start(Context parentContext, REQUEST request) { private static InstrumenterBuilder addClientIpExtractor( InstrumenterBuilder builder, TextMapGetter getter) { HttpAttributesExtractor httpAttributesExtractor = null; - NetAttributesExtractor netAttributesExtractor = null; for (AttributesExtractor extractor : builder.attributesExtractors) { - if (extractor instanceof NetAttributesExtractor) { - netAttributesExtractor = (NetAttributesExtractor) extractor; - } else if (extractor instanceof HttpAttributesExtractor) { + if (extractor instanceof HttpAttributesExtractor) { httpAttributesExtractor = (HttpAttributesExtractor) extractor; } } @@ -51,7 +47,7 @@ private static InstrumenterBuilder addCli // Don't add HTTP_CLIENT_IP if there are no HTTP attributes registered. return builder; } - builder.addAttributesExtractor(new HttpClientIpExtractor(getter, netAttributesExtractor)); + builder.addAttributesExtractor(new HttpClientIpExtractor<>(getter)); return builder; } @@ -59,13 +55,9 @@ private static class HttpClientIpExtractor extends AttributesExtractor { private final TextMapGetter getter; - @Nullable private final NetAttributesExtractor netAttributesExtractor; - HttpClientIpExtractor( - TextMapGetter getter, - @Nullable NetAttributesExtractor netAttributesExtractor) { + HttpClientIpExtractor(TextMapGetter getter) { this.getter = getter; - this.netAttributesExtractor = netAttributesExtractor; } @Override @@ -75,9 +67,6 @@ protected void onStart(AttributesBuilder attributes, REQUEST request) {} protected void onEnd( AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) { String clientIp = getForwardedClientIp(request); - if (clientIp == null && netAttributesExtractor != null) { - clientIp = netAttributesExtractor.peerIp(request, response); - } set(attributes, SemanticAttributes.HTTP_CLIENT_IP, clientIp); } @@ -96,10 +85,7 @@ String getForwardedClientIp(REQUEST request) { // try X-Forwarded-For forwarded = getter.get(request, "X-Forwarded-For"); if (forwarded != null) { - forwarded = extractForwardedFor(forwarded); - if (forwarded != null) { - return forwarded; - } + return extractForwardedFor(forwarded); } return null; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java index 98f3d298d1d8..659739f65fe1 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java @@ -199,10 +199,10 @@ protected void onConnectionAndRequest( } spanBuilder.setAttribute(SemanticAttributes.HTTP_FLAVOR, flavor); } - spanBuilder.setAttribute(SemanticAttributes.HTTP_CLIENT_IP, clientIp(connection, request)); + spanBuilder.setAttribute(SemanticAttributes.HTTP_CLIENT_IP, clientIp(request)); } - private String clientIp(CONNECTION connection, REQUEST request) { + private String clientIp(REQUEST request) { // try Forwarded String forwarded = requestHeader(request, "Forwarded"); if (forwarded != null) { @@ -221,8 +221,7 @@ private String clientIp(CONNECTION connection, REQUEST request) { } } - // fallback to peer IP if there are no proxy headers - return peerHostIp(connection); + return null; } // VisibleForTesting diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java index 9c60dbd13efb..aedd72b794c8 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java @@ -333,48 +333,6 @@ void server_http_xForwardedFor() { SemanticAttributes.HTTP_CLIENT_IP, "1.1.1.1")))); } - @Test - void server_http_noForwarded() { - Instrumenter, Map> instrumenter = - Instrumenter., Map>newBuilder( - otelTesting.getOpenTelemetry(), "test", unused -> "span") - .addAttributesExtractors( - mockHttpAttributes, - mockNetAttributes, - new AttributesExtractor1(), - new AttributesExtractor2()) - .addSpanLinksExtractor(new LinksExtractor()) - .newServerInstrumenter(new MapGetter()); - - Map request = new HashMap<>(REQUEST); - request.remove("Forwarded"); - - when(mockNetAttributes.peerIp(request, null)).thenReturn("2.2.2.2"); - when(mockNetAttributes.peerIp(request, RESPONSE)).thenReturn("2.2.2.2"); - - Context context = instrumenter.start(Context.root(), request); - SpanContext spanContext = Span.fromContext(context).getSpanContext(); - - assertThat(spanContext.isValid()).isTrue(); - assertThat(SpanKey.SERVER.fromContextOrNull(context).getSpanContext()).isEqualTo(spanContext); - - instrumenter.end(context, request, RESPONSE, null); - - otelTesting - .assertTraces() - .hasTracesSatisfyingExactly( - trace -> - trace.hasSpansSatisfyingExactly( - span -> - span.hasName("span") - .hasAttributesSatisfying( - attributes -> - assertThat(attributes) - .containsEntry(SemanticAttributes.NET_PEER_IP, "2.2.2.2") - .containsEntry( - SemanticAttributes.HTTP_CLIENT_IP, "2.2.2.2")))); - } - @Test void client() { Instrumenter, Map> instrumenter = diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy index 2207c49ca7f7..a6e337d46930 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy +++ b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy @@ -89,7 +89,6 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn attributes { "$SemanticAttributes.HTTP_URL.key" "http://localhost:$port/api/firstModule/unit/unitOne" "$SemanticAttributes.HTTP_STATUS_CODE.key" 200 - "$SemanticAttributes.HTTP_CLIENT_IP.key" "127.0.0.1" "$SemanticAttributes.HTTP_USER_AGENT.key" String "$SemanticAttributes.HTTP_FLAVOR.key" "1.1" "$SemanticAttributes.HTTP_METHOD.key" "GET" diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy index 07dc5596f5e2..25d5590fdf0f 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy +++ b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy @@ -129,7 +129,6 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1" "$SemanticAttributes.HTTP_USER_AGENT.key" "Jakarta Commons-HttpClient/3.1" "$SemanticAttributes.HTTP_FLAVOR.key" "1.1" - "$SemanticAttributes.HTTP_CLIENT_IP.key" "127.0.0.1" } } it.span(5) { diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 7b5e96205dae..dabd0a665dd3 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -93,7 +93,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -144,7 +143,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -191,7 +189,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -247,7 +244,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 500 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -308,7 +304,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -350,7 +345,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -424,7 +418,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 500 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -467,7 +460,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 7f7a2ab423c7..f50be9c8d4a9 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -90,7 +90,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -153,7 +152,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -195,7 +193,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -285,7 +282,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -361,7 +357,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 500 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -416,7 +411,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 404 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { diff --git a/instrumentation/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 31e493d08ff8..4cfa2f4fc6c1 100644 --- a/instrumentation/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -109,7 +109,6 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" { it == null || it == "127.0.0.1" } if (extraAttributes.contains(SemanticAttributes.HTTP_HOST)) { "${SemanticAttributes.HTTP_HOST}" "localhost:${app.bindPort}" diff --git a/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy b/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy index 9880cd23d793..8563fc3007d7 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy +++ b/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy @@ -53,7 +53,6 @@ class SparkJavaBasedTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } } diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy index 28101afb1163..d19f47f3463d 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy @@ -90,7 +90,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -153,7 +152,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -235,7 +233,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -296,7 +293,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 404 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -336,7 +332,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 202 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -381,7 +376,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 500 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -444,7 +438,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 307 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -472,7 +465,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -515,7 +507,6 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 4de2b2ce903f..f2bad8c0b211 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -68,7 +68,6 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -155,7 +154,6 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } } diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 4de2b2ce903f..f2bad8c0b211 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -68,7 +68,6 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" } } span(1) { @@ -155,7 +154,6 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "${SemanticAttributes.HTTP_STATUS_CODE.key}" 200 "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1" "${SemanticAttributes.HTTP_USER_AGENT.key}" String - "${SemanticAttributes.HTTP_CLIENT_IP.key}" "127.0.0.1" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } }