Module cleanup (run 25332259548) (open-telemetry#18568)

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

Author: otelbot[bot]

instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/build.gradle.kts

@@ -18,6 +18,7 @@ muzzle {
     group.set("org.jetbrains.kotlinx")
     module.set("kotlinx-coroutines-core-jvm")
     versions.set("[1.3.9,)")
+    assertInverse.set(true)
     extraDependency(project(":instrumentation-annotations"))
     extraDependency("io.opentelemetry:opentelemetry-api:1.27.0")
   }

instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/instrumentationannotations/AnnotationInstrumentationHelper.java

@@ -26,7 +26,7 @@
 @SuppressWarnings("unused") // methods calls injected through bytecode instrumentation
 public class AnnotationInstrumentationHelper {
 
-  private static final VirtualField<Continuation<?>, Context> contextField =
+  private static final VirtualField<Continuation<?>, Context> CONTEXT_FIELD =
       VirtualField.find(Continuation.class, Context.class);
 
   public static Object createMethodRequest(
@@ -55,11 +55,11 @@ public static Context enterCoroutine(
       // null continuation means that this method is not going to be resumed, and we don't need to
       // store the context
       if (continuation != null) {
-        contextField.set(continuation, context);
+        CONTEXT_FIELD.set(continuation, context);
       }
       return context;
     } else {
-      return continuation != null ? contextField.get(continuation) : null;
+      return continuation != null ? CONTEXT_FIELD.get(continuation) : null;
     }
   }
 

instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/instrumentationannotations/WithSpanInstrumentation.java

@@ -126,7 +126,7 @@ public ClassVisitor wrap(
   @SuppressWarnings("unused")
   public static class InitAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Advice.OnMethodEnter(inline = false)
     public static void onEnter() {
       // this advice is here only to get AnnotationInstrumentationHelper injected
       AnnotationInstrumentationHelper.init();

instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/flow/FlowWithSpanTest.kt

@@ -14,12 +14,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.count
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.runBlocking
-import org.assertj.core.api.Condition
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.RegisterExtension
 import java.time.Clock
 import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExperimentalCoroutinesApi
@@ -47,7 +48,9 @@ class FlowWithSpanTest {
               .hasAttributesSatisfyingExactly(
                 SemconvCodeStabilityUtil.codeFunctionAssertions(this.javaClass, "simple")
               )
-              .has(Condition({ spanData -> spanData.endEpochNanos > flowStartTime }, "end time after $flowStartTime"))
+              .satisfies(Consumer { spanData ->
+                assertThat(spanData.endEpochNanos).isGreaterThan(flowStartTime)
+              })
           }
         )
       }

instrumentation/ktor/ktor-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpClientTest.kt

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.ktor.v2_0
 
-import io.ktor.client.*
+import io.ktor.client.HttpClientConfig
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension
 import org.junit.jupiter.api.extension.RegisterExtension
 

instrumentation/ktor/ktor-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerTest.kt

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.ktor.v2_0
 
-import io.ktor.server.application.*
+import io.ktor.server.application.Application
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions

instrumentation/ktor/ktor-2.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: ""

instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/AbstractKtorHttpClientTest.kt

@@ -68,8 +68,8 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
       try {
         val statusCode = client.request(request).status.value
         httpClientResult.complete(statusCode)
-      } catch (e: Throwable) {
-        httpClientResult.complete(e)
+      } catch (t: Throwable) {
+        httpClientResult.complete(t)
       }
     }
   }

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

@@ -59,14 +59,12 @@ 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) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
     jvmArgs("-Dotel.semconv-stability.opt-in=service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=service.peer")
   }
 
   check {