Code review sweep (run 25194642489) (#18466)

otelbot[bot] · web-flow · commit 5c26f025b060 · 2026-05-01T01:18:09.000Z
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent-kotlin/src/main/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/flow/FlowUtil.kt b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent-kotlin/src/main/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/flow/FlowUtil.kt
diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/build.gradle.kts b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/build.gradle.kts
@@ -16,6 +16,7 @@ muzzle {
     group.set("org.jetbrains.kotlinx")
     module.set("kotlinx-coroutines-core-jvm")
     versions.set("[1.3.9,)")
+    assertInverse.set(true)
   }
 }
 
diff --git a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt
@@ -23,6 +23,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
 import io.opentelemetry.semconv.ServerAttributes
 import kotlinx.coroutines.withContext
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.extension.RegisterExtension
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
@@ -101,7 +102,7 @@ class KtorHttpServerTest : AbstractHttpServerTest<ApplicationEngine>() {
 
   // Copy in HttpServerTest.controller but make it a suspending function
   private suspend fun controller(endpoint: ServerEndpoint, wrapped: suspend () -> Unit) {
-    assert(Span.current().spanContext.isValid, { "Controller should have a parent span. " })
+    assertThat(Span.current().spanContext.isValid).isTrue()
     if (endpoint == ServerEndpoint.NOT_FOUND) {
       wrapped()
       return
diff --git a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpClientSingleConnection.kt b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpClientSingleConnection.kt
@@ -10,7 +10,7 @@ import io.ktor.client.request.*
 import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection
 import kotlinx.coroutines.runBlocking
 
-class KtorHttpClientSingleConnection(
+internal class KtorHttpClientSingleConnection(
   private val client: HttpClient,
   private val host: String,
   private val port: Int
diff --git a/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts b/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts
@@ -59,6 +59,7 @@ tasks {
     classpath = sourceSets.test.get().runtimeClasspath
 
     jvmArgs("-Dotel.instrumentation.http.server.emit-experimental-telemetry=true")
+    systemProperty("metadataConfig", "otel.instrumentation.http.server.emit-experimental-telemetry=true")
   }
 
   val testStableSemconv by registering(Test::class) {
diff --git a/instrumentation/ktor/ktor-3.0/metadata.yaml b/instrumentation/ktor/ktor-3.0/metadata.yaml
@@ -47,6 +47,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: ""
diff --git a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/KtorHttpServerAttributesGetter.kt b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/KtorHttpServerAttributesGetter.kt
@@ -17,7 +17,7 @@ import java.lang.invoke.MethodType
 
 internal object KtorHttpServerAttributesGetter : HttpServerAttributesGetter<ApplicationRequest, ApplicationResponse> {
 
-  private val getRemoteAddressMethodHandle: MethodHandle? = getRemoteAddressMethodHandle()
+  private val GET_REMOTE_ADDRESS_METHOD_HANDLE: MethodHandle? = getRemoteAddressMethodHandle()
 
   private fun getRemoteAddressMethodHandle(): MethodHandle? = try {
     MethodHandles.lookup().findVirtual(RequestConnectionPoint::class.java, "getRemoteAddress", MethodType.methodType(String::class.java))
@@ -44,12 +44,12 @@ internal object KtorHttpServerAttributesGetter : HttpServerAttributesGetter<Appl
   override fun getNetworkProtocolVersion(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith("HTTP/")) request.httpVersion.substring("HTTP/".length) else null
 
   override fun getNetworkPeerAddress(request: ApplicationRequest, response: ApplicationResponse?): String? {
-    if (getRemoteAddressMethodHandle == null) {
+    if (GET_REMOTE_ADDRESS_METHOD_HANDLE == null) {
       return null
     }
 
     val remote = try {
-      getRemoteAddressMethodHandle.invoke(request.local) as String
+      GET_REMOTE_ADDRESS_METHOD_HANDLE.invoke(request.local) as String
     } catch (ignored: Throwable) {
       "unknown"
     }
diff --git a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/internal/IsIpAddress.kt b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/internal/IsIpAddress.kt
@@ -9,7 +9,7 @@ import java.util.regex.Pattern
 
 // Source: Regular Expressions Cookbook 2nd edition - 8.17.
 // Matching IPv6 Addresses
-private val ipv6 = Pattern.compile(
+private val IPV6 = Pattern.compile(
   // Non Compressed
   "^(?:(?:(?:[A-F0-9]{1,4}:){6}" +
     // Compressed with at most 6 colons
@@ -37,9 +37,9 @@ private val ipv6 = Pattern.compile(
 
 // Source: Regular Expressions Cookbook 2nd edition - 8.16.
 // Matching IPv4 Addresses
-private val ipv4 = Pattern.compile(
+private val IPV4 = Pattern.compile(
   "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}" +
     "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$",
 )
 
-fun isIpAddress(address: String): Boolean = ipv4.matcher(address).matches() || ipv6.matcher(address).matches()
+fun isIpAddress(address: String): Boolean = IPV4.matcher(address).matches() || IPV6.matcher(address).matches()
diff --git a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/internal/KtorClientTelemetryUtil.kt b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/internal/KtorClientTelemetryUtil.kt
@@ -24,7 +24,7 @@ import kotlinx.coroutines.withContext
  * any time.
  */
 object KtorClientTelemetryUtil {
-  private val openTelemetryContextKey = AttributeKey<Context>("OpenTelemetry")
+  private val OPEN_TELEMETRY_CONTEXT_KEY = AttributeKey<Context>("OpenTelemetry")
 
   fun install(plugin: AbstractKtorClientTelemetry, scope: HttpClient) {
     installSpanCreation(plugin, scope)
@@ -49,7 +49,7 @@ object KtorClientTelemetryUtil {
 
       if (openTelemetryContext != null) {
         try {
-          requestBuilder.attributes.put(openTelemetryContextKey, openTelemetryContext)
+          requestBuilder.attributes.put(OPEN_TELEMETRY_CONTEXT_KEY, openTelemetryContext)
           plugin.populateRequestHeaders(requestBuilder, openTelemetryContext)
 
           withContext(openTelemetryContext.asContextElement()) { proceed() }
@@ -69,7 +69,7 @@ object KtorClientTelemetryUtil {
     scope.receivePipeline.insertPhaseBefore(HttpReceivePipeline.State, endSpanPhase)
 
     scope.receivePipeline.intercept(endSpanPhase) {
-      val openTelemetryContext = it.call.attributes.getOrNull(openTelemetryContextKey)
+      val openTelemetryContext = it.call.attributes.getOrNull(OPEN_TELEMETRY_CONTEXT_KEY)
       openTelemetryContext ?: return@intercept
 
       scope.launch {
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/ApiClientInstrumentation.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/ApiClientInstrumentation.java
@@ -80,7 +80,8 @@ public static class ExecuteAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Return ApiResponse<?> response, @Advice.Thrown Throwable throwable) {
+        @Advice.Return @Nullable ApiResponse<?> response,
+        @Advice.Thrown @Nullable Throwable throwable) {
       CurrentState currentState = CurrentState.remove();
       if (currentState == null) {
         return;
@@ -119,7 +120,11 @@ public static Object[] onEnter(
 
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter Object[] enterResult) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable Object[] enterResult) {
+      if (enterResult == null) {
+        return;
+      }
       CurrentState current = (CurrentState) enterResult[0];
       if (current != null) {
         current.getScope().close();
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesRequestDigest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesRequestDigest.java
@@ -14,6 +14,12 @@ class KubernetesRequestDigest {
   private static final Pattern RESOURCE_URL_PATH_PATTERN =
       Pattern.compile("^/(api|apis)(/\\S+)?/v\\d\\w*/\\S+");
 
+  private final String urlPath;
+  private final boolean isNonResourceRequest;
+
+  @Nullable private final KubernetesResource resourceMeta;
+  @Nullable private final KubernetesVerb verb;
+
   KubernetesRequestDigest(
       String urlPath,
       boolean isNonResourceRequest,
@@ -65,12 +71,6 @@ private static boolean hasNamePathParameter(KubernetesResource resource) {
     return !isNullOrEmpty(resource.getName());
   }
 
-  private final String urlPath;
-  private final boolean isNonResourceRequest;
-
-  @Nullable private final KubernetesResource resourceMeta;
-  @Nullable private final KubernetesVerb verb;
-
   public String getUrlPath() {
     return urlPath;
   }
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesResource.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesResource.java
@@ -19,6 +19,14 @@ class KubernetesResource {
       Pattern.compile(
           "^/apis/(?<group>\\S+?)/(?<version>\\S+?)(/namespaces/(?<namespace>[\\w-]+))?/(?<resource>[\\w-]+)(/(?<name>[\\w-]+))?(/(?<subresource>[\\w-]+))?");
 
+  private final String apiGroup;
+  private final String apiVersion;
+  private final String resource;
+  @Nullable private final String subResource;
+
+  @Nullable private final String namespace;
+  @Nullable private final String name;
+
   public static KubernetesResource parseCoreResource(String urlPath)
       throws ParseKubernetesResourceException {
     Matcher matcher = CORE_RESOURCE_URL_PATH_PATTERN.matcher(urlPath);
@@ -64,14 +72,6 @@ public static KubernetesResource parseRegularResource(String urlPath)
     this.name = name;
   }
 
-  private final String apiGroup;
-  private final String apiVersion;
-  private final String resource;
-  @Nullable private final String subResource;
-
-  @Nullable private final String namespace;
-  @Nullable private final String name;
-
   public String getApiGroup() {
     return apiGroup;
   }
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesClientTest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesClientTest.java
@@ -164,7 +164,7 @@ void handleErrorsInSyncCall() {
   }
 
   @Test
-  void asynchronousCall() throws ApiException, InterruptedException {
+  void asynchronousCall() throws Exception {
     mockWebServer.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, "42"));
 
     AtomicReference<String> responseBodyReference = new AtomicReference<>();
@@ -222,7 +222,7 @@ public void onSuccess(
   }
 
   @Test
-  void handleErrorsInAsynchronousCall() throws ApiException, InterruptedException {
+  void handleErrorsInAsynchronousCall() throws Exception {
 
     mockWebServer.enqueue(
         HttpResponse.of(HttpStatus.valueOf(451), MediaType.PLAIN_TEXT_UTF_8, "42"));
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesClientVer20Test.java b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesClientVer20Test.java
@@ -172,7 +172,7 @@ void handleErrorsInSyncCall() {
   }
 
   @Test
-  void asynchronousCall() throws ApiException, InterruptedException {
+  void asynchronousCall() throws Exception {
     mockWebServer.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, "42"));
 
     AtomicReference<String> responseBodyReference = new AtomicReference<>();
@@ -231,7 +231,7 @@ public void onSuccess(
   }
 
   @Test
-  void handleErrorsInAsynchronousCall() throws ApiException, InterruptedException {
+  void handleErrorsInAsynchronousCall() throws Exception {
 
     mockWebServer.enqueue(
         HttpResponse.of(HttpStatus.valueOf(451), MediaType.PLAIN_TEXT_UTF_8, "42"));
diff --git a/instrumentation/kubernetes-client-7.0/metadata.yaml b/instrumentation/kubernetes-client-7.0/metadata.yaml
@@ -30,6 +30,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: ""

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ muzzle {`
`16`	`16`	`group.set("org.jetbrains.kotlinx")`
`17`	`17`	`module.set("kotlinx-coroutines-core-jvm")`
`18`	`18`	`versions.set("[1.3.9,)")`
	`19`	`+ assertInverse.set(true)`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ tasks {`
`59`	`59`	`classpath = sourceSets.test.get().runtimeClasspath`
`60`	`60`
`61`	`61`	`jvmArgs("-Dotel.instrumentation.http.server.emit-experimental-telemetry=true")`
	`62`	`+ systemProperty("metadataConfig", "otel.instrumentation.http.server.emit-experimental-telemetry=true")`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`val testStableSemconv by registering(Test::class) {`