Merge branch 'main' into feat-add-testerror

Author: laurit

.github/scripts/static-import-semconv-constants.sh

@@ -0,0 +1,30 @@
+#!/bin/bash -e
+
+# shellcheck disable=SC2044
+for file in $(find instrumentation instrumentation-api -name '*Test.java'); do
+  echo "Processing $file"
+
+  # stable semconv
+
+  negative_lookbehind='(?<!import static io.opentelemetry.semconv.)'
+
+  for class in "ClientAttributes" "ErrorAttributes" "ExceptionAttributes" "HttpAttributes" "JvmAttributes" "NetworkAttributes" "OtelAttributes" "ServerAttributes" "ServiceAttributes" "TelemetryAttributes" "UrlAttributes" "UserAgentAttributes"; do
+    for attr in $(perl -ne "print \"\$1\n\" if /$negative_lookbehind$class\.([A-Z][A-Z][A-Z_]*)/" "$file" | sort -u); do
+      perl -i -pe "s/$negative_lookbehind$class\.$attr/$attr/" "$file"
+      sed -i "0,/^import/{s/^import/import static io.opentelemetry.semconv.$class.$attr;\nimport/}" "$file"
+    done
+  done
+
+  # incubating semconv
+
+  negative_lookbehind='(?<!import static io.opentelemetry.semconv.incubating.)'
+
+  for class in "AwsIncubatingAttributes" "DbIncubatingAttributes" "HttpIncubatingAttributes" "MessagingIncubatingAttributes"; do
+    for attr in $(perl -ne "print \"\$1\n\" if /$negative_lookbehind$class\.([A-Z][A-Z][A-Z_]*)/" "$file" | sort -u); do
+      perl -i -pe "s/$negative_lookbehind$class\.$attr/$attr/" "$file"
+      sed -i "0,/^import/{s/^import/import static io.opentelemetry.semconv.incubating.$class.$attr;\nimport/}" "$file"
+    done
+  done
+done
+
+./gradlew spotlessApply

.github/workflows/issue-management-stale-action.yml

@@ -18,8 +18,7 @@ jobs:
       - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          # TODO (trask) update back to 7 days after end of year break
-          days-before-stale: 21
+          days-before-stale: 7
           days-before-close: 7
           only-labels: "needs author feedback"
           stale-issue-label: stale

CHANGELOG.md

@@ -9,6 +9,13 @@
   - `internal-application-logging` --> `internal-application-logger`
   - `javalin-5` -> `javalin-5.0`
   - `pulsar-2.8.0` -> `pulsar-2.8`
+- In preparation for stabilizing HTTP library instrumentation soon:
+  - `setCaptured*Headers(List)` methods in `*TelemetryBuilder` classes were changed to
+    `setCaptured*Headers(Collection)`
+    ([#12901](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12901))
+  - `setKnownMethods(Set)` methods in `*TelemetryBuilder` classes were changed to
+    `setKnownMethods(Collection)`
+    ([#12902](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12902))
 
 ## Version 2.11.0 (2024-12-23)
 
@@ -97,7 +104,6 @@ In preparation for stabilizing HTTP library instrumentation soon:
   ([#12883](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12883))
 - Add close to fix CWE-404
   ([#12908](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12908))
->>>>>>> upstream/main
 
 ## Version 2.10.0 (2024-11-13)
 

CONTRIBUTING.md

@@ -87,7 +87,8 @@ https://gradle.com/s/ila4qwp5lcf5s
 ```
 
 Opening the build scan link can sometimes take several seconds (it's a large build), but it
-typically makes it a lot clearer what's failing.
+typically makes it a lot clearer what's failing. Sometimes there will be several build scans in a
+log, so look for one that follows the "BUILD FAILED" message.
 
 You can also try the "Explain error" button at the top of the GitHub Actions page,
 which often does a reasonable job of parsing the long build log and displaying the important part.

README.md

@@ -161,7 +161,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 Triagers ([@open-telemetry/java-instrumentation-triagers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-triagers)):
 
 - [Jonas Kunz](https://github.com/JonasKunz), Elastic
-- [Steve Rao](https://github.com/steverao), Alibaba
 - [Sylvain Juge](https://github.com/SylvainJuge), Elastic
 
 Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-approvers)):
@@ -172,6 +171,7 @@ Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/o
 - [Jay DeLuca](https://github.com/jaydeluca)
 - [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 - [John Watson](https://github.com/jkwatson), Cloudera
+- [Steve Rao](https://github.com/steverao), Alibaba
 
 Maintainers ([@open-telemetry/java-instrumentation-maintainers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-maintainers)):
 

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "6.25.0"
+  id("com.diffplug.spotless") version "7.0.1"
 }
 
 spotless {

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.25.0"
+  id("com.diffplug.spotless") version "7.0.1"
 }
 
 spotless {
@@ -54,25 +54,25 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.1")
   implementation("com.google.guava:guava:33.4.0-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.19")
-  implementation("org.owasp:dependency-check-gradle:11.1.1")
+  implementation("org.owasp:dependency-check-gradle:12.0.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.2")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")
   // When updating, also update dependencyManagement/build.gradle.kts
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.11")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
-  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
+  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.27.0")
+  testImplementation("org.assertj:assertj-core:3.27.2")
 }

conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts

@@ -76,7 +76,9 @@ spotless {
         // also very hard to find out where this happens
         "ktlint_standard_wrapping" to "disabled",
         // we use variable names like v1_10Deps
-        "ktlint_standard_property-naming" to "disabled"
+        "ktlint_standard_property-naming" to "disabled",
+        // prevent moving comment to next line in latestDepTestLibrary("xxx") { // see xxx module
+        "ktlint_standard_function-literal" to "disabled"
       )
     )
   }
@@ -97,7 +99,7 @@ if (project == rootProject) {
         "**/*.dockerfile",
         "**/gradle.properties"
       )
-      indentWithSpaces()
+      leadingTabsToSpaces()
       trimTrailingWhitespace()
       endWithNewline()
     }

dependencyManagement/build.gradle.kts

@@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.45.0"
+val otelSdkVersion = "1.46.0"
 val otelContribVersion = "1.42.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
@@ -28,14 +28,14 @@ val groovyVersion = "4.0.24"
 
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.18.2",
-  "com.squareup.okio:okio-bom:3.9.1", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
+  "com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.4.0-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
   "org.junit:junit-bom:5.11.4",
   "org.testcontainers:testcontainers-bom:1.20.4",
-  "org.spockframework:spock-bom:2.4-M4-groovy-4.0"
+  "org.spockframework:spock-bom:2.4-M5-groovy-4.0"
 )
 
 val autoServiceVersion = "1.1.1"
@@ -87,10 +87,10 @@ val DEPENDENCIES = listOf(
   "com.github.stefanbirkner:system-lambda:1.2.1",
   "com.github.stefanbirkner:system-rules:1.19.0",
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.12.2",
-  "commons-beanutils:commons-beanutils:1.9.4",
+  "com.uber.nullaway:nullaway:0.12.3",
+  "commons-beanutils:commons-beanutils:1.10.0",
   "commons-cli:commons-cli:1.9.0",
-  "commons-codec:commons-codec:1.17.1",
+  "commons-codec:commons-codec:1.17.2",
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.5",
@@ -103,9 +103,9 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
-  "io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
-  "org.assertj:assertj-core:3.27.0",
+  "org.assertj:assertj-core:3.27.2",
   "org.awaitility:awaitility:4.2.2",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
@@ -116,7 +116,7 @@ val DEPENDENCIES = listOf(
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
   "org.snakeyaml:snakeyaml-engine:2.8",
-  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.10"
+  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.11"
 )
 
 javaPlatform {

docs/contributing/debugging.md

@@ -3,6 +3,17 @@
 Debugging javaagent instrumentation can be a challenging task since instrumentation
 code is directly inlined into target classes.
 
+## Indy compatible instrumentation
+
+For instrumentation that has been migrated to use the
+[invokedynamic based instrumentation mechanism](https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8999),
+you can leverage breakpoints and standard debugging strategies by adding `-PtestIndy=true` to the
+gradle command when running tests:
+
+```
+./gradlew -PtestIndy=true :instrumentation:<INSTRUMENTATION_NAME>:test
+```
+
 ## Advice methods
 
 Breakpoints do not work in advice methods, because their code is directly inlined