From 599da514f0e5e2bedf1d44cac0bed702c986879f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Tue, 28 Jan 2025 09:24:43 +0100 Subject: [PATCH] ktlo(ddtrace,contrib): don't use hardcoded FS paths on integration/telemetry tests (#3122) --- contrib/internal/telemetrytest/telemetry_test.go | 6 ++++-- ddtrace/tracer/option_test.go | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/internal/telemetrytest/telemetry_test.go b/contrib/internal/telemetrytest/telemetry_test.go index 8e2f130343..123b2a73ca 100644 --- 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 index 9a5c6ee9dd..f8a1c41461 100644 --- 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()