Revert "contrib/gin-gonic/gin: correct resource name" (#587)

This reverts commit b12f0fe. With this change, github.com/gin-gonic/[email protected] is no longer supported. That is ok, but we want to cut a version without this fix. This fix will be restored, targeting v1.21.1.
DataDog · Feb 7, 2020 · 476eb07 · 476eb07
1 parent 7704362
commit 476eb07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/contrib/gin-gonic/gin/gintrace_test.go b/contrib/gin-gonic/gin/gintrace_test.go
@@ -76,7 +76,7 @@ func TestTrace200(t *testing.T) {
 	assert.Equal("http.request", span.OperationName())
 	assert.Equal(ext.SpanTypeWeb, span.Tag(ext.SpanType))
 	assert.Equal("foobar", span.Tag(ext.ServiceName))
-	assert.Contains(span.Tag(ext.ResourceName), "GET /user/:id")
+	assert.Contains(span.Tag(ext.ResourceName), "gin.TestTrace200")
 	assert.Equal("200", span.Tag(ext.HTTPCode))
 	assert.Equal("GET", span.Tag(ext.HTTPMethod))
 	// TODO(x) would be much nicer to have "/user/:id" here
@@ -311,7 +311,7 @@ func TestResourceNamerSettings(t *testing.T) {
 		router.GET("/test", func(c *gin.Context) {
 			span, ok := tracer.SpanFromContext(c.Request.Context())
 			assert.True(ok)
-			assert.Equal(span.(mocktracer.Span).Tag(ext.ResourceName), "GET /test")
+			assert.Equal(span.(mocktracer.Span).Tag(ext.ResourceName), c.HandlerName())
 		})
 
 		r := httptest.NewRequest("GET", "/test", nil)

diff --git a/contrib/gin-gonic/gin/option.go b/contrib/gin-gonic/gin/option.go
@@ -59,5 +59,5 @@ func WithResourceNamer(namer func(c *gin.Context) string) Option {
 }
 
 func defaultResourceNamer(c *gin.Context) string {
-	return c.Request.Method + " " + c.FullPath()
+	return c.HandlerName()
 }