Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into spring-metadata

Author: jaydeluca

dependencyManagement/build.gradle.kts

@@ -6,11 +6,11 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 // this line is managed by .github/scripts/update-sdk-version.sh
 val otelSdkVersion = "1.52.0"
-val otelContribVersion = "1.47.0-alpha"
+val otelContribVersion = "1.48.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars
-val groovyVersion = "4.0.27"
+val groovyVersion = "4.0.28"
 
 // We don't force libraries we instrument to new versions since we compile and test against specific
 // old baseline versions but we do try to force those libraries' transitive dependencies to new
@@ -93,7 +93,7 @@ val DEPENDENCIES = listOf(
   "com.uber.nullaway:nullaway:0.12.7",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.9.0",
-  "commons-codec:commons-codec:1.18.0",
+  "commons-codec:commons-codec:1.19.0",
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.6.0",

docs/supported-libraries.md

@@ -75,7 +75,10 @@ tasks {
     // exclude known bootstrap dependencies - they can't appear in the inst/ directory
     dependencies {
       exclude("io.opentelemetry:opentelemetry-api")
+      exclude("io.opentelemetry:opentelemetry-common")
       exclude("io.opentelemetry:opentelemetry-context")
+      exclude("io.opentelemetry.semconv:opentelemetry-semconv")
+      exclude("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
       // events API and metrics advice API
       exclude("io.opentelemetry:opentelemetry-api-incubator")
     }

examples/distro/agent/build.gradle

@@ -70,7 +70,10 @@ tasks {
     // exclude known bootstrap dependencies - they can't appear in the inst/ directory
     dependencies {
       exclude("io.opentelemetry:opentelemetry-api")
+      exclude("io.opentelemetry:opentelemetry-common")
       exclude("io.opentelemetry:opentelemetry-context")
+      exclude("io.opentelemetry.semconv:opentelemetry-semconv")
+      exclude("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
       // events API and metrics advice API
       exclude("io.opentelemetry:opentelemetry-api-incubator")
     }

examples/distro/testing/agent-for-testing/build.gradle

@@ -30,7 +30,7 @@ No targets are enabled by default. The supported target environments are listed
 - [jetty](library/jetty.md)
 - [kafka-broker](javaagent/kafka-broker.md)
 - [tomcat](library/tomcat.md)
-- [wildfly](javaagent/wildfly.md)
+- [wildfly](library/wildfly.md)
 - [hadoop](javaagent/hadoop.md)
 
 The [jvm](library/jvm.md) metrics definitions are also included in the [jmx-metrics library](./library)

instrumentation/jmx-metrics/README.md

@@ -32,8 +32,7 @@ class JmxMetricInsightInstallerTest {
   private static final String PATH_TO_ALL_EXISTING_RULES = "src/main/resources/jmx/rules";
   private static final Set<String> FILES_TO_BE_TESTED =
       new HashSet<>(
-          Arrays.asList(
-              "activemq.yaml", "camel.yaml", "hadoop.yaml", "kafka-broker.yaml", "wildfly.yaml"));
+          Arrays.asList("activemq.yaml", "camel.yaml", "hadoop.yaml", "kafka-broker.yaml"));
 
   @Test
   void testToVerifyExistingRulesAreValid() throws Exception {

instrumentation/jmx-metrics/javaagent/src/main/resources/jmx/rules/wildfly.yaml

@@ -21,15 +21,20 @@ tasks {
   test {
     // get packaged agent jar for testing
     val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar").get()
-
     dependsOn(shadowTask)
 
+    val testAppTask = project(":instrumentation:jmx-metrics:testing-webapp").tasks.named<War>("war")
+    dependsOn(testAppTask)
+
     inputs.files(layout.files(shadowTask))
       .withPropertyName("javaagent")
       .withNormalizer(ClasspathNormalizer::class)
 
     doFirst {
-      jvmArgs("-Dio.opentelemetry.javaagent.path=${shadowTask.archiveFile.get()}")
+      jvmArgs(
+        "-Dio.opentelemetry.javaagent.path=${shadowTask.archiveFile.get()}",
+        "-Dio.opentelemetry.testapp.path=${testAppTask.get().archiveFile.get().asFile.absolutePath}"
+      )
     }
   }
 }

instrumentation/jmx-metrics/javaagent/src/test/java/io/opentelemetry/instrumentation/javaagent/jmx/JmxMetricInsightInstallerTest.java

@@ -0,0 +1,147 @@
+---
+rules:
+
+  - bean: jboss.as:deployment=*,subsystem=undertow
+    prefix: wildfly.session.
+    metricAttribute:
+      wildfly.deployment: param(deployment)
+    unit: "{session}"
+    mapping:
+      # wildfly.session.created
+      sessionsCreated:
+        metric: created
+        type: counter
+        desc: The number of sessions created
+      # wildfly.session.active.count
+      activeSessions:
+        metric: active.count
+        type: updowncounter
+        desc: The number of active sessions
+      # wildfly.session.active.limit
+      maxActiveSessions:
+        metric: active.limit
+        type: updowncounter
+        desc: The maximum number of active sessions
+        # discard negative values used to indicate absence of limit
+        dropNegativeValues: true
+      # wildfly.session.expired
+      expiredSessions:
+        metric: expired
+        type: counter
+        desc: The number of expired sessions
+      # wildfly.session.rejected
+      rejectedSessions:
+        metric: rejected
+        type: counter
+        desc: The number of rejected sessions
+
+  - bean: jboss.as:subsystem=undertow,server=*,http-listener=*
+    prefix: wildfly.
+    metricAttribute:
+      wildfly.server: param(server)
+      wildfly.listener: param(http-listener)
+    type: counter
+    mapping:
+      # wildfly.request.count
+      requestCount:
+        metric: request.count
+        unit: "{request}"
+        desc: The number of requests served
+      # wildfly.request.duration.sum
+      processingTime:
+        metric: request.duration.sum
+        sourceUnit: ns
+        unit: s
+        desc: The total amount of time spent processing requests
+      # wildfly.error.count
+      errorCount:
+        metric: error.count
+        unit: "{request}"
+        desc: The number of requests that have resulted in a 5xx response
+
+  # wildly.network.io
+  - bean: jboss.as:subsystem=undertow,server=*,http-listener=*
+    metricAttribute:
+      wildfly.server: param(server)
+      wildfly.listener: param(http-listener)
+    type: counter
+    unit: By
+    mapping:
+      bytesSent:
+        metric: &metric wildfly.network.io
+        desc: &desc Total number of bytes transferred
+        metricAttribute:
+          network.io.direction: const(transmit)
+      bytesReceived:
+        metric: *metric
+        desc: *desc
+        metricAttribute:
+          network.io.direction: const(receive)
+
+  - bean: jboss.as:subsystem=datasources,data-source=*,statistics=pool
+    prefix: wildfly.db.client.connection.
+    metricAttribute:
+      db.client.connection.pool.name: param(data-source)
+    mapping:
+      # wildfly.db.client.connection.count
+      ActiveCount:
+        metric: &metric count
+        type: &type updowncounter
+        unit: &unit "{connection}"
+        desc: &desc The number of open physical database connections
+        metricAttribute:
+          db.client.connection.state: const(used)
+      IdleCount:
+        metric: *metric
+        type: *type
+        unit: *unit
+        desc: *desc
+        metricAttribute:
+          db.client.connection.state: const(idle)
+      # wildfly.db.client.connection.wait.count
+      WaitCount:
+        metric: wait.count
+        type: counter
+        # In this context, 'request' means 'connection request'
+        unit: "{request}"
+        desc: The number of connection requests that had to wait to obtain it
+
+  - bean: jboss.as:subsystem=transactions
+    prefix: wildfly.transaction.
+    unit: "{transaction}"
+    mapping:
+      # wildfly.transaction.count
+      numberOfInflightTransactions:
+        metric: count
+        type: updowncounter
+        desc: The number of in-flight transactions
+      # wildfly.transaction.created
+      numberOfTransactions:
+        metric: created
+        type: counter
+        desc: The total number of transactions created
+      # wildfly.transaction.committed
+      numberOfCommittedTransactions:
+        metric: committed
+        type: counter
+        desc: The total number of transactions committed
+      # wildfly.transaction.rollback
+      numberOfApplicationRollbacks:
+        metric: &metric rollback
+        type: &type counter
+        metricAttribute:
+          wildfly.rollback.cause: const(application)
+        desc: &desc The total number of transactions rolled back
+      numberOfResourceRollbacks:
+        metric: *metric
+        type: *type
+        metricAttribute:
+          wildfly.rollback.cause: const(resource)
+        desc: *desc
+      numberOfSystemRollbacks:
+        metric: *metric
+        type: *type
+        metricAttribute:
+          wildfly.rollback.cause: const(system)
+        desc: *desc
+