ktlo(ddtrace,contrib): don't use hardcoded FS paths on integration/te…

…lemetry tests (#3122)
DataDog · Jan 28, 2025 · 599da51 · 599da51
1 parent ef2e4e2
commit 599da51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/contrib/internal/telemetrytest/telemetry_test.go b/contrib/internal/telemetrytest/telemetry_test.go
@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -87,8 +88,9 @@ func TestTelemetryEnabled(t *testing.T) {
 		if strings.Contains(pkg.ImportPath, "/test") || strings.Contains(pkg.ImportPath, "/internal") || strings.Contains(pkg.ImportPath, "/cmd") {
 			continue
 		}
-		p := strings.Replace(pkg.Dir, pkg.Root, "../..", 1)
-		if strings.Contains(p, "/contrib/net/http/client") || strings.Contains(p, "/contrib/os") {
+		sep := string(os.PathSeparator)
+		p := strings.Replace(pkg.Dir, pkg.Root, filepath.Join("..", ".."), 1)
+		if strings.Contains(p, filepath.Join(sep, "contrib", "net", "http", "client")) || strings.Contains(p, filepath.Join(sep, "contrib", "os")) {
 			continue
 		}
 		if !pkg.hasTelemetryImport(t) {

diff --git a/ddtrace/tracer/option_test.go b/ddtrace/tracer/option_test.go
@@ -346,8 +346,9 @@ func TestIntegrationEnabled(t *testing.T) {
 		if strings.Contains(pkg.ImportPath, "/test") || strings.Contains(pkg.ImportPath, "/internal") || strings.Contains(pkg.ImportPath, "/cmd") {
 			continue
 		}
-		p := strings.Replace(pkg.Dir, pkg.Root, "../..", 1)
-		if strings.Contains(p, "/contrib/net/http/client") || strings.Contains(p, "/contrib/os") {
+		sep := string(os.PathSeparator)
+		p := strings.Replace(pkg.Dir, pkg.Root, filepath.Join("..", ".."), 1)
+		if strings.Contains(p, filepath.Join(sep, "contrib", "net", "http", "client")) || strings.Contains(p, filepath.Join(sep, "contrib", "os")) {
 			continue
 		}
 		body, err := exec.Command("grep", "-rl", "MarkIntegrationImported", p).Output()