Merge branch 'bdu/spotbugs-bump-need-jdk11-min' into alexeyk/spotless-attempt-3

Author: AlexeyKuznetsov-DD

.github/CODEOWNERS

@@ -115,6 +115,9 @@
 **/datastreams/                                                              @DataDog/data-streams-monitoring
 **/DataStreams*                                                              @DataDog/data-streams-monitoring
 
+# @DataDog/feature-flagging-and-experimentation-sdk
+/products/feature-flagging/                           @DataDog/feature-flagging-and-experimentation-sdk
+
 # @DataDog/profiling-java
 /dd-java-agent/agent-profiling/                                                             @DataDog/profiling-java
 /dd-java-agent/agent-crashtracking/                                                         @DataDog/profiling-java

.gitignore

@@ -46,6 +46,10 @@ out/
 ######################
 .vscode
 
+# Cursor #
+##########
+.cursor
+
 # Others #
 ##########
 /logs/*
@@ -77,3 +81,6 @@ mise*.local.toml
 .config/mise*.toml
 # asdf
 .tool-versions
+
+# Exclude kotlin build files
+.kotlin

.gitlab-ci.yml

@@ -171,6 +171,13 @@ default:
     - export ORG_GRADLE_PROJECT_akkaRepositoryToken=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.akka_repo_token --with-decryption --query "Parameter.Value" --out text)
     - export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
     - export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY
+    - |
+      JAVA_HOMES=$(env | grep -E '^JAVA_[A-Z0-9_]+_HOME=' | sed 's/=.*//' | paste -sd,)
+      cat >> gradle.properties <<EOF
+      org.gradle.java.installations.auto-detect=false
+      org.gradle.java.installations.auto-download=false
+      org.gradle.java.installations.fromEnv=$JAVA_HOMES
+      EOF
     - mkdir -p .gradle
     - export GRADLE_USER_HOME=$(pwd)/.gradle
     # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
@@ -988,13 +995,14 @@ create_key:
     paths:
       - pubkeys
 
-validate_supported_configurations_local_file:
-  extends: .validate_supported_configurations_local_file
+validate_supported_configurations_v2_local_file:
+  extends: .validate_supported_configurations_v2_local_file
   variables:
     LOCAL_JSON_PATH: "metadata/supported-configurations.json"
+    BACKFILLED: "false"
 
-update_central_configurations_version_range:
-  extends: .update_central_configurations_version_range
+update_central_configurations_version_range_v2:
+  extends: .update_central_configurations_version_range_v2
   variables:
     LOCAL_REPO_NAME: "dd-trace-java"
     LOCAL_JSON_PATH: "metadata/supported-configurations.json"

.gitlab/benchmarks.yml

@@ -1,6 +1,5 @@
 .benchmarks:
   stage: benchmarks
-  interruptible: true
   timeout: 1h
   tags: ["runner:apm-k8s-tweaked-metal"]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-java-benchmarks
@@ -11,7 +10,11 @@
     - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
       when: manual
       allow_failure: true
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: on_success
+      interruptible: false
     - when: on_success
+      interruptible: true
   script:
     - export ARTIFACTS_DIR="$(pwd)/reports" && mkdir -p "${ARTIFACTS_DIR}"
     - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"

.gitlab/macrobenchmarks.yml

@@ -11,11 +11,12 @@ include:
       when: never
     - if: ($NIGHTLY_BENCHMARKS || $CI_PIPELINE_SOURCE != "schedule") && $CI_COMMIT_REF_NAME == "master"
       when: always
+      interruptible: false
     - when: manual
+      interruptible: true
       allow_failure: true
   tags: ["runner:apm-k8s-same-cpu"]
   needs: ["build"]
-  interruptible: true
   timeout: 1h
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-java-petclinic
   script:

buildSrc/build.gradle.kts

@@ -24,7 +24,7 @@ gradlePlugin {
     }
     create("call-site-instrumentation-plugin") {
       id = "call-site-instrumentation"
-      implementationClass = "datadog.gradle.plugin.CallSiteInstrumentationPlugin"
+      implementationClass = "datadog.gradle.plugin.csi.CallSiteInstrumentationPlugin"
     }
     create("tracer-version-plugin") {
       id = "datadog.tracer-version"
@@ -57,7 +57,7 @@ dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
 
-  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.17.7")
+  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.1")
 
   implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")

buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteUtils.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -47,7 +48,20 @@ public static String repeat(final char value, int count) {
 
   public static URL toURL(final Path path) {
     try {
-      return path.toUri().toURL();
+      URL url = path.toUri().toURL();
+      // URLClassLoader interprets URLs ending with '/' as directories. If the trailing '/' is
+      // missing, a directory URL is treated as a JAR. If the path does yet exist on disk
+      // assumes that paths not ending with ".jar" are directories.
+      boolean shouldAddSlash =
+          Files.exists(path) ? Files.isDirectory(path) : !path.toString().endsWith(".jar");
+
+      if (shouldAddSlash) {
+        String urlString = url.toString();
+        if (!urlString.endsWith("/")) {
+          url = new URL(urlString + "/");
+        }
+      }
+      return url;
     } catch (MalformedURLException e) {
       throw new RuntimeException(e);
     }

buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts

@@ -101,6 +101,9 @@ tasks.withType<Test>().configureEach {
   develocity.testRetry {
     if (providers.environmentVariable("CI").isPresent()) {
       maxRetries = 3
+      filter {
+        excludeAnnotationClasses.add("*NonRetryable") // allow to mark classes non retryable
+      }
     }
   }
 }