Add git repository and sha in RC request tags

jpbempel · jpbempel · commit fe96bf29225e · 2023-11-03T14:34:20.000+01:00
Send git repository url and git commit sha as tags on each Remote
Config request
diff --git a/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java b/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
@@ -5,6 +5,9 @@
 import datadog.remoteconfig.tuf.RemoteConfigRequest.CachedTargetFile;
 import datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.ClientState;
 import datadog.trace.api.Config;
+import datadog.trace.api.git.GitInfo;
+import datadog.trace.api.git.GitInfoProvider;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.util.TagsHelper;
 import java.util.Arrays;
 import java.util.Collection;
@@ -126,6 +129,15 @@ private List<String> buildRequestTags() {
         Config.get().getGlobalTags().entrySet().stream()
             .map(entry -> entry.getKey() + ":" + entry.getValue())
             .collect(Collectors.toList());
+    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+    String repositoryURL = gitInfo.getRepositoryURL();
+    if (repositoryURL != null) {
+      tags.add(Tags.GIT_REPOSITORY_URL + ":" + repositoryURL);
+    }
+    String sha = gitInfo.getCommit().getSha();
+    if (sha != null) {
+      tags.add(Tags.GIT_COMMIT_SHA + ":" + sha);
+    }
     tags.addAll(
         Arrays.asList(
             "env:" + this.env,
diff --git a/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java b/remote-config/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
@@ -207,6 +207,10 @@ public String getServiceEnv() {
       public String getServiceVersion() {
         return this.serviceVersion;
       }
+
+      public List<String> getTags() {
+        return tags;
+      }
     }
 
     private static class AgentInfo {
diff --git a/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy b/remote-config/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy
@@ -1,6 +1,7 @@
 package datadog.remoteconfig
 
 import datadog.remoteconfig.tuf.RemoteConfigRequest
+import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.test.util.DDSpecification
 import datadog.trace.api.Config
 
@@ -15,6 +16,7 @@ class PollerRequestFactoryTest extends DDSpecification {
     System.setProperty("dd.service", "Service Name")
     System.setProperty("dd.env", "PROD")
     System.setProperty("dd.tags", "version:1.0.0-SNAPSHOT")
+    System.setProperty("dd.trace.global.tags", Tags.GIT_REPOSITORY_URL+":https://github.com/DataDog/dd-trace-java,"+Tags.GIT_COMMIT_SHA + ":1234")
     rebuildConfig()
     PollerRequestFactory factory = new PollerRequestFactory(Config.get(), TRACER_VERSION, CONTAINER_ID, INVALID_REMOTE_CONFIG_URL, null)
 
@@ -25,5 +27,8 @@ class PollerRequestFactoryTest extends DDSpecification {
     request.client.tracerInfo.serviceName == "service_name"
     request.client.tracerInfo.serviceEnv == "prod"
     request.client.tracerInfo.serviceVersion == "1.0.0-snapshot"
+    request.client.tracerInfo.tags.contains("env:PROD")
+    request.client.tracerInfo.tags.contains(Tags.GIT_REPOSITORY_URL + ":https://github.com/DataDog/dd-trace-java")
+    request.client.tracerInfo.tags.contains(Tags.GIT_COMMIT_SHA + ":1234")
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,10 @@ public String getServiceEnv() {`
`207`	`207`	`public String getServiceVersion() {`
`208`	`208`	`return this.serviceVersion;`
`209`	`209`	`}`
	`210`	`+`
	`211`	`+ public List<String> getTags() {`
	`212`	`+ return tags;`
	`213`	`+ }`
`210`	`214`	`}`
`211`	`215`
`212`	`216`	`private static class AgentInfo {`