Merge branch 'master' into nikita-tkachenko/remove-unused-test-ev-handler-methods

Author: nikita-tkachenko-datadog

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 69a5e874384dd256e2e3f42fc1c95807a67efbe6
+default_system_tests_commit: &default_system_tests_commit 761b9e7a82ffb136c4653a4d1623d120d67b005b
 
 parameters:
   nightly:
@@ -932,7 +932,7 @@ jobs:
           command: |
             cd system-tests
             DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
-        
+
       - run:
           name: Run IDM Crossed Tracing Libraries propagation tests for messaging
           environment:
@@ -975,7 +975,7 @@ jobs:
           no_output_timeout: 5m
           command: |
             cd system-tests
-            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY 
+            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
             ./run.sh DEBUGGER_SCENARIOS
 
       - run:
@@ -1105,7 +1105,7 @@ build_test_jobs: &build_test_jobs
       requires:
         - ok_to_test
       name: check_inst
-      parallelism: 4
+      parallelism: 5
       gradleTarget: ":instrumentationCheck"
       cacheType: inst
       triggeredBy: *instrumentation_modules
@@ -1333,6 +1333,7 @@ build_test_jobs: &build_test_jobs
       matrix:
         <<: *test_matrix
 
+{% if ssi_smoke %}
   - tests:
       requires:
         - ok_to_test
@@ -1346,6 +1347,7 @@ build_test_jobs: &build_test_jobs
       maxWorkers: 3
       matrix:
         <<: *test_matrix
+{% endif %}
 
   - tests:
       requires:
@@ -1389,6 +1391,7 @@ build_test_jobs: &build_test_jobs
       maxWorkers: 3
       testJvm: "8"
 
+{% if ssi_smoke %}
   - tests:
       requires:
         - ok_to_test
@@ -1401,13 +1404,16 @@ build_test_jobs: &build_test_jobs
       parallelism: 4
       maxWorkers: 3
       testJvm: "8"
+{% endif %}
 
   - fan_in:
       requires:
         - z_test_<< matrix.testJvm >>_base
         - z_test_<< matrix.testJvm >>_inst
         - z_test_<< matrix.testJvm >>_smoke
+{% if ssi_smoke %}
         - z_test_<< matrix.testJvm >>_ssi_smoke
+{% endif %}
       name: test_<< matrix.testJvm >>
       stage: tracing
       matrix:
@@ -1418,7 +1424,9 @@ build_test_jobs: &build_test_jobs
         - z_test_8_base
         - z_test_8_inst
         - z_test_8_smoke
+{% if ssi_smoke %}
         - z_test_8_ssi_smoke
+{% endif %}
       name: test_8
       stage: tracing
       testJvm: "8"
@@ -1512,6 +1520,14 @@ build_test_jobs: &build_test_jobs
       stage: required
 
 workflows:
+{% if skip_circleci %}
+  build_test:
+    jobs:
+      # Just a "required" job to make GitHub PR checks happy, and run nothing else.
+      - fan_in:
+          name: required
+          stage: required
+{% else %}
 {% if is_regular %}
   build_test:
     jobs:
@@ -1552,3 +1568,4 @@ workflows:
           gradleTarget: :profilingTest
           cacheType: profiling
 {% endif %}
+{% endif %}

.circleci/no_circleci_changes.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -eu
+git diff --name-only "$1" | grep --invert-match --quiet -E '^(.gitlab-ci.yml|.gitlab)'

.circleci/render_config.py

@@ -2,6 +2,7 @@
 
 import os
 import os.path
+import subprocess
 import time
 
 import jinja2
@@ -14,9 +15,10 @@
 GENERATED_CONFIG_PATH = os.path.join(SCRIPT_DIR, OUT_FILENAME)
 
 # JDKs that will run on every pipeline.
-ALWAYS_ON_JDKS = {"8", "11", "17", "21"}
+ALWAYS_ON_JDKS = {"8", "17", "21"}
 # And these will run only in master and release/ branches.
 MASTER_ONLY_JDKS = {
+    "11",
     "ibm8",
     "oracle8",
     "semeru8",
@@ -74,6 +76,13 @@
 run_all = "all" in labels
 is_master_or_release = branch == "master" or branch.startswith("release/v")
 
+skip_circleci = False
+if pr_base_ref:
+   ret = subprocess.call([".circleci/no_circleci_changes.sh", f"{pr_base_ref}..HEAD"], shell=False)
+   if ret == 1:
+       # Only GitLab-related files have changed, just skip Circle CI jobs.
+       skip_circleci = True
+
 if is_master_or_release or run_all:
     all_jdks = ALWAYS_ON_JDKS | MASTER_ONLY_JDKS
 else:
@@ -99,10 +108,12 @@
     "all_jdks": all_jdks,
     "all_debugger_jdks": all_debugger_jdks,
     "nocov_jdks": nocov_jdks,
-    "flaky": branch == "master" or "flaky" in labels or "all" in labels,
+    "flaky": "flaky" in labels or "all" in labels,
     "docker_image_prefix": "" if is_nightly else f"{DOCKER_IMAGE_VERSION}-",
     "use_git_changes": use_git_changes,
     "pr_base_ref": pr_base_ref,
+    "skip_circleci": skip_circleci,
+    "ssi_smoke": is_regular and is_master_or_release
 }
 
 print(f"Variables for this build: {vars}")

.github/CODEOWNERS

@@ -17,24 +17,26 @@ dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrument
 dd-smoke-tests/profiling-integration-tests/                                                @DataDog/profiling-java
 
 # @DataDog/ci-app-libraries-java
-dd-java-agent/agent-ci-visibility/         @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/cucumber/    @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/jacoco/      @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/junit-4.10/  @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/junit-5.3/   @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/karate/      @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/scalatest/   @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/selenium/    @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/testng/      @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/gradle-3.0/  @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/gradle-8.3/  @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java
-dd-java-agent/instrumentation/weaver/      @DataDog/ci-app-libraries-java
-dd-smoke-tests/gradle/                     @DataDog/ci-app-libraries-java
-dd-smoke-tests/maven/                      @DataDog/ci-app-libraries-java
-**/civisibility/                           @DataDog/ci-app-libraries-java
-**/CiVisibility*.java                      @DataDog/ci-app-libraries-java
-**/CiVisibility*.groovy                    @DataDog/ci-app-libraries-java
+dd-java-agent/agent-ci-visibility/              @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/cucumber/         @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/jacoco/           @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/junit-4.10/       @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/junit-5.3/        @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/karate/           @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/scalatest/        @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/selenium/         @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/testng/           @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/gradle-3.0/       @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/gradle-8.3/       @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/gradle-testing/   @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/maven-3.2.1/      @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/maven-surefire/   @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/weaver/           @DataDog/ci-app-libraries-java
+dd-smoke-tests/gradle/                          @DataDog/ci-app-libraries-java
+dd-smoke-tests/maven/                           @DataDog/ci-app-libraries-java
+**/civisibility/                                @DataDog/ci-app-libraries-java
+**/CiVisibility*.java                           @DataDog/ci-app-libraries-java
+**/CiVisibility*.groovy                         @DataDog/ci-app-libraries-java
 
 # @DataDog/debugger-java (Live Debugger)
 dd-java-agent/agent-debugger/ @DataDog/debugger-java

.gitlab-ci.yml

@@ -23,7 +23,8 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
-  MAVEN_REPOSITORY_PROXY: "https://artifactual.us1.prod.dog/repository/maven-central/"
+  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.01"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   PROFILE_TESTS:
@@ -75,7 +76,7 @@ default:
       policy: $BUILD_CACHE_POLICY
   before_script:
     - export GRADLE_USER_HOME=`pwd`/.gradle
-    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY"
+    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY -PgradlePluginProxy=$GRADLE_PLUGIN_PROXY"
     - *normalize_node_index
     # for weird reasons, gradle will always "chmod 700" the .gradle folder
     # with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails

build.gradle

@@ -32,6 +32,7 @@ description = 'dd-trace-java'
 
 def isCI = System.getenv("CI") != null
 
+apply from: "$rootDir/gradle/repositories.gradle"
 apply from: "$rootDir/gradle/scm.gradle"
 spotless {
   // only resolve the spotless dependencies once in the build
@@ -79,12 +80,6 @@ allprojects {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
-}
-
 tasks.register("latestDepTest")
 
 nexusPublishing {

buildSrc/build.gradle.kts

@@ -22,10 +22,8 @@ gradlePlugin {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -24,10 +24,8 @@ spotless {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

communication/gradle.lockfile

@@ -157,10 +157,11 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspat
 org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
 org.testng:testng:7.5=testRuntimeClasspath
 org.webjars:jquery:3.5.1=testRuntimeClasspath
 org.xmlresolver:xmlresolver:4.4.3=spotbugs
+org.yaml:snakeyaml:2.4=runtimeClasspath,testRuntimeClasspath
 xml-apis:xml-apis:1.4.01=spotbugs
 empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor

components/cli/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+  id("me.champeau.jmh")
+}
+
+apply(from = "$rootDir/gradle/java.gradle")
+
+jmh {
+  version = "1.28"
+}