Merge branch 'master' into smola/telemetry-logs-tags

Author: smola

.circleci/collect_results.sh

@@ -35,7 +35,7 @@ function get_source_file () {
         fi
       done
     done < <(grep -rl "class $class" "$file_path")
-    file_path="$common_root"
+    file_path="/$common_root"
   fi
 }
 

.github/workflows/update-docker-build-image.yaml

@@ -52,7 +52,7 @@ jobs:
           echo "::notice::Using Docker build image tag: ${TAG}"
       - name: Update the Docker build image in GitLab CI config
         run: |
-          sed -i 's|JAVA_BUILD_IMAGE_VERSION:.*|JAVA_BUILD_IMAGE_VERSION:"${{ steps.define-tag.outputs.tag }}"|' .gitlab-ci.yml
+          sed -i 's|BUILDER_IMAGE_VERSION_PREFIX:.*|BUILDER_IMAGE_VERSION_PREFIX:"${{ steps.define-tag.outputs.tag }}-"|' .gitlab-ci.yml
       - name: Commit and push changes
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitlab-ci.yml

@@ -27,7 +27,7 @@ variables:
   GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
   GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
-  JAVA_BUILD_IMAGE_VERSION: "v25.05"
+  BUILDER_IMAGE_VERSION_PREFIX: "v25.05-"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   DEFAULT_TEST_JVMS: /^(8|11|17|21)$/
   PROFILE_TESTS:
@@ -97,7 +97,7 @@ default:
   - echo "NORMALIZED_NODE_TOTAL=${NORMALIZED_NODE_TOTAL}, NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX"
 
 .gradle_build: &gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base
+  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: build
   variables:
     MAVEN_OPTS: "-Xms64M -Xmx512M"
@@ -228,7 +228,7 @@ spotless:
 
 test_published_artifacts:
   extends: .gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests
+  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
   stage: tests
   needs: [ build ]
   variables:
@@ -366,7 +366,7 @@ muzzle-dep-report:
 
 .test_job:
   extends: .gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm
+  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
   tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
   needs: [ build_tests ]
   stage: tests
@@ -387,7 +387,7 @@ muzzle-dep-report:
       when: on_success
     - if: $NON_DEFAULT_JVMS == "true"
       when: on_success
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_BRANCH == "master"
       when: on_success
   script:
     - >
@@ -557,9 +557,7 @@ test_smoke:
 
 test_ssi_smoke:
   extends: .test_job
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: on_success
+  rules: *master_only
   variables:
     GRADLE_TARGET: "stageMainDist :smokeTest"
     CACHE_TYPE: "smoke"

BUILDING.md

@@ -60,7 +60,7 @@ Requirements to build the full project:
 
 ### Install the required JDKs
 
-Download and install Eclipse Temurin JDK versions 8, 11, 17 and 21, and GraalVM 17.
+Download and install JDK versions 8, 11, 17 and 21, and GraalVM 17 for your OS.
 
 #### macOS
 
@@ -179,17 +179,17 @@ scoop install git
 
 #### macOS
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/mac-install/
 
 #### Linux
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/linux/
 
 #### Windows
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/windows-install/
 
 <details>

dd-java-agent/agent-iast/build.gradle

@@ -15,8 +15,8 @@ java {
   toolchain {
     languageVersion.set(JavaLanguageVersion.of(11))
   }
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(AbstractCompile).configureEach {

dd-java-agent/agent-jmxfetch/build.gradle

@@ -11,7 +11,7 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
-  api('com.datadoghq:jmxfetch:0.49.7') {
+  api('com.datadoghq:jmxfetch:0.49.8') {
     exclude group: 'org.slf4j', module: 'slf4j-api'
     exclude group: 'org.slf4j', module: 'slf4j-jdk14'
     exclude group: 'com.beust', module: 'jcommander'

dd-java-agent/benchmark-integration/build.gradle

@@ -25,8 +25,8 @@ apply from: "$rootDir/gradle/java.gradle"
 
 description = 'Integration Level Agent benchmarks.'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 subprojects { sub ->
   sub.apply plugin: 'com.gradleup.shadow'

dd-java-agent/instrumentation/javax-xml/build.gradle

@@ -14,6 +14,13 @@ repositories {
   }
 }
 
+configurations.all {
+  // shut up about broken xml-api pom relocation
+  resolutionStrategy {
+    force 'xml-apis:xml-apis:1.4.01'
+  }
+}
+
 dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testImplementation group: 'xalan', name: 'xalan', version: '2.7.0'

dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy

@@ -80,6 +80,7 @@ abstract class Lettuce4ClientTestBase extends VersionedNamingTestBase {
 
   def cleanup() {
     connection.close()
+    redisClient.shutdown()
     redisServer.stop()
   }
 }

dd-java-agent/instrumentation/owasp-esapi-2/build.gradle

@@ -7,6 +7,13 @@ muzzle {
   }
 }
 
+configurations.all {
+  // shut up about broken xml-api pom relocation
+  resolutionStrategy {
+    force 'xml-apis:xml-apis:1.4.01'
+  }
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'call-site-instrumentation'