Review fixes for spring-webflux-5.3:testing (open-telemetry#17750)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>

Author: otelbot[bot]

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/SpringWebfluxClientInstrumentationTest.java

@@ -24,6 +24,11 @@ protected WebClient.Builder instrument(WebClient.Builder builder) {
     return builder;
   }
 
+  @Override
+  protected boolean hasServicePeerName() {
+    return true;
+  }
+
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     super.configure(optionsBuilder);

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing-webflux7/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v7_0/client/SpringWebfluxClientInstrumentationTest.java

@@ -24,6 +24,11 @@ protected WebClient.Builder instrument(WebClient.Builder builder) {
     return builder;
   }
 
+  @Override
+  protected boolean hasServicePeerName() {
+    return true;
+  }
+
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     super.configure(optionsBuilder);

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientInstrumentationTest.java

@@ -29,4 +29,9 @@ protected WebClient.Builder instrument(WebClient.Builder builder) {
             .build();
     return builder.filters(instrumentation::addFilterAndRegisterReactorHook);
   }
+
+  @Override
+  protected boolean hasServicePeerName() {
+    return false;
+  }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.spring.webflux.client;
 
 import static io.opentelemetry.api.trace.SpanKind.CLIENT;
+import static io.opentelemetry.instrumentation.testing.junit.service.SemconvServiceStabilityUtil.maybeStablePeerService;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -56,6 +57,8 @@ public WebClient.RequestBodySpec buildRequest(
 
   protected abstract WebClient.Builder instrument(WebClient.Builder builder);
 
+  protected abstract boolean hasServicePeerName();
+
   @Override
   public int sendRequest(
       WebClient.RequestBodySpec request, String method, URI uri, Map<String, String> headers) {
@@ -199,11 +202,14 @@ void shouldEndSpanOnMonoTimeout() {
                     span.hasName("GET")
                         .hasKind(CLIENT)
                         .hasParent(trace.getSpan(0))
-                        .hasAttributesSatisfying(
+                        .hasAttributesSatisfyingExactly(
                             equalTo(HTTP_REQUEST_METHOD, "GET"),
                             equalTo(URL_FULL, uri.toString()),
                             equalTo(SERVER_ADDRESS, "localhost"),
                             equalTo(SERVER_PORT, uri.getPort()),
+                            equalTo(
+                                maybeStablePeerService(),
+                                hasServicePeerName() ? "test-peer-service" : null),
                             equalTo(ERROR_TYPE, "cancelled")),
                 span ->
                     span.hasName("test-http-server")