Merge branch 'dougqh/interceptor-bypass' of github.com:DataDog/dd-trace-java into dougqh/interceptor-bypass

Author: dougqh

.circleci/config.continue.yml.j2

@@ -1337,6 +1337,24 @@ build_test_jobs: &build_test_jobs
       cacheType: smoke
       testJvm: "semeru8"
 
+  - tests:
+      requires:
+        - ok_to_test
+      name: test_graalvm17_smoke
+      gradleTarget: "stageMainDist :dd-smoke-test:quarkus-native:test"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "graalvm17"
+
+  - tests:
+      requires:
+        - ok_to_test
+      name: test_graalvm21_smoke
+      gradleTarget: "stageMainDist :dd-smoke-test:quarkus-native:test"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "graalvm21"
+
   - tests:
       requires:
         - ok_to_test

build.gradle

@@ -22,7 +22,7 @@ plugins {
   id 'pl.allegro.tech.build.axion-release' version '1.14.4'
   id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 
-  id "com.github.johnrengelman.shadow" version "8.1.1" apply false
+  id "com.gradleup.shadow" version "8.3.6" apply false
   id "me.champeau.jmh" version "0.7.0" apply false
   id 'org.gradle.playframework' version '0.13' apply false
   id 'info.solidsoft.pitest' version '1.9.11'  apply false

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

@@ -4,7 +4,7 @@ plugins {
   java
   groovy
   id("com.diffplug.spotless") version "6.13.0"
-  id("com.github.johnrengelman.shadow") version "8.1.1"
+  id("com.gradleup.shadow") version "8.3.6"
 }
 
 java {

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

@@ -1,6 +1,6 @@
 // The shadowJar of this project will be injected into the JVM's bootstrap classloader
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'me.champeau.jmh'
 }
 

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -184,13 +184,11 @@ public static void start(
 
     if (Platform.isNativeImageBuilder()) {
       // these default services are not used during native-image builds
-      jmxFetchEnabled = false;
       remoteConfigEnabled = false;
       telemetryEnabled = false;
-      // apply trace instrumentation, but skip starting other services
+      // apply trace instrumentation, but skip other products at native-image build time
       startDatadogAgent(initTelemetry, inst);
       StaticEventLogger.end("Agent.start");
-
       return;
     }
 

dd-java-agent/agent-ci-visibility/build.gradle

@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
   id 'java-test-fixtures'
 }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java

@@ -35,7 +35,6 @@
 import datadog.trace.civisibility.source.index.RepoIndexProvider;
 import datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver;
 import datadog.trace.util.Strings;
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;
@@ -72,7 +71,7 @@ public class CiVisibilityRepoServices {
       LOGGER.info("PR detected: {}", pullRequestInfo);
     }
 
-    repoRoot = appendSlashIfNeeded(getRepoRoot(ciInfo, services.gitClientFactory));
+    repoRoot = getRepoRoot(ciInfo, services.gitClientFactory);
     moduleName = getModuleName(services.config, repoRoot, path);
     ciTags = new CITagsProvider().getCiTags(ciInfo, pullRequestInfo);
 
@@ -126,7 +125,7 @@ private static PullRequestInfo buildPullRequestInfo(
   }
 
   private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {
-    String ciWorkspace = ciInfo.getNormalizedCiWorkspace();
+    String ciWorkspace = ciInfo.getCiWorkspace();
     if (Strings.isNotBlank(ciWorkspace)) {
       return ciWorkspace;
 
@@ -146,14 +145,6 @@ private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFact
     }
   }
 
-  private static String appendSlashIfNeeded(String repoRoot) {
-    if (repoRoot != null && !repoRoot.endsWith(File.separator)) {
-      return repoRoot + File.separator;
-    } else {
-      return repoRoot;
-    }
-  }
-
   static String getModuleName(Config config, @Nullable String repoRoot, Path path) {
     // if parent process is instrumented, it will provide build system's module name
     String parentModuleName = config.getCiVisibilityModuleName();

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java

@@ -170,7 +170,7 @@ public CIInfo(
     this.ciPipelineNumber = ciPipelineNumber;
     this.ciPipelineUrl = ciPipelineUrl;
     this.ciJobUrl = ciJobUrl;
-    this.ciWorkspace = ciWorkspace;
+    this.ciWorkspace = sanitizeWorkspace(ciWorkspace);
     this.ciNodeName = ciNodeName;
     this.ciNodeLabels = ciNodeLabels;
     this.ciEnvVars = ciEnvVars;
@@ -209,20 +209,18 @@ public String getCiJobUrl() {
     return ciJobUrl;
   }
 
-  /**
-   * @deprecated This method is here only to satisfy CI spec tests. Use {@link
-   *     #getNormalizedCiWorkspace()}
-   */
-  @Deprecated
-  public String getCiWorkspace() {
-    return ciWorkspace;
+  private String sanitizeWorkspace(String workspace) {
+    String realCiWorkspace = FileUtils.toRealPath(workspace);
+    return (realCiWorkspace == null
+            || !realCiWorkspace.endsWith(File.separator)
+            || realCiWorkspace.length() == 1) // root path "/"
+        ? realCiWorkspace
+        : (realCiWorkspace.substring(0, realCiWorkspace.length() - 1));
   }
 
-  public String getNormalizedCiWorkspace() {
-    String realCiWorkspace = FileUtils.toRealPath(ciWorkspace);
-    return (realCiWorkspace == null || realCiWorkspace.endsWith(File.separator))
-        ? realCiWorkspace
-        : (realCiWorkspace + File.separator);
+  /** @return Workspace path without the trailing separator */
+  public String getCiWorkspace() {
+    return ciWorkspace;
   }
 
   public String getCiNodeName() {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java

@@ -22,7 +22,7 @@ public CITagsProvider() {
   }
 
   public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestInfo) {
-    String repoRoot = ciInfo.getNormalizedCiWorkspace();
+    String repoRoot = ciInfo.getCiWorkspace();
     GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
 
     return new CITagsBuilder()

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java

@@ -1,6 +1,7 @@
 package datadog.trace.civisibility.source;
 
 import datadog.compiler.utils.CompilerUtils;
+import java.io.File;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -9,7 +10,7 @@ public class CompilerAidedSourcePathResolver implements SourcePathResolver {
   private final String repoRoot;
 
   public CompilerAidedSourcePathResolver(String repoRoot) {
-    this.repoRoot = repoRoot;
+    this.repoRoot = repoRoot.endsWith(File.separator) ? repoRoot : repoRoot + File.separator;
   }
 
   @Nullable