contrib/envoyproxy: fix resource name (#3047)

DataDog · Jan 6, 2025 · 89bfc59 · 89bfc59
1 parent 2031791
commit 89bfc59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/contrib/envoyproxy/go-control-plane/envoy.go b/contrib/envoyproxy/go-control-plane/envoy.go
@@ -11,6 +11,7 @@ import (
 	"io"
 	"math"
 	"net/http"
+	"path"
 	"strings"
 
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
@@ -203,6 +204,7 @@ func processRequestHeaders(ctx context.Context, req *envoyextproc.ProcessingRequ
 	var blocked bool
 	fakeResponseWriter := newFakeResponseWriter()
 	wrappedResponseWriter, request, afterHandle, blocked := httptrace.BeforeHandle(&httptrace.ServeConfig{
+		Resource: request.Method + " " + path.Clean(request.URL.Path),
 		SpanOpts: []tracer.StartSpanOption{
 			tracer.Tag(ext.SpanKind, ext.SpanKindServer),
 			tracer.Tag(ext.Component, componentName),

diff --git a/contrib/envoyproxy/go-control-plane/envoy_test.go b/contrib/envoyproxy/go-control-plane/envoy_test.go
@@ -252,7 +252,7 @@ func TestGeneratedSpan(t *testing.T) {
 		stream, err := client.Process(ctx)
 		require.NoError(t, err)
 
-		end2EndStreamRequest(t, stream, "/resource-span", "GET", map[string]string{"user-agent": "Mistake Not...", "test-key": "test-value"}, map[string]string{"response-test-key": "response-test-value"}, false)
+		end2EndStreamRequest(t, stream, "/../../../resource-span/.?id=test", "GET", map[string]string{"user-agent": "Mistake Not...", "test-key": "test-value"}, map[string]string{"response-test-key": "response-test-value"}, false)
 
 		err = stream.CloseSend()
 		require.NoError(t, err)
@@ -264,10 +264,10 @@ func TestGeneratedSpan(t *testing.T) {
 		// Check for tags
 		span := finished[0]
 		require.Equal(t, "http.request", span.OperationName())
-		require.Equal(t, "https://datadoghq.com/resource-span", span.Tag("http.url"))
+		require.Equal(t, "https://datadoghq.com/../../../resource-span/.?id=test", span.Tag("http.url"))
 		require.Equal(t, "GET", span.Tag("http.method"))
 		require.Equal(t, "datadoghq.com", span.Tag("http.host"))
-		//		require.Equal(t, "GET /resource-span", span.Tag("resource.name"))
+		require.Equal(t, "GET /resource-span", span.Tag("resource.name"))
 		require.Equal(t, "server", span.Tag("span.kind"))
 		require.Equal(t, "Mistake Not...", span.Tag("http.useragent"))
 	})