Merge branch 'master' into smola/enable-api-security-by-default

Author: smola

.circleci/upload_ciapp.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 SERVICE_NAME="dd-trace-java"
-PIPELINE_STAGE=$1
+CACHE_TYPE=$1
 TEST_JVM=$2
 
 # JAVA_???_HOME are set in the base image for each used JDK https://github.com/DataDog/dd-trace-java-docker-build/blob/master/Dockerfile#L86
@@ -23,7 +23,7 @@ junit_upload() {
     DD_API_KEY=$1 \
         datadog-ci junit upload --service $SERVICE_NAME \
         --logs \
-        --tags "test.traits:{\"marker\":[\"$PIPELINE_STAGE\"]}" \
+        --tags "test.traits:{\"category\":[\"$CACHE_TYPE\"]}" \
         --tags "runtime.name:$(java_prop java.runtime.name)" \
         --tags "runtime.vendor:$(java_prop java.vendor)" \
         --tags "runtime.version:$(java_prop java.version)" \

.gitlab-ci.yml

@@ -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:
     - >
@@ -406,7 +406,7 @@ muzzle-dep-report:
     - .circleci/collect_reports.sh
     - if [ "$PROFILE_TESTS" == "true" ]; then .circleci/collect_profiles.sh; fi
     - .circleci/collect_results.sh
-    - .circleci/upload_ciapp.sh tests $testJvm
+    - .circleci/upload_ciapp.sh $CACHE_TYPE $testJvm
     - gitlab_section_end "collect-reports"
     - URL_ENCODED_JOB_NAME=$(jq -rn --arg x "$CI_JOB_NAME" '$x|@uri')
     - echo -e "${TEXT_BOLD}${TEXT_YELLOW}See test results in Datadog:${TEXT_CLEAR} https://app.datadoghq.com/ci/test/runs?query=test_level%3Atest%20%40test.service%3Add-trace-java%20%40ci.pipeline.id%3A${CI_PIPELINE_ID}%20%40ci.job.name%3A%22${URL_ENCODED_JOB_NAME}%22"

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-bootstrap/build.gradle

@@ -65,3 +65,11 @@ jmh {
   jmhVersion = '1.32'
   duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }
+
+project.afterEvaluate {
+  tasks.withType(Test).configureEach {
+    if (javaLauncher.get().metadata.languageVersion.asInt() >= 16) {
+      jvmArgs += ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest
+    }
+  }
+}

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java

@@ -2,13 +2,12 @@
 
 import static datadog.trace.api.cache.RadixTreeCache.PORTS;
 import static datadog.trace.api.cache.RadixTreeCache.UNSET_PORT;
+import static datadog.trace.bootstrap.instrumentation.java.net.HostNameResolver.hostName;
 
 import datadog.context.ContextScope;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.Functions;
-import datadog.trace.api.cache.DDCache;
-import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.cache.QualifiedClassNameCache;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -40,8 +39,6 @@ public String apply(Class<?> clazz) {
           },
           Functions.PrefixJoin.of("."));
 
-  private static final DDCache<String, String> HOSTNAME_CACHE = DDCaches.newFixedSizeCache(64);
-
   protected final boolean traceAnalyticsEnabled;
   protected final Double traceAnalyticsSampleRate;
 
@@ -200,11 +197,4 @@ public CharSequence className(final Class<?> clazz) {
     String simpleName = clazz.getSimpleName();
     return simpleName.isEmpty() ? CLASS_NAMES.getClassName(clazz) : simpleName;
   }
-
-  private static String hostName(InetAddress remoteAddress, String ip) {
-    if (null != ip) {
-      return HOSTNAME_CACHE.computeIfAbsent(ip, _ip -> remoteAddress.getHostName());
-    }
-    return remoteAddress.getHostName();
-  }
 }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolver.java

@@ -0,0 +1,68 @@
+package datadog.trace.bootstrap.instrumentation.java.net;
+
+import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
+import datadog.trace.util.MethodHandles;
+import java.lang.invoke.MethodHandle;
+import java.net.InetAddress;
+
+public final class HostNameResolver {
+  private static final MethodHandle HOLDER_GET;
+  private static final MethodHandle HOSTNAME_GET;
+
+  private static final DDCache<String, String> HOSTNAME_CACHE = DDCaches.newFixedSizeCache(64);
+
+  static {
+    MethodHandle holderTmp = null, hostnameTmp = null;
+    try {
+      final ClassLoader cl = HostNameResolver.class.getClassLoader();
+      final MethodHandles methodHandles = new MethodHandles(cl);
+
+      final Class<?> holderClass =
+          Class.forName("java.net.InetAddress$InetAddressHolder", false, cl);
+      holderTmp = methodHandles.method(InetAddress.class, "holder");
+      if (holderTmp != null) {
+        hostnameTmp = methodHandles.method(holderClass, "getHostName");
+      }
+    } catch (Throwable ignored) {
+      holderTmp = null;
+    } finally {
+      if (holderTmp != null && hostnameTmp != null) {
+        HOLDER_GET = holderTmp;
+        HOSTNAME_GET = hostnameTmp;
+      } else {
+        HOLDER_GET = null;
+        HOSTNAME_GET = null;
+      }
+    }
+  }
+
+  private HostNameResolver() {}
+
+  static String getAlreadyResolvedHostName(InetAddress address) {
+    if (HOLDER_GET == null) {
+      return null;
+    }
+    try {
+      final Object holder = HOLDER_GET.invoke(address);
+      return (String) HOSTNAME_GET.invoke(holder);
+    } catch (final Throwable ignored) {
+    }
+    return null;
+  }
+
+  private static String fromCache(InetAddress remoteAddress, String ip) {
+    if (null != ip) {
+      return HOSTNAME_CACHE.computeIfAbsent(ip, _ip -> remoteAddress.getHostName());
+    }
+    return remoteAddress.getHostName();
+  }
+
+  public static String hostName(InetAddress address, String ip) {
+    final String alreadyResolved = getAlreadyResolvedHostName(address);
+    if (alreadyResolved != null) {
+      return alreadyResolved;
+    }
+    return fromCache(address, ip);
+  }
+}

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolverForkedTest.groovy

@@ -0,0 +1,43 @@
+package datadog.trace.bootstrap.instrumentation.java.net
+
+import datadog.trace.test.util.DDSpecification
+
+class HostNameResolverForkedTest extends DDSpecification {
+  def "should directly get the hostname for already resolved address #address"() {
+    given:
+    def host = HostNameResolver.getAlreadyResolvedHostName(address)
+    expect:
+    host == expected
+    where:
+    address                                                           | expected
+    new Inet4Address("test", InetAddress.getLocalHost().getAddress()) | "test"
+    new Inet6Address("test", InetAddress.getLocalHost().getAddress()) | "test"
+  }
+
+  def "should return null when directly get the address for unresolved #address"() {
+    given:
+    def host = HostNameResolver.getAlreadyResolvedHostName(address)
+    expect:
+    host == null
+    where:
+    address                                                           | _
+    InetAddress.getByAddress(InetAddress.getLocalHost().getAddress()) | _
+    new Inet6Address(null, InetAddress.getLocalHost().getAddress())   | _
+  }
+
+  def "should use the cache for unresolved addresses"() {
+    given:
+    def inet1 = new Inet4Address(null, InetAddress.getLocalHost().getAddress())
+    def inet2 = new Inet4Address(null, 0) // this will fail if a resolution will happen
+    when:
+    def address = new InetSocketAddress(inet1, 666)
+    def host = HostNameResolver.hostName(address.getAddress(), "127.0.0.1")
+    then:
+    host != null
+    when:
+    address = new InetSocketAddress(inet2, 666)
+    def host2 = HostNameResolver.hostName(address.getAddress(), "127.0.0.1")
+    then:
+    host == host2
+  }
+}

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

@@ -65,7 +65,8 @@ public class CiVisibilityRepoServices {
     ciProvider = ciProviderInfo.getProvider();
 
     CIInfo ciInfo = ciProviderInfo.buildCIInfo();
-    PullRequestInfo pullRequestInfo = buildPullRequestInfo(services.environment, ciProviderInfo);
+    PullRequestInfo pullRequestInfo =
+        buildPullRequestInfo(services.config, services.environment, ciProviderInfo);
 
     if (pullRequestInfo.isNotEmpty()) {
       LOGGER.info("PR detected: {}", pullRequestInfo);
@@ -110,18 +111,38 @@ public class CiVisibilityRepoServices {
 
   @Nonnull
   private static PullRequestInfo buildPullRequestInfo(
-      CiEnvironment environment, CIProviderInfo ciProviderInfo) {
-    PullRequestInfo ciProviderPrInfo = ciProviderInfo.buildPullRequestInfo();
-    if (ciProviderPrInfo.isNotEmpty()) {
-      return ciProviderPrInfo;
+      Config config, CiEnvironment environment, CIProviderInfo ciProviderInfo) {
+    PullRequestInfo info = buildUserPullRequestInfo(config, environment);
+
+    if (info.isComplete()) {
+      return info;
+    }
+
+    // complete with CI vars if user didn't provide all information
+    return PullRequestInfo.merge(info, ciProviderInfo.buildPullRequestInfo());
+  }
+
+  @Nonnull
+  private static PullRequestInfo buildUserPullRequestInfo(
+      Config config, CiEnvironment environment) {
+    PullRequestInfo userInfo =
+        new PullRequestInfo(
+            config.getGitPullRequestBaseBranch(),
+            config.getGitPullRequestBaseBranchSha(),
+            config.getGitCommitHeadSha());
+
+    if (userInfo.isComplete()) {
+      return userInfo;
     }
 
-    // could not get PR info from CI provider,
-    // check if it was set manually
-    return new PullRequestInfo(
-        null,
-        environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA),
-        environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA));
+    // logs-backend specific vars
+    PullRequestInfo ddCiInfo =
+        new PullRequestInfo(
+            null,
+            environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA),
+            environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA));
+
+    return PullRequestInfo.merge(userInfo, ddCiInfo);
   }
 
   private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {

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

@@ -9,6 +9,7 @@
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
+import datadog.trace.util.Strings;
 import javax.annotation.Nonnull;
 
 class AppVeyorInfo implements CIProviderInfo {
@@ -25,6 +26,8 @@ class AppVeyorInfo implements CIProviderInfo {
   public static final String APPVEYOR_REPO_BRANCH = "APPVEYOR_REPO_BRANCH";
   public static final String APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH =
       "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH";
+  public static final String APPVEYOR_PULL_REQUEST_HEAD_COMMIT =
+      "APPVEYOR_PULL_REQUEST_HEAD_COMMIT";
   public static final String APPVEYOR_REPO_TAG_NAME = "APPVEYOR_REPO_TAG_NAME";
   public static final String APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT = "APPVEYOR_REPO_COMMIT_MESSAGE";
   public static final String APPVEYOR_REPO_COMMIT_MESSAGE_BODY =
@@ -83,7 +86,15 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
+    // check if PR is detected
+    if (Strings.isNotBlank(environment.get(APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH))) {
+      return new PullRequestInfo(
+          normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
+          null,
+          environment.get(APPVEYOR_PULL_REQUEST_HEAD_COMMIT));
+    } else {
+      return PullRequestInfo.EMPTY;
+    }
   }
 
   private String buildGitBranch(final String repoProvider) {

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

@@ -26,6 +26,7 @@ class BitBucketInfo implements CIProviderInfo {
   public static final String BITBUCKET_GIT_COMMIT = "BITBUCKET_COMMIT";
   public static final String BITBUCKET_GIT_BRANCH = "BITBUCKET_BRANCH";
   public static final String BITBUCKET_GIT_TAG = "BITBUCKET_TAG";
+  public static final String BITBUCKET_PR_DESTINATION_BRANCH = "BITBUCKET_PR_DESTINATION_BRANCH";
 
   private final CiEnvironment environment;
 
@@ -74,7 +75,8 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
+    return new PullRequestInfo(
+        normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)), null, null);
   }
 
   private String buildPipelineUrl(final String repo, final String number) {