Code review sweep (run 25152152525) (#18440)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/internal/internal-lambda/javaagent/build.gradle.kts

@@ -3,7 +3,5 @@ plugins {
 }
 
 dependencies {
-  compileOnly(project(":javaagent-bootstrap"))
-
   testImplementation(project(":javaagent-bootstrap"))
 }

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionTest.java

@@ -43,7 +43,7 @@ void testOurFieldsAndMethodsAreNotVisibleWithReflection() {
   void testGeneratedSerialVersionUid() {
     // expected value is computed with serialver utility that comes with jdk
     assertThat(ObjectStreamClass.lookup(TestClass.class).getSerialVersionUID())
-        .isEqualTo(-1006206785953990857L);
+        .isEqualTo(7413560001584957796L);
     assertThat(TestClass.class.getDeclaredFields()).isEmpty();
   }
 }

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/TestClass.java

@@ -7,7 +7,7 @@
 
 import java.io.Serializable;
 
-public class TestClass implements Runnable, Serializable {
+class TestClass implements Runnable, Serializable {
 
   @Override
   public void run() {}

instrumentation/java-http-client/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/JavaHttpClientTest.java

@@ -23,6 +23,11 @@ abstract static class AbstractTest extends AbstractJavaHttpClientTest {
     protected HttpClient configureHttpClient(HttpClient httpClient) {
       return httpClient;
     }
+
+    @Override
+    protected boolean hasServicePeerName() {
+      return true;
+    }
   }
 
   @Nested

instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/internal/ResponseConsumer.java

@@ -10,6 +10,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.function.BiConsumer;
+import javax.annotation.Nullable;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
@@ -30,7 +31,7 @@ public ResponseConsumer(
   }
 
   @Override
-  public void accept(HttpResponse<?> httpResponse, Throwable throwable) {
+  public void accept(@Nullable HttpResponse<?> httpResponse, @Nullable Throwable throwable) {
     instrumenter.end(context, httpRequest, httpResponse, throwable);
   }
 }

instrumentation/java-http-client/metadata.yaml

@@ -23,6 +23,7 @@ configurations:
     type: list
     default: ""
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""

instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/javahttpclient/AbstractJavaHttpClientTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.javahttpclient;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
+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;
@@ -55,6 +56,10 @@ void setUp() {
 
   protected abstract HttpClient configureHttpClient(HttpClient httpClient);
 
+  protected boolean hasServicePeerName() {
+    return false;
+  }
+
   @Override
   public HttpRequest buildRequest(String method, URI uri, Map<String, String> headers) {
     HttpRequest.Builder requestBuilder =
@@ -172,12 +177,15 @@ void cancelRequest() throws InterruptedException {
                         .hasKind(SpanKind.CLIENT)
                         .hasParent(trace.getSpan(0))
                         .hasStatus(StatusData.error())
-                        .hasAttributesSatisfying(
+                        .hasAttributesSatisfyingExactly(
                             equalTo(URL_FULL, uri.toString()),
                             equalTo(SERVER_ADDRESS, uri.getHost()),
                             equalTo(SERVER_PORT, uri.getPort()),
                             equalTo(HTTP_REQUEST_METHOD, method),
-                            equalTo(ERROR_TYPE, CancellationException.class.getName())),
+                            equalTo(ERROR_TYPE, CancellationException.class.getName()),
+                            equalTo(
+                                maybeStablePeerService(),
+                                hasServicePeerName() ? "test-peer-service" : null)),
                 span ->
                     span.hasName("test-http-server")
                         .hasKind(SpanKind.SERVER)

instrumentation/java-http-server/metadata.yaml

@@ -23,6 +23,7 @@ configurations:
     type: list
     default: ""
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""

instrumentation/java-util-logging/javaagent/build.gradle.kts

@@ -5,8 +5,6 @@ plugins {
 dependencies {
   compileOnly(project(":instrumentation:java-util-logging:shaded-stub-for-instrumenting"))
 
-  compileOnly(project(":javaagent-bootstrap"))
-
   // ensure no cross interference
   testInstrumentation(project(":instrumentation:jboss-logmanager:jboss-logmanager-appender-1.1:javaagent"))
 }

instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java

@@ -32,7 +32,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class JavaUtilLoggingTest {
-  private static final boolean isExperimentalAttributesEnabled =
+  private static final boolean EXPERIMENTAL_ATTRIBUTES =
       Boolean.getBoolean("otel.instrumentation.java-util-logging.experimental-log-attributes");
 
   private static final Logger logger = Logger.getLogger("abc");
@@ -166,14 +166,14 @@ private interface LoggerMethod {
   }
 
   private static String experimental(String value) {
-    if (isExperimentalAttributesEnabled) {
+    if (EXPERIMENTAL_ATTRIBUTES) {
       return value;
     }
     return null;
   }
 
   private static Long experimental(long value) {
-    if (isExperimentalAttributesEnabled) {
+    if (EXPERIMENTAL_ATTRIBUTES) {
       return value;
     }
     return null;