Merge branch 'main' into peer-service-testing

Author: laurit

.fossa.yml

@@ -388,6 +388,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:azure-core:azure-core-1.36:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:azure-core:azure-core-1.53:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:cassandra:cassandra-3.0:javaagent'

.github/workflows/build-pull-request.yml

@@ -3,10 +3,11 @@ name: Build pull request
 on:
   pull_request:
     types:
-      - labeled
       - opened
       - synchronize
       - reopened
+  # called from rebuild-pull-request-on-label.yml
+  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}

.github/workflows/rebuild-pull-request-on-label.yml

@@ -0,0 +1,19 @@
+name: Build on test labels
+
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+
+permissions:
+  contents: read
+
+jobs:
+  trigger-build:
+    # Only run if one of the test labels was added
+    if: |
+      github.event.label.name == 'test openj9' ||
+      github.event.label.name == 'test windows' ||
+      github.event.label.name == 'test native'
+    uses: ./.github/workflows/build-pull-request.yml

benchmark-overhead-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.6")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.7")
 }
 
 tasks {

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

@@ -63,7 +63,6 @@ tasks {
 
         // TODO (trask) use animal sniffer
         disable("Java8ApiChecker")
-        disable("AndroidJdkLibsChecker")
 
         // apparently disabling android doesn't disable this
         disable("StaticOrDefaultInterfaceMethod")

custom-checks/build.gradle.kts

@@ -12,15 +12,15 @@ dependencies {
 }
 
 otelJava {
-  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+  minJavaVersionSupported.set(JavaVersion.VERSION_21)
 }
 
 // We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.
 // We also can't seem to use the toolchain without the "--release" option. So disable everything.
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
   toolchain {
     languageVersion.set(null as JavaLanguageVersion?)
   }

dependencyManagement/build.gradle.kts

@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.42.0"
+val errorProneVersion = "2.43.0"
 val byteBuddyVersion = "1.17.8"
 val asmVersion = "9.9"
 val jmhVersion = "1.37"