Module cleanup: batch of 10 modules (run 25838008341) (#18738)

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

Author: 4 people

instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryInstrumentation.java

@@ -27,9 +27,10 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(none(), getClass().getName() + "$InitAdvice");
   }
 
-  @SuppressWarnings({"ReturnValueIgnored", "unused"})
+  @SuppressWarnings("unused")
   public static class InitAdvice {
     @Advice.OnMethodEnter(inline = false)
+    @SuppressWarnings("ReturnValueIgnored")
     public static void init() {
       // the sole purpose of this advice is to ensure that ApplicationMeterFactory115 is recognized
       // as helper class and injected into class loader

instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerBuilder.java

@@ -8,8 +8,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.logs.LoggerBuilder;
 
-final class ApplicationLoggerBuilder
-    implements application.io.opentelemetry.api.logs.LoggerBuilder {
+class ApplicationLoggerBuilder implements application.io.opentelemetry.api.logs.LoggerBuilder {
 
   private final ApplicationLoggerFactory loggerFactory;
   private final LoggerBuilder agentBuilder;

instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryInstrumentation.java

@@ -27,9 +27,10 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(none(), getClass().getName() + "$InitAdvice");
   }
 
-  @SuppressWarnings({"ReturnValueIgnored", "unused"})
+  @SuppressWarnings("unused")
   public static class InitAdvice {
     @Advice.OnMethodEnter(inline = false)
+    @SuppressWarnings("ReturnValueIgnored")
     public static void init() {
       // the sole purpose of this advice is to ensure that ApplicationMeterFactory131 is recognized
       // as helper class and injected into class loader

instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java

@@ -26,15 +26,14 @@ public OpenTelemetryApiInstrumentationModule() {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // this instrumentation module targets io.opentelemetry:opentelemetry-api
-    return hasClassesNamed(
-            // added in 1.38.0
-            "application.io.opentelemetry.api.metrics.LongGauge")
+    // added in 1.38.0
+    return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGauge")
+        // artifact presence gate
+        // added in io.opentelemetry:opentelemetry-api-incubator 1.37.0
+        // (renamed from io.opentelemetry.extension.incubator)
         .and(
             not(
                 hasClassesNamed(
-                    // artifact presence gate
-                    // added in opentelemetry-api-incubator 1.37.0
-                    // (renamed from io.opentelemetry.extension.incubator)
                     "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder")));
   }
 

instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryInstrumentation.java

@@ -27,8 +27,9 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(none(), getClass().getName() + "$InitAdvice");
   }
 
-  @SuppressWarnings({"ReturnValueIgnored", "unused"})
+  @SuppressWarnings("unused")
   public static class InitAdvice {
+    @SuppressWarnings("ReturnValueIgnored")
     @Advice.OnMethodEnter(inline = false)
     public static void init() {
       // the sole purpose of this advice is to ensure that ApplicationTracerProvider14 is recognized

instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/incubatorTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/trace/TracerTest.java

@@ -31,7 +31,7 @@
 class TracerTest {
 
   @RegisterExtension
-  private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+  static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
   @Test
   void isEnabled() {

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/v1_16/AnnotationSingletons.java

@@ -111,7 +111,7 @@ private static SpanKind toAgentOrNull(
       application.io.opentelemetry.api.trace.SpanKind applicationSpanKind) {
     try {
       return SpanKind.valueOf(applicationSpanKind.name());
-    } catch (IllegalArgumentException e) {
+    } catch (IllegalArgumentException ignored) {
       logger.log(FINE, "unexpected span kind: {0}", applicationSpanKind.name());
       return SpanKind.INTERNAL;
     }

instrumentation/oshi/library/src/main/java/io/opentelemetry/instrumentation/oshi/ProcessMetrics.java

@@ -37,17 +37,6 @@ private static Method findResidentMemoryMethod() {
     return null;
   }
 
-  private static long getResidentMemory(OSProcess process) {
-    if (RESIDENT_MEMORY_METHOD == null) {
-      return 0;
-    }
-    try {
-      return (long) RESIDENT_MEMORY_METHOD.invoke(process);
-    } catch (ReflectiveOperationException ignored) {
-      return 0;
-    }
-  }
-
   /** Register observers for java runtime metrics. */
   public static List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry) {
     Meter meter = openTelemetry.getMeterProvider().get("io.opentelemetry.oshi");
@@ -82,5 +71,16 @@ public static List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry)
     return observables;
   }
 
+  private static long getResidentMemory(OSProcess process) {
+    if (RESIDENT_MEMORY_METHOD == null) {
+      return 0;
+    }
+    try {
+      return (long) RESIDENT_MEMORY_METHOD.invoke(process);
+    } catch (ReflectiveOperationException ignored) {
+      return 0;
+    }
+  }
+
   private ProcessMetrics() {}
 }