Add PR diff to execution settings

Author: nikita-tkachenko-datadog

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

@@ -61,6 +61,11 @@ public class CiVisibilityRepoServices {
 
     CIInfo ciInfo = ciProviderInfo.buildCIInfo();
     PullRequestInfo pullRequestInfo = ciProviderInfo.buildPullRequestInfo();
+
+    if (pullRequestInfo.isNotEmpty()) {
+      LOGGER.info("PR detected: {}", pullRequestInfo);
+    }
+
     repoRoot = ciInfo.getNormalizedCiWorkspace();
     moduleName = getModuleName(services.config, path, ciInfo);
     ciTags = new CITagsProvider().getCiTags(ciInfo, pullRequestInfo);
@@ -86,7 +91,9 @@ public class CiVisibilityRepoServices {
               services.config,
               services.metricCollector,
               services.backendApi,
+              services.gitClientFactory,
               gitDataUploader,
+              pullRequestInfo,
               repoRoot);
     }
   }
@@ -128,7 +135,9 @@ private static ExecutionSettingsFactory buildExecutionSettingsFactory(
       Config config,
       CiVisibilityMetricCollector metricCollector,
       BackendApi backendApi,
+      GitClient.Factory gitClientFactory,
       GitDataUploader gitDataUploader,
+      PullRequestInfo pullRequestInfo,
       String repoRoot) {
     ConfigurationApi configurationApi;
     if (backendApi == null) {
@@ -140,7 +149,8 @@ private static ExecutionSettingsFactory buildExecutionSettingsFactory(
     }
 
     ExecutionSettingsFactoryImpl factory =
-        new ExecutionSettingsFactoryImpl(config, configurationApi, gitDataUploader, repoRoot);
+        new ExecutionSettingsFactoryImpl(
+            config, configurationApi, gitClientFactory, gitDataUploader, pullRequestInfo, repoRoot);
     if (processHierarchy.isHeadless()) {
       return factory;
     } else {

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 javax.annotation.Nonnull;
 
 class AppVeyorInfo implements CIProviderInfo {
 
@@ -79,6 +80,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -3,6 +3,7 @@
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
+import javax.annotation.Nonnull;
 
 class AwsCodePipelineInfo implements CIProviderInfo {
 
@@ -35,6 +36,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -11,6 +11,7 @@
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
+import javax.annotation.Nonnull;
 
 class AzurePipelinesInfo implements CIProviderInfo {
 
@@ -81,6 +82,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -10,6 +10,7 @@
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
 import datadog.trace.util.Strings;
+import javax.annotation.Nonnull;
 
 class BitBucketInfo implements CIProviderInfo {
 
@@ -70,6 +71,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -10,6 +10,7 @@
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
+import javax.annotation.Nonnull;
 
 class BitriseInfo implements CIProviderInfo {
 
@@ -66,6 +67,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.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 javax.annotation.Nonnull;
 
 class BuddyInfo implements CIProviderInfo {
 
@@ -58,6 +59,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 class BuildkiteInfo implements CIProviderInfo {
 
@@ -74,6 +75,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;

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

@@ -2,13 +2,15 @@
 
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfo;
+import javax.annotation.Nonnull;
 
 public interface CIProviderInfo {
 
   GitInfo buildCIGitInfo();
 
   CIInfo buildCIInfo();
 
+  @Nonnull
   PullRequestInfo buildPullRequestInfo();
 
   Provider getProvider();

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

@@ -9,6 +9,7 @@
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
+import javax.annotation.Nonnull;
 
 class CircleCIInfo implements CIProviderInfo {
 
@@ -56,6 +57,7 @@ public CIInfo buildCIInfo() {
         .build();
   }
 
+  @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return PullRequestInfo.EMPTY;