add unit tests and take into account root path

daniel-mohedano · daniel-mohedano · commit de21bd10c227 · 2025-05-09T13:10:40.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java b/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,14 +209,20 @@ public String getCiJobUrl() {
     return ciJobUrl;
   }
 
-  /** @return Workspace path without the trailing separator */
-  public String getCiWorkspace() {
-    String realCiWorkspace = FileUtils.toRealPath(ciWorkspace);
-    return (realCiWorkspace == null || !realCiWorkspace.endsWith(File.separator))
+  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));
   }
 
+  /** @return Workspace path without the trailing separator */
+  public String getCiWorkspace() {
+    return ciWorkspace;
+  }
+
   public String getCiNodeName() {
     return ciNodeName;
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CIInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CIInfoTest.groovy
@@ -0,0 +1,22 @@
+package datadog.trace.civisibility.ci
+
+
+import spock.lang.Specification
+
+class CIInfoTest extends Specification {
+
+  def "test ci workspace is correctly sanitized #iterationIndex"() {
+    def builder = CIInfo.builder(null)
+    builder.ciWorkspace(workspacePath)
+    def info = builder.build()
+
+    info.ciWorkspace == sanitizedPath
+
+    where:
+    workspacePath | sanitizedPath
+    null          | null
+    "/"           | "/"
+    "/repo/path"  | "/repo/path"
+    "/repo/path/" | "/repo/path"
+  }
+}
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java b/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java
@@ -56,7 +56,6 @@ public GitInfo getGitInfo(@Nullable String repositoryPath) {
       repositoryPath = NULL_PATH_STRING;
     }
 
-    // normalize path to avoid creating two entries in the cache
     return gitInfoCache.computeIfAbsent(repositoryPath, this::buildGitInfo);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public GitInfo getGitInfo(@Nullable String repositoryPath) {`
`56`	`56`	`repositoryPath = NULL_PATH_STRING;`
`57`	`57`	`}`
`58`	`58`
`59`		`- // normalize path to avoid creating two entries in the cache`
`60`	`59`	`return gitInfoCache.computeIfAbsent(repositoryPath, this::buildGitInfo);`
`61`	`60`	`}`
`62`	`61`