Add more metrics and tags to CI Visibility telemetry (#7223)

DataDog · Jun 20, 2024 · 01fd984 · 01fd984
1 parent 1ceb7d1
commit 01fd984
Show file tree

Hide file tree

Showing 37 changed files with 320 additions and 44 deletions.
diff --git a/...gent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java b/...gent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
@@ -4,6 +4,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.config.ModuleExecutionSettings;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfoProvider;
 import datadog.trace.civisibility.ci.CIInfo;
 import datadog.trace.civisibility.ci.CIProviderInfo;
@@ -45,8 +46,8 @@ public class CiVisibilityRepoServices {
 
   final String repoRoot;
   final String moduleName;
+  final Provider ciProvider;
   final Map<String, String> ciTags;
-  final boolean supportedCiProvider;
 
   final GitDataUploader gitDataUploader;
   final RepoIndexProvider repoIndexProvider;
@@ -56,11 +57,12 @@ public class CiVisibilityRepoServices {
 
   CiVisibilityRepoServices(CiVisibilityServices services, Path path) {
     CIProviderInfo ciProviderInfo = services.ciProviderInfoFactory.createCIProviderInfo(path);
+    ciProvider = ciProviderInfo.getProvider();
+
     CIInfo ciInfo = ciProviderInfo.buildCIInfo();
     repoRoot = ciInfo.getCiWorkspace();
     moduleName = getModuleName(services.config, path, ciInfo);
     ciTags = new CITagsProvider().getCiTags(ciInfo);
-    supportedCiProvider = ciProviderInfo.isSupportedCiProvider();
 
     gitDataUploader =
         buildGitDataUploader(

diff --git a/...gent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/...gent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
@@ -210,7 +210,7 @@ private static BuildSystemSession.Factory buildSystemSessionFactory(
           repoServices.repoRoot,
           startCommand,
           startTime,
-          repoServices.supportedCiProvider,
+          repoServices.ciProvider,
           services.config,
           services.metricCollector,
           testModuleRegistry,
@@ -262,7 +262,7 @@ private static TestFrameworkSession.Factory headlessTestFrameworkEssionFactory(
       return new HeadlessTestSession(
           projectName,
           startTime,
-          repoServices.supportedCiProvider,
+          repoServices.ciProvider,
           services.config,
           services.metricCollector,
           testDecorator,
@@ -282,7 +282,7 @@ private static CIVisibility.SessionFactory manualApiSessionFactory(
       return new ManualApiTestSession(
           projectName,
           startTime,
-          repoServices.supportedCiProvider,
+          repoServices.ciProvider,
           services.config,
           services.metricCollector,
           testDecorator,

diff --git a/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java b/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java
@@ -4,6 +4,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -112,4 +113,9 @@ private PersonInfo buildGitCommitAuthor() {
         System.getenv(APPVEYOR_REPO_COMMIT_AUTHOR_NAME),
         System.getenv(APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL));
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.APPVEYOR;
+  }
 }
diff --git a/.../agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java b/.../agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java
@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfo;
 
 class AwsCodePipelineInfo implements CIProviderInfo {
@@ -26,4 +27,9 @@ public CIInfo buildCIInfo() {
             AWS_CODEPIPELINE_ARN)
         .build();
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.AWS;
+  }
 }
diff --git a/...t/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java b/...t/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java
@@ -6,6 +6,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -134,4 +135,9 @@ private PersonInfo buildGitCommitAuthor() {
         System.getenv(AZURE_BUILD_REQUESTED_FOR_ID),
         System.getenv(AZURE_BUILD_REQUESTED_FOR_EMAIL));
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.AZP;
+  }
 }
diff --git a/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java b/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java
@@ -5,6 +5,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.util.Strings;
@@ -75,4 +76,9 @@ private String buildPipelineId() {
     }
     return id;
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.BITBUCKET;
+  }
 }
diff --git a/...va-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java b/...va-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java
@@ -5,6 +5,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -65,4 +66,9 @@ private String buildGitCommit() {
       return System.getenv(BITRISE_GIT_COMMIT);
     }
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.BITRISE;
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java
@@ -4,6 +4,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeBranch;
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -65,4 +66,9 @@ private PersonInfo buildGitCommiter() {
     return new PersonInfo(
         System.getenv(BUDDY_GIT_COMMIT_AUTHOR), System.getenv(BUDDY_GIT_COMMIT_EMAIL));
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.BUDDYCI;
+  }
 }
diff --git a/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java b/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java
@@ -6,6 +6,7 @@
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 import static datadog.trace.util.Strings.toJson;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -84,4 +85,9 @@ private PersonInfo buildGitCommitAuthor() {
     return new PersonInfo(
         System.getenv(BUILDKITE_GIT_AUTHOR_NAME), System.getenv(BUILDKITE_GIT_AUTHOR_EMAIL));
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.BUILDKITE;
+  }
 }
diff --git a/...agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java b/...agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java
@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfo;
 
 public interface CIProviderInfo {
@@ -8,7 +9,5 @@ public interface CIProviderInfo {
 
   CIInfo buildCIInfo();
 
-  default boolean isSupportedCiProvider() {
-    return true;
-  }
+  Provider getProvider();
 }
diff --git a/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java b/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java
@@ -5,6 +5,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 
@@ -55,4 +56,9 @@ private String buildPipelineUrl(final String pipelineId) {
 
     return String.format("https://app.circleci.com/pipelines/workflows/%s", pipelineId);
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.CIRCLECI;
+  }
 }
diff --git a/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java b/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java
@@ -4,6 +4,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeBranch;
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -65,4 +66,9 @@ public CIInfo buildCIInfo() {
         .ciEnvVars(CODEFRESH)
         .build();
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.CODEFRESH;
+  }
 }
diff --git a/...ava-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java b/...ava-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java
@@ -5,6 +5,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.GitUtils;
@@ -78,4 +79,9 @@ private PersonInfo buildGitCommitAuthor() {
     return new PersonInfo(
         personInfo.getName(), personInfo.getEmail(), System.getenv(GITLAB_GIT_COMMIT_TIMESTAMP));
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.GITLAB;
+  }
 }
diff --git a/...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java b/...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
@@ -6,6 +6,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 
@@ -110,4 +111,9 @@ private String buildPipelineUrl(
   private String buildJobUrl(final String host, final String repo, final String commit) {
     return String.format("%s/%s/commit/%s/checks", host, repo, commit);
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.GITHUBACTIONS;
+  }
 }
diff --git a/...va-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java b/...va-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java
@@ -6,6 +6,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.util.Strings;
@@ -137,4 +138,9 @@ private String filterJenkinsJobName(final String jobName, final String gitBranch
       return jobNameParts[0];
     }
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.JENKINS;
+  }
 }
diff --git a/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java b/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java
@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 
@@ -22,4 +23,9 @@ public CIInfo buildCIInfo() {
         .ciJobUrl(System.getenv(BUILD_URL))
         .build();
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.TEAMCITY;
+  }
 }
diff --git a/...ava-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java b/...ava-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java
@@ -4,6 +4,7 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
@@ -81,4 +82,9 @@ private String buildCiPipelineName() {
     }
     return repoSlug;
   }
+
+  @Override
+  public Provider getProvider() {
+    return Provider.TRAVISCI;
+  }
 }
diff --git a/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java b/...-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
@@ -2,6 +2,7 @@
 
 import static datadog.trace.civisibility.utils.FileUtils.findParentPathBackwards;
 
+import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.GitInfo;
 import java.nio.file.Path;
 import org.slf4j.Logger;
@@ -69,7 +70,7 @@ protected Path getCurrentPath() {
   }
 
   @Override
-  public boolean isSupportedCiProvider() {
-    return false;
+  public Provider getProvider() {
+    return Provider.UNSUPPORTED;
   }
 }