Merge remote-tracking branch 'upstream/main'

Author: Abhilash Garapati

.fossa.yml

@@ -157,6 +157,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:hystrix-1.4:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:iceberg-1.8:library'
     - type: gradle
       path: ./
       target: ':instrumentation:influxdb-2.4:javaagent'

.github/scripts/gha-free-disk-space.sh

@@ -6,4 +6,6 @@
 df -h
 sudo rm -rf /usr/local/lib/android
 sudo rm -rf /usr/share/dotnet
+sudo rm -rf /usr/local/julia*
+sudo rm -rf /usr/share/swift
 df -h

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### ⚠️ Breaking Changes
+
+- Logback appender `captureArguments` option split into two options: `captureTemplate` and `captureArguments`
+  ([#15423](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15423))
+
+
 ## Version 2.22.0 (2025-11-20)
 
 ### ⚠️ Breaking Changes

conventions/build.gradle.kts

@@ -58,7 +58,7 @@ dependencies {
   implementation("com.google.guava:guava:33.5.0-jre")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.3.0")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.2")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.3")
   implementation("org.owasp:dependency-check-gradle:12.1.9")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

docs/instrumentation-list.yaml

@@ -5190,6 +5190,95 @@ libraries:
           type: STRING
         - name: hystrix.group
           type: STRING
+  iceberg:
+  - name: iceberg-1.8
+    display_name: Apache Iceberg
+    description: |
+      This instrumentation provides a standalone library integration that enables metrics for Apache Iceberg table scans.
+    library_link: https://iceberg.apache.org/
+    source_path: instrumentation/iceberg-1.8
+    minimum_java_version: 11
+    scope:
+      name: io.opentelemetry.iceberg-1.8
+    target_versions:
+      library:
+      - org.apache.iceberg:iceberg-core:1.8.1
+    telemetry:
+    - when: default
+      metrics:
+      - name: iceberg.scan.data_files.count
+        description: The number of data files.
+        type: LONG_SUM
+        unit: file
+        attributes:
+        - name: iceberg.scan.state
+          type: STRING
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.data_files.size
+        description: The total size of all scanned data files.
+        type: LONG_SUM
+        unit: By
+        attributes:
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.data_manifests.count
+        description: The number of data manifests.
+        type: LONG_SUM
+        unit: file
+        attributes:
+        - name: iceberg.scan.state
+          type: STRING
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.delete_files.count
+        description: The number of delete files.
+        type: LONG_SUM
+        unit: file
+        attributes:
+        - name: iceberg.delete_file.type
+          type: STRING
+        - name: iceberg.scan.state
+          type: STRING
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.delete_files.size
+        description: The total size of all scanned delete files.
+        type: LONG_SUM
+        unit: By
+        attributes:
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.delete_manifests.count
+        description: The number of delete manifests.
+        type: LONG_SUM
+        unit: file
+        attributes:
+        - name: iceberg.scan.state
+          type: STRING
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
+      - name: iceberg.scan.planning.duration
+        description: The total duration needed to plan the scan.
+        type: HISTOGRAM
+        unit: s
+        attributes:
+        - name: iceberg.schema.id
+          type: LONG
+        - name: iceberg.table.name
+          type: STRING
   influxdb:
   - name: influxdb-2.4
     display_name: InfluxDB Client
@@ -10429,13 +10518,22 @@ libraries:
       name: io.opentelemetry.spring-cloud-gateway-2.0
     target_versions:
       javaagent:
-      - org.springframework.cloud:spring-cloud-starter-gateway:[2.0.0.RELEASE,]
+      - org.springframework.cloud:spring-cloud-starter-gateway:[2.0.0.RELEASE,)
+      - org.springframework.cloud:spring-cloud-starter-gateway-server-webflux:[4.3.0,]
     configurations:
     - name: otel.instrumentation.spring-cloud-gateway.experimental-span-attributes
       description: |
         Enables experimental `spring-cloud-gateway.route` attributes (e.g., `spring-cloud-gateway.route.id`, `spring-cloud-gateway.route.uri`, etc.) on spans.
       type: boolean
       default: false
+  - name: spring-cloud-gateway-webmvc-4.3
+    source_path: instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3
+    minimum_java_version: 17
+    scope:
+      name: io.opentelemetry.spring-cloud-gateway-webmvc-4.3
+    target_versions:
+      javaagent:
+      - org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc:[4.3.0,)
   - name: spring-core-2.0
     description: |
       This instrumentation ensures proper context propagation for asynchronous operations within Spring Core. It modifies how tasks are submitted and executed to ensure that spans created by other instrumentations are correctly linked across thread boundaries, rather than generating any new telemetry itself.

docs/supported-libraries.md

@@ -32,6 +32,7 @@ These are the supported libraries and frameworks:
 | [Apache ElasticJob](https://shardingsphere.apache.org/elasticjob/)                                                                          | 3.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                              |
 | [Apache HttpAsyncClient](https://hc.apache.org/index.html)                                                                                  | 4.1+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics]                                                                                                        |
 | [Apache HttpClient](https://hc.apache.org/index.html)                                                                                       | 2.0+                               | [opentelemetry-apache-httpclient-4.3](../instrumentation/apache-httpclient/apache-httpclient-4.3/library),<br>[opentelemetry-apache-httpclient-5.2](../instrumentation/apache-httpclient/apache-httpclient-5.2/library)                                                                                                                                                                 | [HTTP Client Spans], [HTTP Client Metrics]                                                                                                        |
+| [Apache Iceberg](https://iceberg.apache.org/)                                                                                               | N/A                                | [opentelemetry-iceberg-1.8](../instrumentation/iceberg-1.8/library/)                                                                                                                                                                                                                                                                                                                    | none                                                                                                                                              |
 | [Apache ShenYu](https://shenyu.apache.org/)                                                                                                 | 2.4+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                                         |
 | [Apache Kafka Connect API](https://kafka.apache.org/documentation/#connect)                                                                 | 2.6+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                                 |
 | [Apache Kafka Producer/Consumer API](https://kafka.apache.org/documentation/#producerapi)                                                   | 0.11+                              | [opentelemetry-kafka-clients-2.6](../instrumentation/kafka/kafka-clients/kafka-clients-2.6/library)                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                                 |

examples/distro/gradle/instrumentation.gradle

@@ -38,7 +38,7 @@ shadowJar {
 
   mergeServiceFiles()
   // mergeServiceFiles requires that duplicate strategy is set to include
-  filesMatching("inst/META-INF/services/**") {
+  filesMatching("META-INF/services/**") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
   }
 

examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java

@@ -87,5 +87,6 @@ private void testAndVerify() throws IOException, InterruptedException {
     Assertions.assertNotEquals(
         0, countResourcesByValue(traces, "telemetry.distro.version", currentAgentVersion));
     Assertions.assertNotEquals(0, countResourcesByValue(traces, "custom.resource", "demo"));
+    Assertions.assertEquals(1, countSpansByAttributeValue(traces, "demo.custom", "demo-extension"));
   }
 }

gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts

@@ -73,52 +73,54 @@ val shadowMuzzleBootstrap by tasks.registering(ShadowJar::class) {
 
 // this is a copied from io.opentelemetry.instrumentation.javaagent-shadowing for now at least to
 // avoid publishing io.opentelemetry.instrumentation.javaagent-shadowing publicly
-tasks.withType<ShadowJar>().configureEach {
-  mergeServiceFiles()
-  // mergeServiceFiles requires that duplicate strategy is set to include
-  filesMatching("META-INF/services/**") {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-  }
-  // Merge any AWS SDK service files that may be present (too bad they didn't just use normal
-  // service loader...)
-  mergeServiceFiles("software/amazon/awssdk/global/handlers")
-  // mergeServiceFiles requires that duplicate strategy is set to include
-  filesMatching("software/amazon/awssdk/global/handlers/**") {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-  }
+listOf(shadowModule, shadowMuzzleTooling, shadowMuzzleBootstrap).forEach { task ->
+  task.configure {
+    mergeServiceFiles()
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("META-INF/services/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+    // Merge any AWS SDK service files that may be present (too bad they didn't just use normal
+    // service loader...)
+    mergeServiceFiles("software/amazon/awssdk/global/handlers")
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("software/amazon/awssdk/global/handlers/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
 
-  exclude("**/module-info.class")
+    exclude("**/module-info.class")
 
-  // rewrite dependencies calling Logger.getLogger
-  relocate("java.util.logging.Logger", "io.opentelemetry.javaagent.bootstrap.PatchLogger")
+    // rewrite dependencies calling Logger.getLogger
+    relocate("java.util.logging.Logger", "io.opentelemetry.javaagent.bootstrap.PatchLogger")
 
-  if (project.findProperty("disableShadowRelocate") != "true") {
-    // prevents conflict with library instrumentation, since these classes live in the bootstrap class loader
-    relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {
-      // Exclude resource providers since they live in the agent class loader
-      exclude("io.opentelemetry.instrumentation.resources.*")
-      exclude("io.opentelemetry.instrumentation.spring.resources.*")
-    }
+    if (project.findProperty("disableShadowRelocate") != "true") {
+      // prevents conflict with library instrumentation, since these classes live in the bootstrap class loader
+      relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {
+        // Exclude resource providers since they live in the agent class loader
+        exclude("io.opentelemetry.instrumentation.resources.*")
+        exclude("io.opentelemetry.instrumentation.spring.resources.*")
+      }
 
-    // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
-    relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
-    relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
-    relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
-    relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
-  }
+      // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
+      relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
+      relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
+      relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
+      relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
+    }
 
-  // relocate(the OpenTelemetry extensions that are used by instrumentation modules)
-  // these extensions live in the AgentClassLoader, and are injected into the user's class loader
-  // by the instrumentation modules that use them
-  relocate("io.opentelemetry.contrib.awsxray", "io.opentelemetry.javaagent.shaded.io.opentelemetry.contrib.awsxray")
-  relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")
+    // relocate(the OpenTelemetry extensions that are used by instrumentation modules)
+    // these extensions live in the AgentClassLoader, and are injected into the user's class loader
+    // by the instrumentation modules that use them
+    relocate("io.opentelemetry.contrib.awsxray", "io.opentelemetry.javaagent.shaded.io.opentelemetry.contrib.awsxray")
+    relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")
 
-  // this is for instrumentation of opentelemetry-api and opentelemetry-instrumentation-api
-  relocate("application.io.opentelemetry", "io.opentelemetry")
-  relocate("application.io.opentelemetry.instrumentation.api", "io.opentelemetry.instrumentation.api")
+    // this is for instrumentation of opentelemetry-api and opentelemetry-instrumentation-api
+    relocate("application.io.opentelemetry", "io.opentelemetry")
+    relocate("application.io.opentelemetry.instrumentation.api", "io.opentelemetry.instrumentation.api")
 
-  // this is for instrumentation on java.util.logging (since java.util.logging itself is shaded above)
-  relocate("application.java.util.logging", "java.util.logging")
+    // this is for instrumentation on java.util.logging (since java.util.logging itself is shaded above)
+    relocate("application.java.util.logging", "java.util.logging")
+  }
 }
 
 val compileMuzzle by tasks.registering {

instrumentation-docs/instrumentations.sh

@@ -106,6 +106,7 @@ readonly INSTRUMENTATIONS=(
   "http-url-connection:javaagent:test"
   "hystrix-1.4:javaagent:test"
   "hystrix-1.4:javaagent:testExperimental"
+  "iceberg-1.8:library:test"
   "influxdb-2.4:javaagent:test"
   "influxdb-2.4:javaagent:testStableSemconv"
   "java-http-client:javaagent:test"