Peer service testing #14963

trask · 2025-10-12T01:00:31Z

Resolves #10361

otelbot-java-instrumentation · 2025-10-12T01:09:41Z

🔧 The result from spotlessApply was committed to the PR branch.

otelbot-java-instrumentation · 2025-10-12T20:47:47Z

🔧 The result from spotlessApply was committed to the PR branch.

trask · 2025-10-16T18:18:29Z

instrumentation/apache-httpasyncclient-4.1/javaagent/build.gradle.kts

 tasks {
  test {
    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")


this could be simplified by #13434

otelbot-java-instrumentation · 2025-10-17T18:48:03Z

🔧 The result from spotlessApply was committed to the PR branch.

otelbot-java-instrumentation · 2025-10-17T22:05:20Z

🔧 The result from spotlessApply was committed to the PR branch.

trask · 2025-10-17T23:50:05Z

...rc/main/java/io/opentelemetry/instrumentation/javahttpclient/AbstractJavaHttpClientTest.java

                        .hasParent(trace.getSpan(0))
                        .hasStatus(StatusData.error())
-                        .hasAttributesSatisfyingExactly(
+                        .hasAttributesSatisfying(


relaxing here was needed because this is shared by both Java agent tests and library tests

and I decided to only test peer.service in Java agent tests (though we could revisit that decision)

Maybe we should add hasPeerService to the super class or expose it through options. That method could return true only when running with the agent. To detect the presence of the agent we could Class.forName something or even check for otel.javaagent.debug that we know is only set for the agent. Instead of hasPeerService might also consider getExpectedPeerServiceName that would return null when running without the agent, that could allow simpler asserts as null is the same as missing attribute.

trask · 2025-10-17T23:51:24Z

...ry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java

                        .hasKind(CLIENT)
                        .hasParent(trace.getSpan(0))
-                        .hasAttributesSatisfyingExactly(
+                        .hasAttributesSatisfying(


same reason here

trask · 2025-10-17T23:55:34Z

...rc/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java

+            })
+        .satisfies(
+            spanData -> {
+              // Check for peer.service when running with javaagent instrumentation
+              String distroName =
+                  spanData
+                      .getResource()
+                      .getAttribute(TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME);
+              if ("opentelemetry-java-instrumentation".equals(distroName)) {
+                String expectedPeerService = options.getExpectedPeerServiceName().apply(uri);
+                if (expectedPeerService != null) {
+                  assertThat(spanData.getAttributes())
+                      .containsEntry(PeerIncubatingAttributes.PEER_SERVICE, expectedPeerService);
+                }
+              }


I didn't want to deal with configuring all of the library http client telemetry builders, but now that the javaagent ones are working, I don't mind revisiting

(in general I don't think peer.service infra is as important for library instrumentation because it's generally easy to add a peer.service constant identifier when you add instrumentation around a particular service call in that case)

trask · 2025-10-17T23:57:46Z

...src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java

+    Builder setTestPeerService(boolean value);
+
+    Builder setExpectedPeerServiceName(Function<URI, String> value);
+


not really used with current hacky implementation, but maybe they should be

laurit · 2025-10-21T06:26:10Z

instrumentation/apache-httpasyncclient-4.1/javaagent/build.gradle.kts

 tasks {
  test {
    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")


Instead of setting this for every test we could use something like https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/http/CapturedHttpHeadersTestConfigSupplier.java to set it in one place

Or in

opentelemetry-java-instrumentation/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts

Line 97 in dbd47db

"-Dotel.java.experimental.span-attributes.copy-from-baggage.include=test-baggage-key-1,test-baggage-key-2"

otelbot-java-instrumentation · 2025-10-22T22:58:00Z

🔧 The result from spotlessApply was committed to the PR branch.

Library instrumentation doesn't support peer-service-mapping configuration (javaagent-only feature). Removed peer.service expectations from shared test base class AbstractDubboTraceChainTest.java to fix failures with Dubbo 3.3.5.

instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts

peer

instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts

...pentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java

...pentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java

...rc/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ClientSslTest.java

...test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java

...est/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java

CLIENT spans now include peer.service attribute when peer-service-mapping is configured.

- Remove empty test configuration blocks from build.gradle.kts files - Don't reorder attributes in test assertions - add PEER_SERVICE at end instead - Allow both error message formats in Lettuce tests (with and without 'getsockopt:')

instrumentation/jaxrs-client/jaxrs-client-1.1-testing/build.gradle.kts

instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts

instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts

...est/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java

trask · 2025-10-23T21:41:42Z

...test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java

+                                            val ->
+                                                val.isIn(
+                                                    "Connection refused: "
+                                                        + host
+                                                        + "/"
+                                                        + ip
+                                                        + ":"
+                                                        + incorrectPort,
+                                                    "Connection refused: getsockopt: "
+                                                        + host
+                                                        + "/"
+                                                        + ip
+                                                        + ":"
+                                                        + incorrectPort)),


this change is just due to me running on Windows and getting a different message

...st/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ConnectionSpanTest.java

- Remove empty test configuration blocks from build.gradle.kts files - Delete temporary 'peer' file - Fix attribute ordering in tests: keep original order and add peer.service at end - Lettuce 4.0 LettuceAsyncClientTest - Netty 4.1 ConnectionSpanTest and ClientSslTest - ReactorNetty 0.9 and 1.0 ConnectionSpanTest

…pe<Test>()

…ng-data - Update AbstractHibernateReactiveTest to expect peer.service attribute - Update ReactiveSpringDataTest to expect peer.service attribute - Add stringKey import to both test files

...sting/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java

trask force-pushed the peer-service-testing branch from 4d2a8de to 1d59409 Compare October 12, 2025 21:37

trask commented Oct 16, 2025

View reviewed changes

trask force-pushed the peer-service-testing branch 5 times, most recently from 387f86e to 3378a01 Compare October 17, 2025 18:31

trask commented Oct 18, 2025

View reviewed changes

trask marked this pull request as ready for review October 18, 2025 04:23

trask requested a review from a team as a code owner October 18, 2025 04:23

laurit reviewed Oct 21, 2025

View reviewed changes

trask added 8 commits October 22, 2025 11:18

Test peer.service in all HTTP client instrumentations

4c7c9e2

centralize

ebac09b

jedis

289a151

lettuce

a4d0c2e

vertx-sql-client

bb0eca4

r2dbc

e8fb30e

dubbo

98b546e

jdbc

5068473

trask force-pushed the peer-service-testing branch from c37ef46 to 5068473 Compare October 22, 2025 22:49

./gradlew spotlessApply

00bc62e

trask force-pushed the peer-service-testing branch 3 times, most recently from 7a23016 to 8c33824 Compare October 23, 2025 03:12

trask marked this pull request as draft October 23, 2025 03:20

trask force-pushed the peer-service-testing branch from 8c33824 to 7a717eb Compare October 23, 2025 04:02

more

7a32b2b

trask force-pushed the peer-service-testing branch from 7a717eb to 7a32b2b Compare October 23, 2025 17:02

trask commented Oct 23, 2025

View reviewed changes

trask added 2 commits October 23, 2025 11:40

Add PEER_SERVICE to Apache Dubbo library-autoconfigure test expectations

14ca030

CLIENT spans now include peer.service attribute when peer-service-mapping is configured.

Apply review suggestions

64f5500

- Remove empty test configuration blocks from build.gradle.kts files - Don't reorder attributes in test assertions - add PEER_SERVICE at end instead - Allow both error message formats in Lettuce tests (with and without 'getsockopt:')

github-actions bot added the test native This label can be applied to PRs to trigger them to run native tests label Oct 23, 2025

trask commented Oct 23, 2025

View reviewed changes

trask and others added 5 commits October 23, 2025 14:57

Revert play-ws-2.1 test configuration to use test{} instead of withTy…

5928bfc

…pe<Test>()

Add peer.service to test expectations for hibernate-reactive and spri…

bd99620

…ng-data - Update AbstractHibernateReactiveTest to expect peer.service attribute - Update ReactiveSpringDataTest to expect peer.service attribute - Add stringKey import to both test files

Merge branch 'main' into peer-service-testing

85c7a9e

update

65fcfcb

laurit reviewed Oct 24, 2025

View reviewed changes

...sting/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java Outdated Show resolved Hide resolved

trask added 2 commits October 24, 2025 10:01

review

fa61ec6

spotless

5fd9fb4

trask marked this pull request as ready for review October 24, 2025 21:07

		Builder setTestPeerService(boolean value);

		Builder setExpectedPeerServiceName(Function<URI, String> value);

Peer service testing #14963

Are you sure you want to change the base?

Peer service testing #14963

Conversation

trask commented Oct 12, 2025

Uh oh!

otelbot-java-instrumentation bot commented Oct 12, 2025

Uh oh!

otelbot-java-instrumentation bot commented Oct 12, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

otelbot-java-instrumentation bot commented Oct 17, 2025

Uh oh!

otelbot-java-instrumentation bot commented Oct 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

laurit Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

otelbot-java-instrumentation bot commented Oct 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

laurit Oct 21, 2025 •

edited

Loading