Module cleanup (run 25325090878) (open-telemetry#18564)

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

Author: otelbot[bot]

instrumentation/jms/jms-common-1.1/javaagent-unit-tests/build.gradle.kts

@@ -4,6 +4,4 @@ plugins {
 
 dependencies {
   testImplementation(project(":instrumentation:jms:jms-common-1.1:javaagent"))
-  testImplementation(project(":instrumentation-api"))
-  testImplementation(project(":instrumentation-api-incubator"))
 }

instrumentation/jmx-metrics/library/build.gradle.kts

@@ -16,11 +16,9 @@ dependencies {
 }
 
 tasks {
-  withType<Test>().configureEach {
+  test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
-  }
 
-  test {
     val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar")
     val testAppTask = project(":instrumentation:jmx-metrics:testing-apps:testing-webapp").tasks.named<War>("war")
     val camelTestAppTask = project(":instrumentation:jmx-metrics:testing-apps:camel-testing-app").tasks.named<Jar>("camelTestAppJar")

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/internal/yaml/MetricStructure.java

@@ -29,6 +29,8 @@
  */
 public abstract class MetricStructure {
 
+  private static final String STATE_MAPPING_DEFAULT = "*";
+
   // Used by the YAML parser
   //
   //    type: TYPE
@@ -49,7 +51,6 @@ public abstract class MetricStructure {
 
   private Map<String, Object> metricAttribute;
   private StateMapping stateMapping = StateMapping.empty();
-  private static final String STATE_MAPPING_DEFAULT = "*";
 
   @Nullable private String sourceUnit;
   @Nullable private String unit;

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/internal/engine/AttributeExtractorTest.java

@@ -8,6 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
@@ -104,7 +105,7 @@ private enum DummyEnum {
   private static MBeanServer theServer;
 
   @BeforeAll
-  static void setUp() throws Exception {
+  static void setUp() throws JMException {
     theServer = MBeanServerFactory.createMBeanServer(DOMAIN);
     objectName = new ObjectName(OBJECT_NAME);
     theServer.registerMBean(test1, objectName);

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/internal/engine/MetricAggregationTest.java

@@ -23,6 +23,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import javax.management.InstanceNotFoundException;
+import javax.management.JMException;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
@@ -77,7 +78,7 @@ static void tearDown() {
   }
 
   @AfterEach
-  void after() throws Exception {
+  void after() throws JMException {
     ObjectName objectName = new ObjectName(DOMAIN + ":type=" + Hello.class.getSimpleName() + ",*");
     theServer
         .queryMBeans(objectName, null)
@@ -109,7 +110,7 @@ static List<MetricInfo.Type> metricTypes() {
 
   @ParameterizedTest(name = ARGUMENTS_PLACEHOLDER)
   @MethodSource("metricTypes")
-  void singleInstance(MetricInfo.Type metricType) throws Exception {
+  void singleInstance(MetricInfo.Type metricType) throws JMException {
     ObjectName bean = getObjectName(null, null);
     theServer.registerMBean(new Hello(42), bean);
 
@@ -121,7 +122,7 @@ void singleInstance(MetricInfo.Type metricType) throws Exception {
 
   @ParameterizedTest(name = ARGUMENTS_PLACEHOLDER)
   @MethodSource("metricTypes")
-  void aggregateOneParam(MetricInfo.Type metricType) throws Exception {
+  void aggregateOneParam(MetricInfo.Type metricType) throws JMException {
     theServer.registerMBean(new Hello(42), getObjectName("value1", null));
     theServer.registerMBean(new Hello(37), getObjectName("value2", null));
 
@@ -141,7 +142,7 @@ void aggregateOneParam(MetricInfo.Type metricType) throws Exception {
 
   @ParameterizedTest(name = ARGUMENTS_PLACEHOLDER)
   @MethodSource("metricTypes")
-  void aggregateMultipleParams(MetricInfo.Type metricType) throws Exception {
+  void aggregateMultipleParams(MetricInfo.Type metricType) throws JMException {
     theServer.registerMBean(new Hello(1), getObjectName("1", "x"));
     theServer.registerMBean(new Hello(2), getObjectName("2", "y"));
     theServer.registerMBean(new Hello(3), getObjectName("3", "x"));
@@ -163,7 +164,7 @@ void aggregateMultipleParams(MetricInfo.Type metricType) throws Exception {
 
   @ParameterizedTest(name = ARGUMENTS_PLACEHOLDER)
   @MethodSource("metricTypes")
-  void partialAggregateMultipleParams(MetricInfo.Type metricType) throws Exception {
+  void partialAggregateMultipleParams(MetricInfo.Type metricType) throws JMException {
     theServer.registerMBean(new Hello(1), getObjectName("1", "x"));
     theServer.registerMBean(new Hello(2), getObjectName("2", "y"));
     theServer.registerMBean(new Hello(3), getObjectName("3", "x"));

instrumentation/jmx-metrics/metadata.yaml

@@ -5,3 +5,24 @@ description: >
   configured to extract JVM and application-level telemetry data from JMX MBeans such as memory
   usage, thread counts, and garbage collection statistics, and translate these measurements into
   OpenTelemetry metrics.
+configurations:
+  - name: otel.jmx.enabled
+    declarative_name: java.jmx.enabled
+    description: Enables collection of JMX metrics.
+    type: boolean
+    default: true
+  - name: otel.jmx.config
+    declarative_name: java.jmx.config
+    description: List of paths to JMX metric definition YAML files.
+    type: list
+    default: ""
+  - name: otel.jmx.discovery.delay
+    declarative_name: java.jmx.discovery.delay
+    description: Time in milliseconds between JMX MBean detection attempts.
+    type: int
+    default: 60000
+  - name: otel.jmx.target.system
+    declarative_name: java.jmx.target.system
+    description: List of predefined JMX target systems to collect metrics for.
+    type: list
+    default: ""

instrumentation/jodd-http-4.2/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/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts

@@ -13,8 +13,8 @@ muzzle {
     group.set("org.glassfish")
     module.set("javax.faces")
     versions.set("[2.0.7,3)")
-    extraDependency("javax.el:el-api:2.2")
     assertInverse.set(true)
+    extraDependency("javax.el:el-api:2.2")
   }
   pass {
     group.set("com.sun.faces")
@@ -34,9 +34,9 @@ muzzle {
     group.set("javax.faces")
     module.set("jsf-impl")
     versions.set("[1.2,2)")
+    assertInverse.set(true)
     extraDependency("javax.faces:jsf-api:1.2")
     extraDependency("javax.el:el-api:1.0")
-    assertInverse.set(true)
   }
   fail {
     group.set("org.glassfish")

instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/v2_3/HttpJspPageInstrumentation.java

@@ -51,9 +51,9 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      private AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context) {
         this.context = context;
-        this.scope = scope;
+        this.scope = context.makeCurrent();
       }
 
       @Nullable
@@ -63,7 +63,7 @@ public static AdviceScope start(HttpServletRequest req) {
           return null;
         }
         Context context = instrumenter().start(parentContext, req);
-        return new AdviceScope(context, context.makeCurrent());
+        return new AdviceScope(context);
       }
 
       public void end(HttpServletRequest req, Throwable throwable) {

instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/v2_3/JspCompilationContextInstrumentation.java

@@ -41,9 +41,9 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      private AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context) {
         this.context = context;
-        this.scope = scope;
+        this.scope = context.makeCurrent();
       }
 
       @Nullable
@@ -53,7 +53,7 @@ public static AdviceScope start(JspCompilationContext jspCompilationContext) {
           return null;
         }
         Context context = instrumenter().start(parentContext, jspCompilationContext);
-        return new AdviceScope(context, context.makeCurrent());
+        return new AdviceScope(context);
       }
 
       public void end(@Nullable Throwable throwable, JspCompilationContext jspCompilationContext) {