Merge branch 'main' into add_metric_annotation_instrument

Author: Duncan-tree-zhou

.github/workflows/codeql.yml

@@ -66,9 +66,9 @@ jobs:
         uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
         with:
           languages: ${{ matrix.language }}
-          # using "latest" helps to keep up with the latest Kotlin support
+          # using "linked" helps to keep up with the linked Kotlin support
           # see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
-          tools: latest
+          tools: linked
 
       - name: Assemble
         if: matrix.language == 'java'

.github/workflows/release.yml

@@ -189,7 +189,7 @@ jobs:
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "prior-version=$PRIOR_VERSION" >> $GITHUB_OUTPUT
 
-  update-apidiff-baseline-to-released-version:
+  post-release-updates:
     permissions:
       contents: write # for git push to PR branch
     runs-on: ubuntu-latest
@@ -256,8 +256,8 @@ jobs:
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
-          message="Update apidiff baseline to released version $VERSION"
-          body="Update apidiff baseline to released version \`$VERSION\`."
+          message="Post-release updates for $VERSION"
+          body="Post-release updates for `$VERSION`."
           branch="otelbot/update-apidiff-baseline-to-released-version-${VERSION}"
 
           git checkout -b $branch

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Migration notes
+
+- The configuration option used to enable traces generated by the `dropwizard-views` instrumentation has changed from `otel.instrumentation.common.experimental.controller-telemetry.enabled` to `otel.instrumentation.common.experimental.view-telemetry.enabled`
+  ([#14475](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14475))
+
 ## Version 2.19.0 (2025-08-17)
 
 ### 📈 Enhancements

conventions/build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1.1")
   implementation("org.owasp:dependency-check-gradle:12.1.3")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")
@@ -68,7 +68,7 @@ dependencies {
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
-  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
+  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.3.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))

dependencyManagement/build.gradle.kts

@@ -89,7 +89,7 @@ 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.8",
+  "com.uber.nullaway:nullaway:0.12.9",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.10.0",
   "commons-codec:commons-codec:1.19.0",