General tag changes

contrib/99designs/gqlgen/tracer.go

@@ -90,6 +90,8 @@ func (t *gqlTracer) InterceptResponse(ctx context.Context, next graphql.Response
 	opts := []ddtrace.StartSpanOption{
 		tracer.SpanType(ext.SpanTypeGraphQL),
 		tracer.ServiceName(t.cfg.serviceName),
+		tracer.Tag(ext.Component, "gqlgen"),
+		tracer.Tag(ext.SpanKind, "server"),
 	}
 	if !math.IsNaN(t.cfg.analyticsRate) {
 		opts = append(opts, tracer.Tag(ext.EventSampleRate, t.cfg.analyticsRate))
@@ -136,6 +138,7 @@ func (t *gqlTracer) InterceptResponse(ctx context.Context, next graphql.Response
 			var childOpts []ddtrace.StartSpanOption
 			childOpts = append(childOpts, tracer.StartTime(start))
 			childOpts = append(childOpts, tracer.ResourceName(name))
+			childOpts = append(childOpts, tracer.Tag(ext.Component, "gqlgen"))
 			var childSpan ddtrace.Span
 			childSpan, _ = tracer.StartSpanFromContext(ctx, name, childOpts...)
 			childSpan.Finish(tracer.FinishTime(finish))

contrib/99designs/gqlgen/tracer_test.go

@@ -30,6 +30,8 @@ func TestOptions(t *testing.T) {
 				assert.Equal(query, root.Tag(ext.ResourceName))
 				assert.Equal(defaultServiceName, root.Tag(ext.ServiceName))
 				assert.Equal(ext.SpanTypeGraphQL, root.Tag(ext.SpanType))
+				assert.Equal("gqlgen", root.Tag("component"))
+				assert.Equal("server", root.Tag("span.kind"))
 				assert.Nil(root.Tag(ext.EventSampleRate))
 			},
 		},
@@ -140,6 +142,11 @@ func TestChildSpans(t *testing.T) {
 	for _, span := range allSpans {
 		if span.ParentID() == 0 {
 			root = span
+			assert.Equal("gqlgen", span.Tag("component"))
+			assert.Equal("server", span.Tag("span.kind"))
+		} else {
+			assert.Equal("gqlgen", span.Tag("component"))
+			assert.Equal(nil, span.Tag("span.kind")) //no tag implies internal
 		}
 		resNames = append(resNames, span.Tag(ext.ResourceName).(string))
 		opNames = append(opNames, span.OperationName())

contrib/aws/aws-sdk-go-v2/aws/aws.go

@@ -78,6 +78,8 @@ 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.SpanKind, "client"),
+			tracer.Tag(ext.Component, "aws-sdk-go-v2"),
 		}
 		if !math.IsNaN(mw.cfg.analyticsRate) {
 			opts = append(opts, tracer.Tag(ext.EventSampleRate, mw.cfg.analyticsRate))

contrib/aws/aws-sdk-go-v2/aws/aws_test.go

@@ -79,6 +79,8 @@ 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-sdk-go-v2", s.Tag("component"))
+			assert.Equal(t, "client", s.Tag("span.kind"))
 		})
 	}
 }

contrib/aws/aws-sdk-go/aws/aws.go

@@ -69,6 +69,8 @@ func (h *handlers) Send(req *request.Request) {
 		tracer.Tag(tagAWSRegion, h.awsRegion(req)),
 		tracer.Tag(ext.HTTPMethod, req.Operation.HTTPMethod),
 		tracer.Tag(ext.HTTPURL, req.HTTPRequest.URL.String()),
+		tracer.Tag(ext.SpanKind, "client"),
+		tracer.Tag(ext.Component, "aws-sdk-go"),
 	}
 	if !math.IsNaN(h.cfg.analyticsRate) {
 		opts = append(opts, tracer.Tag(ext.EventSampleRate, h.cfg.analyticsRate))

contrib/aws/aws-sdk-go/aws/aws_test.go

@@ -57,6 +57,8 @@ func TestAWS(t *testing.T) {
 		assert.Equal(t, "403", s.Tag(ext.HTTPCode))
 		assert.Equal(t, "PUT", s.Tag(ext.HTTPMethod))
 		assert.Equal(t, "http://s3.us-west-2.amazonaws.com/BUCKET", s.Tag(ext.HTTPURL))
+		assert.Equal(t, "aws-sdk-go", s.Tag("component"))
+		assert.Equal(t, "client", s.Tag("span.kind"))
 		assert.NotNil(t, s.Tag(tagAWSRequestID))
 	})
 
@@ -83,6 +85,8 @@ func TestAWS(t *testing.T) {
 		assert.Equal(t, "400", s.Tag(ext.HTTPCode))
 		assert.Equal(t, "POST", s.Tag(ext.HTTPMethod))
 		assert.Equal(t, "http://ec2.us-west-2.amazonaws.com/", s.Tag(ext.HTTPURL))
+		assert.Equal(t, "aws-sdk-go", s.Tag("component"))
+		assert.Equal(t, "client", s.Tag("span.kind"))
 	})
 }
 

contrib/cloud.google.com/go/pubsub.v1/pubsub.go

@@ -34,6 +34,8 @@ func Publish(ctx context.Context, t *pubsub.Topic, msg *pubsub.Message, opts ...
 		tracer.SpanType(ext.SpanTypeMessageProducer),
 		tracer.Tag("message_size", len(msg.Data)),
 		tracer.Tag("ordering_key", msg.OrderingKey),
+		tracer.Tag(ext.Component, "google-cloud-go/pubsub"),
+		tracer.Tag(ext.SpanKind, "producer"),
 	}
 	if cfg.serviceName != "" {
 		spanOpts = append(spanOpts, tracer.ServiceName(cfg.serviceName))
@@ -96,6 +98,8 @@ func WrapReceiveHandler(s *pubsub.Subscription, f func(context.Context, *pubsub.
 			tracer.Tag("ordering_key", msg.OrderingKey),
 			tracer.Tag("message_id", msg.ID),
 			tracer.Tag("publish_time", msg.PublishTime.String()),
+			tracer.Tag(ext.Component, "google-cloud-go/pubsub"),
+			tracer.Tag(ext.SpanKind, "consumer"),
 			tracer.ChildOf(parentSpanCtx),
 		}
 		if cfg.serviceName != "" {

contrib/cloud.google.com/go/pubsub.v1/pubsub_test.go

@@ -70,6 +70,8 @@ func TestPropagation(t *testing.T) {
 		ext.SpanType:     ext.SpanTypeMessageProducer,
 		"server_id":      srvID,
 		ext.ServiceName:  nil,
+		"component":      "google-cloud-go/pubsub",
+		"span.kind":      "producer",
 	}, spans[0].Tags())
 
 	assert.Equal(spans[0].SpanID(), spans[2].ParentID())
@@ -83,6 +85,8 @@ func TestPropagation(t *testing.T) {
 		ext.SpanType:     ext.SpanTypeMessageConsumer,
 		"message_id":     msgID,
 		"publish_time":   pubTime,
+		"component":      "google-cloud-go/pubsub",
+		"span.kind":      "consumer",
 	}, spans[2].Tags())
 }
 
@@ -155,6 +159,8 @@ func TestPropagationNoParentSpan(t *testing.T) {
 		ext.ResourceName: "projects/project/topics/topic",
 		ext.SpanType:     ext.SpanTypeMessageProducer,
 		"server_id":      srvID,
+		"component":      "google-cloud-go/pubsub",
+		"span.kind":      "producer",
 	}, spans[0].Tags())
 
 	assert.Equal(spans[0].SpanID(), spans[1].ParentID())
@@ -168,6 +174,8 @@ func TestPropagationNoParentSpan(t *testing.T) {
 		ext.SpanType:     ext.SpanTypeMessageConsumer,
 		"message_id":     msgID,
 		"publish_time":   pubTime,
+		"component":      "google-cloud-go/pubsub",
+		"span.kind":      "consumer",
 	}, spans[1].Tags())
 }
 
@@ -218,6 +226,8 @@ func TestPropagationNoPubsliherSpan(t *testing.T) {
 		ext.SpanType:     ext.SpanTypeMessageConsumer,
 		"message_id":     msgID,
 		"publish_time":   pubTime,
+		"component":      "google-cloud-go/pubsub",
+		"span.kind":      "consumer",
 	}, spans[0].Tags())
 }
 

contrib/confluentinc/confluent-kafka-go/kafka/kafka.go

@@ -96,6 +96,8 @@ func (c *Consumer) startSpan(msg *kafka.Message) ddtrace.Span {
 		tracer.SpanType(ext.SpanTypeMessageConsumer),
 		tracer.Tag("partition", msg.TopicPartition.Partition),
 		tracer.Tag("offset", msg.TopicPartition.Offset),
+		tracer.Tag(ext.Component, "confluent-kafka-go"),
+		tracer.Tag(ext.SpanKind, "consumer"),
 		tracer.Measured(),
 	}
 	if c.cfg.tagFns != nil {
@@ -205,6 +207,8 @@ func (p *Producer) startSpan(msg *kafka.Message) ddtrace.Span {
 		tracer.ServiceName(p.cfg.producerServiceName),
 		tracer.ResourceName("Produce Topic " + *msg.TopicPartition.Topic),
 		tracer.SpanType(ext.SpanTypeMessageProducer),
+		tracer.Tag(ext.Component, "confluent-kafka-go"),
+		tracer.Tag(ext.SpanKind, "producer"),
 		tracer.Tag("partition", msg.TopicPartition.Partition),
 	}
 	if !math.IsNaN(p.cfg.analyticsRate) {

contrib/confluentinc/confluent-kafka-go/kafka/kafka_test.go

@@ -85,6 +85,8 @@ func TestConsumerChannel(t *testing.T) {
 		assert.Equal(t, int32(1), s.Tag("partition"))
 		assert.Equal(t, 0.3, s.Tag(ext.EventSampleRate))
 		assert.Equal(t, kafka.Offset(i+1), s.Tag("offset"))
+		assert.Equal(t, "confluent-kafka-go", s.Tag("component"))
+		assert.Equal(t, "consumer", s.Tag("span.kind"))
 	}
 }
 
@@ -198,6 +200,8 @@ func TestConsumerFunctional(t *testing.T) {
 			assert.Equal(t, 0.1, s0.Tag(ext.EventSampleRate))
 			assert.Equal(t, "queue", s0.Tag(ext.SpanType))
 			assert.Equal(t, int32(0), s0.Tag("partition"))
+			assert.Equal(t, "confluent-kafka-go", s0.Tag("component"))
+			assert.Equal(t, "producer", s0.Tag("span.kind"))
 
 			s1 := spans[1] // consume
 			assert.Equal(t, "kafka.consume", s1.OperationName())
@@ -206,6 +210,8 @@ func TestConsumerFunctional(t *testing.T) {
 			assert.Equal(t, nil, s1.Tag(ext.EventSampleRate))
 			assert.Equal(t, "queue", s1.Tag(ext.SpanType))
 			assert.Equal(t, int32(0), s1.Tag("partition"))
+			assert.Equal(t, "confluent-kafka-go", s1.Tag("component"))
+			assert.Equal(t, "consumer", s1.Tag("span.kind"))
 		})
 	}
 }

contrib/elastic/go-elasticsearch.v6/elastictrace.go

@@ -57,6 +57,8 @@ func (t *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 		tracer.Tag("elasticsearch.method", method),
 		tracer.Tag("elasticsearch.url", url),
 		tracer.Tag("elasticsearch.params", req.URL.Query().Encode()),
+		tracer.Tag(ext.Component, "go-elasticsearch"),
+		tracer.Tag(ext.SpanKind, "client"),
 	}
 	if !math.IsNaN(t.config.analyticsRate) {
 		opts = append(opts, tracer.Tag(ext.EventSampleRate, t.config.analyticsRate))

contrib/elastic/go-elasticsearch.v6/elastictrace_test.go

@@ -42,6 +42,8 @@ func checkPUTTrace(assert *assert.Assertions, mt mocktracer.Tracer) {
 	assert.Equal("/twitter/tweet/1", span.Tag("elasticsearch.url"))
 	assert.Equal("PUT", span.Tag("elasticsearch.method"))
 	assert.Equal(`{"user": "test", "message": "hello"}`, span.Tag("elasticsearch.body"))
+	assert.Equal("go-elasticsearch", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func checkGETTrace(assert *assert.Assertions, mt mocktracer.Tracer) {
@@ -50,6 +52,8 @@ func checkGETTrace(assert *assert.Assertions, mt mocktracer.Tracer) {
 	assert.Equal("GET /twitter/tweet/?", span.Tag(ext.ResourceName))
 	assert.Equal("/twitter/tweet/1", span.Tag("elasticsearch.url"))
 	assert.Equal("GET", span.Tag("elasticsearch.method"))
+	assert.Equal("go-elasticsearch", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func checkErrTrace(assert *assert.Assertions, mt mocktracer.Tracer) {
@@ -59,6 +63,8 @@ func checkErrTrace(assert *assert.Assertions, mt mocktracer.Tracer) {
 	assert.Equal("/not-real-index/_doc/1", span.Tag("elasticsearch.url"))
 	assert.NotEmpty(span.Tag(ext.Error))
 	assert.Equal("*errors.errorString", fmt.Sprintf("%T", span.Tag(ext.Error).(error)))
+	assert.Equal("go-elasticsearch", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestQuantize(t *testing.T) {

contrib/go-redis/redis.v7/redis.go

@@ -108,6 +108,8 @@ func (ddh *datadogHook) BeforeProcess(ctx context.Context, cmd redis.Cmder) (con
 		tracer.ResourceName(parts[0]),
 		tracer.Tag("redis.raw_command", raw),
 		tracer.Tag("redis.args_length", strconv.Itoa(length)),
+		tracer.Tag(ext.Component, "go-redis"),
+		tracer.Tag(ext.SpanKind, "client"),
 	}
 	opts = append(opts, ddh.additionalTags...)
 	if !math.IsNaN(p.config.analyticsRate) {
@@ -142,6 +144,8 @@ func (ddh *datadogHook) BeforeProcessPipeline(ctx context.Context, cmds []redis.
 		tracer.Tag("redis.args_length", strconv.Itoa(length)),
 		tracer.Tag(ext.ResourceName, raw),
 		tracer.Tag("redis.pipeline_length", strconv.Itoa(len(cmds))),
+		tracer.Tag(ext.Component, "go-redis"),
+		tracer.Tag(ext.SpanKind, "client"),
 	}
 	opts = append(opts, ddh.additionalTags...)
 	if !math.IsNaN(p.config.analyticsRate) {

contrib/go-redis/redis.v7/redis_test.go

@@ -59,6 +59,8 @@ func TestClientEvalSha(t *testing.T) {
 	assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("evalsha", span.Tag(ext.ResourceName))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestClient(t *testing.T) {
@@ -81,6 +83,8 @@ func TestClient(t *testing.T) {
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("set test_key test_value: ", span.Tag("redis.raw_command"))
 	assert.Equal("3", span.Tag("redis.args_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestWrapClient(t *testing.T) {
@@ -138,6 +142,8 @@ func TestWrapClient(t *testing.T) {
 			assert.Equal("my-redis", span.Tag(ext.ServiceName))
 			assert.Equal("set test_key test_value: ", span.Tag("redis.raw_command"))
 			assert.Equal("3", span.Tag("redis.args_length"))
+			assert.Equal("go-redis", span.Tag("component"))
+			assert.Equal("client", span.Tag("span.kind"))
 		})
 	}
 }
@@ -225,6 +231,8 @@ func TestPipeline(t *testing.T) {
 	assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("1", span.Tag("redis.pipeline_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 
 	mt.Reset()
 	pipeline.Expire("pipeline_counter", time.Hour)
@@ -242,6 +250,8 @@ func TestPipeline(t *testing.T) {
 	assert.Equal("my-redis", span.Tag(ext.ServiceName))
 	assert.Equal("expire pipeline_counter 3600: false\nexpire pipeline_counter_1 60: false\n", span.Tag(ext.ResourceName))
 	assert.Equal("2", span.Tag("redis.pipeline_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestChildSpan(t *testing.T) {
@@ -323,6 +333,8 @@ func TestError(t *testing.T) {
 		assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 		assert.Equal("6378", span.Tag(ext.TargetPort))
 		assert.Equal("get key: ", span.Tag("redis.raw_command"))
+		assert.Equal("go-redis", span.Tag("component"))
+		assert.Equal("client", span.Tag("span.kind"))
 	})
 
 	t.Run("nil", func(t *testing.T) {
@@ -344,6 +356,8 @@ func TestError(t *testing.T) {
 		assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 		assert.Equal("6379", span.Tag(ext.TargetPort))
 		assert.Equal("get non_existent_key: ", span.Tag("redis.raw_command"))
+		assert.Equal("go-redis", span.Tag("component"))
+		assert.Equal("client", span.Tag("span.kind"))
 	})
 }
 func TestAnalyticsSettings(t *testing.T) {

contrib/go-redis/redis.v8/redis.go

@@ -108,6 +108,8 @@ func (ddh *datadogHook) BeforeProcess(ctx context.Context, cmd redis.Cmder) (con
 		tracer.ServiceName(p.config.serviceName),
 		tracer.ResourceName(raw[:strings.IndexByte(raw, ' ')]),
 		tracer.Tag("redis.args_length", strconv.Itoa(length)),
+		tracer.Tag(ext.Component, "go-redis"),
+		tracer.Tag(ext.SpanKind, "client"),
 	)
 	if !p.config.skipRaw {
 		opts = append(opts, tracer.Tag("redis.raw_command", raw))
@@ -143,6 +145,8 @@ func (ddh *datadogHook) BeforeProcessPipeline(ctx context.Context, cmds []redis.
 		tracer.ResourceName(raw[:strings.IndexByte(raw, ' ')]),
 		tracer.Tag("redis.args_length", strconv.Itoa(length)),
 		tracer.Tag("redis.pipeline_length", strconv.Itoa(len(cmds))),
+		tracer.Tag(ext.Component, "go-redis"),
+		tracer.Tag(ext.SpanKind, "client"),
 	)
 	if !p.config.skipRaw {
 		opts = append(opts, tracer.Tag("redis.raw_command", raw))

contrib/go-redis/redis.v8/redis_test.go

@@ -105,6 +105,8 @@ func TestClientEvalSha(t *testing.T) {
 	assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("evalsha", span.Tag(ext.ResourceName))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestClient(t *testing.T) {
@@ -128,6 +130,8 @@ func TestClient(t *testing.T) {
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("set test_key test_value: ", span.Tag("redis.raw_command"))
 	assert.Equal("3", span.Tag("redis.args_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestWrapClient(t *testing.T) {
@@ -186,6 +190,8 @@ func TestWrapClient(t *testing.T) {
 			assert.Equal("my-redis", span.Tag(ext.ServiceName))
 			assert.Equal("set test_key test_value: ", span.Tag("redis.raw_command"))
 			assert.Equal("3", span.Tag("redis.args_length"))
+			assert.Equal("go-redis", span.Tag("component"))
+			assert.Equal("client", span.Tag("span.kind"))
 		})
 	}
 }
@@ -274,6 +280,8 @@ func TestPipeline(t *testing.T) {
 	assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 	assert.Equal("6379", span.Tag(ext.TargetPort))
 	assert.Equal("1", span.Tag("redis.pipeline_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 
 	mt.Reset()
 	pipeline.Expire(ctx, "pipeline_counter", time.Hour)
@@ -291,6 +299,8 @@ func TestPipeline(t *testing.T) {
 	assert.Equal("my-redis", span.Tag(ext.ServiceName))
 	assert.Equal("expire", span.Tag(ext.ResourceName))
 	assert.Equal("2", span.Tag("redis.pipeline_length"))
+	assert.Equal("go-redis", span.Tag("component"))
+	assert.Equal("client", span.Tag("span.kind"))
 }
 
 func TestChildSpan(t *testing.T) {
@@ -376,6 +386,8 @@ func TestError(t *testing.T) {
 		assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 		assert.Equal("6378", span.Tag(ext.TargetPort))
 		assert.Equal("get key: ", span.Tag("redis.raw_command"))
+		assert.Equal("go-redis", span.Tag("component"))
+		assert.Equal("client", span.Tag("span.kind"))
 	})
 
 	t.Run("nil", func(t *testing.T) {
@@ -398,6 +410,8 @@ func TestError(t *testing.T) {
 		assert.Equal("127.0.0.1", span.Tag(ext.TargetHost))
 		assert.Equal("6379", span.Tag(ext.TargetPort))
 		assert.Equal("get non_existent_key: ", span.Tag("redis.raw_command"))
+		assert.Equal("go-redis", span.Tag("component"))
+		assert.Equal("client", span.Tag("span.kind"))
 	})
 }
 func TestAnalyticsSettings(t *testing.T) {