[receiver/datadog] Add support for HTTP tags

Author: xiu

receiver/datadogreceiver/internal/translator/tags.go

@@ -50,6 +50,19 @@ var datadogKnownResourceAttributes = map[string]string{
 	"kube_namespace":      semconv.AttributeK8SNamespaceName,
 	"pod_name":            semconv.AttributeK8SPodName,
 
+	// HTTP
+	"http.client_ip":               semconv.AttributeClientAddress,
+	"http.response.content_length": semconv.AttributeHTTPResponseBodySize,
+	"http.status_code":             semconv.AttributeHTTPResponseStatusCode,
+	"http.request.content_length":  semconv.AttributeHTTPRequestBodySize,
+	"http.referer":                 "http.request.header.referer",
+	"http.method":                  semconv.AttributeHTTPRequestMethod,
+	"http.route":                   semconv.AttributeHTTPRoute,
+	"http.version":                 semconv.AttributeNetworkProtocolVersion,
+	"http.server_name":             semconv.AttributeServerAddress,
+	"http.url":                     semconv.AttributeURLFull,
+	"http.useragent":               semconv.AttributeUserAgentOriginal,
+
 	// Other
 	"process_id":       semconv.AttributeProcessPID,
 	"error.stacktrace": semconv.AttributeExceptionStacktrace,
@@ -80,6 +93,15 @@ func translateDatadogKeyToOTel(k string) string {
 	if otelKey, ok := datadogKnownResourceAttributes[strings.ToLower(k)]; ok {
 		return otelKey
 	}
+
+	// HTTP dynamic attributes
+	if strings.HasPrefix(k, "http.response.headers.") { // type: string[]
+		header := strings.TrimPrefix(k, "http.response.headers.")
+		return "http.response.header." + header
+	} else if strings.HasPrefix(k, "http.request.headers.") { // type: string[]
+		header := strings.TrimPrefix(k, "http.request.headers.")
+		return "http.request.header." + header
+	}
 	return k
 }
 
@@ -136,12 +158,15 @@ func tagsToAttributes(tags []string, host string, stringPool *StringPool) attrib
 	for _, tag := range tags {
 		key, val = translateDatadogTagToKeyValuePair(tag)
 		if attr, ok := datadogKnownResourceAttributes[key]; ok {
-			val = stringPool.Intern(val) // No need to intern the key if we already have it
-			if key == semconv.AttributeContainerImageTags {
+			val = stringPool.Intern(val)                    // No need to intern the key if we already have it
+			if key == semconv.AttributeContainerImageTags { // type: string[]
 				attrs.resource.PutEmptySlice(attr).AppendEmpty().SetStr(val)
 			} else {
 				attrs.resource.PutStr(attr, val)
 			}
+		} else if strings.HasPrefix(key, "http.request.header") || strings.HasPrefix(key, "http.response.header.") {
+			// type: string[]
+			attrs.resource.PutEmptySlice(attr).AppendEmpty().SetStr(val)
 		} else {
 			key = stringPool.Intern(translateDatadogKeyToOTel(key))
 			val = stringPool.Intern(val)

receiver/datadogreceiver/internal/translator/tags_test.go

@@ -148,4 +148,10 @@ func TestTranslateDataDogKeyToOtel(t *testing.T) {
 			assert.Equal(t, v, translateDatadogKeyToOTel(k))
 		})
 	}
+
+	// test dynamic attributes:
+	// * http.request.header.<header_name>
+	// * http.response.header.<header_name>
+	assert.Equal(t, "http.request.header.referer", translateDatadogKeyToOTel("http.request.headers.referer"))
+	assert.Equal(t, "http.response.header.content-type", translateDatadogKeyToOTel("http.response.headers.content-type"))
 }

receiver/datadogreceiver/internal/translator/traces_translator.go

@@ -55,6 +55,15 @@ func upsertHeadersAttributes(req *http.Request, attrs pcommon.Map) {
 	}
 }
 
+// getSpanName returns a better suited span name on specific conditions
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/36924
+func getSpanName(span *pb.Span) string {
+	if span.Name == "servlet.request" || span.Name == "spring.handler" {
+		return span.Resource
+	}
+	return span.Name
+}
+
 func ToTraces(payload *pb.TracerPayload, req *http.Request) ptrace.Traces {
 	var traces pb.Traces
 	for _, p := range payload.GetChunks() {
@@ -106,7 +115,7 @@ func ToTraces(payload *pb.TracerPayload, req *http.Request) ptrace.Traces {
 			newSpan.SetStartTimestamp(pcommon.Timestamp(span.Start))
 			newSpan.SetEndTimestamp(pcommon.Timestamp(span.Start + span.Duration))
 			newSpan.SetParentSpanID(uInt64ToSpanID(span.ParentID))
-			newSpan.SetName(span.Name)
+			newSpan.SetName(getSpanName(span))
 			newSpan.Status().SetCode(ptrace.StatusCodeOk)
 			newSpan.Attributes().PutStr("dd.span.Resource", span.Resource)
 			if samplingPriority, ok := span.Metrics["_sampling_priority_v1"]; ok {