From 96f5585fccda6f3c78d0b8cfb49c838f0eca0d76 Mon Sep 17 00:00:00 2001
From: Zarir Hamza <zarir.hamza@datadoghq.com>
Date: Wed, 16 Nov 2022 15:49:57 -0500
Subject: [PATCH] contrib: nit changes for PR

---
 contrib/aws/aws-sdk-go-v2/aws/aws.go                | 2 +-
 contrib/aws/aws-sdk-go-v2/aws/aws_test.go           | 2 +-
 contrib/globalsign/mgo/mgo_test.go                  | 3 ---
 contrib/google.golang.org/grpc/grpc_test.go         | 2 --
 contrib/hashicorp/vault/vault_test.go               | 1 -
 contrib/julienschmidt/httprouter/httprouter_test.go | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/contrib/aws/aws-sdk-go-v2/aws/aws.go b/contrib/aws/aws-sdk-go-v2/aws/aws.go
index 78c4716609..503311c15c 100644
--- a/contrib/aws/aws-sdk-go-v2/aws/aws.go
+++ b/contrib/aws/aws-sdk-go-v2/aws/aws.go
@@ -78,7 +78,7 @@ func (mw *traceMiddleware) startTraceMiddleware(stack *middleware.Stack) error {
 			tracer.Tag(tagAWSOperation, operation),
 			tracer.Tag(tagAWSService, serviceID),
 			tracer.StartTime(ctx.Value(spanTimestampKey{}).(time.Time)),
-			tracer.Tag(ext.Component, "aws/aws-sdk-go/aws"),
+			tracer.Tag(ext.Component, "aws/aws-sdk-go-v2/aws"),
 			tracer.Tag(ext.SpanKind, ext.SpanKindClient),
 		}
 		if !math.IsNaN(mw.cfg.analyticsRate) {
diff --git a/contrib/aws/aws-sdk-go-v2/aws/aws_test.go b/contrib/aws/aws-sdk-go-v2/aws/aws_test.go
index a2ef66ee6b..c654b94998 100644
--- a/contrib/aws/aws-sdk-go-v2/aws/aws_test.go
+++ b/contrib/aws/aws-sdk-go-v2/aws/aws_test.go
@@ -79,7 +79,7 @@ func TestAppendMiddleware(t *testing.T) {
 			}
 			assert.Equal(t, "POST", s.Tag(ext.HTTPMethod))
 			assert.Equal(t, server.URL+"/", s.Tag(ext.HTTPURL))
-			assert.Equal(t, "aws/aws-sdk-go/aws", s.Tag(ext.Component))
+			assert.Equal(t, "aws/aws-sdk-go-v2/aws", s.Tag(ext.Component))
 			assert.Equal(t, ext.SpanKindClient, s.Tag(ext.SpanKind))
 		})
 	}
diff --git a/contrib/globalsign/mgo/mgo_test.go b/contrib/globalsign/mgo/mgo_test.go
index 8d9222fbac..ae647a5e88 100644
--- a/contrib/globalsign/mgo/mgo_test.go
+++ b/contrib/globalsign/mgo/mgo_test.go
@@ -136,7 +136,6 @@ func TestCollection_Update(t *testing.T) {
 	assert.Equal(3, len(spans))
 	assert.Equal("mongodb.query", spans[1].OperationName())
 	assert.Equal(ext.SpanKindClient, spans[1].Tag(ext.SpanKind))
-
 }
 
 func TestCollection_UpdateId(t *testing.T) {
@@ -210,7 +209,6 @@ func TestCollection_Upsert(t *testing.T) {
 	assert.Equal(6, len(spans))
 	assert.Equal("mongodb.query", spans[1].OperationName())
 	assert.Equal("mongodb.query", spans[4].OperationName())
-
 }
 
 func TestCollection_UpdateAll(t *testing.T) {
@@ -253,7 +251,6 @@ func TestCollection_FindId(t *testing.T) {
 
 	spans := testMongoCollectionCommand(assert, insert)
 	assert.Equal(6, len(spans))
-
 }
 
 func TestCollection_Remove(t *testing.T) {
diff --git a/contrib/google.golang.org/grpc/grpc_test.go b/contrib/google.golang.org/grpc/grpc_test.go
index fe37343e74..e6a3f9c4a3 100644
--- a/contrib/google.golang.org/grpc/grpc_test.go
+++ b/contrib/google.golang.org/grpc/grpc_test.go
@@ -145,8 +145,6 @@ func TestStreaming(t *testing.T) {
 		}
 		assert.NotNil(t, rootSpan)
 		for _, span := range spans {
-			//assert.Equal(t, 1, 2,
-			//	"expected span to to have its trace id set to the root trace id %v", span)
 			if span != rootSpan {
 				assert.Equal(t, rootSpan.TraceID(), span.TraceID(),
 					"expected span to to have its trace id set to the root trace id (%d): %v",
diff --git a/contrib/hashicorp/vault/vault_test.go b/contrib/hashicorp/vault/vault_test.go
index 7d2613c1a4..66e0ea2043 100644
--- a/contrib/hashicorp/vault/vault_test.go
+++ b/contrib/hashicorp/vault/vault_test.go
@@ -136,7 +136,6 @@ func testMountReadWrite(c *api.Client, t *testing.T) {
 		assert.Nil(span.Tag("vault.namespace"))
 		assert.Equal("hashicorp/vault", span.Tag(ext.Component))
 		assert.Equal(ext.SpanKindClient, span.Tag(ext.SpanKind))
-
 	})
 
 	t.Run("write", func(t *testing.T) {
diff --git a/contrib/julienschmidt/httprouter/httprouter_test.go b/contrib/julienschmidt/httprouter/httprouter_test.go
index 3b71e266bf..760642b971 100644
--- a/contrib/julienschmidt/httprouter/httprouter_test.go
+++ b/contrib/julienschmidt/httprouter/httprouter_test.go
@@ -46,7 +46,6 @@ func TestHttpTracer200(t *testing.T) {
 	assert.Equal(nil, s.Tag(ext.Error))
 	assert.Equal("julienschmidt/httprouter", s.Tag(ext.Component))
 	assert.Equal(ext.SpanKindServer, s.Tag(ext.SpanKind))
-
 }
 
 func TestHttpTracer500(t *testing.T) {