[pkg/otlp/attributes] Add Kubernetes DD tags to keep

.chloggen/stanley.liu_add-kubernetes-dd-tags.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component (e.g. pkg/quantile)
+component: pkg/otlp/attributes
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Adds Kubernetes DD tags to keep when mapping resource attributes.
+
+# The PR related to this change
+issues: [334]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

pkg/otlp/attributes/attributes.go

@@ -92,6 +92,81 @@ var (
 		"app.kubernetes.io/part-of":    "kube_app_part_of",
 		"app.kubernetes.io/managed-by": "kube_app_managed_by",
 	}
+
+	// Kubernetes out of the box Datadog tags
+	// https://docs.datadoghq.com/containers/kubernetes/tag/?tab=containerizedagent#out-of-the-box-tags
+	// https://github.com/DataDog/datadog-agent/blob/d33d042d6786e8b85f72bb627fbf06ad8a658031/comp/core/tagger/taggerimpl/collectors/workloadmeta_extract.go
+	// Note: if any OTel semantics happen to overlap with these tag names, they will also be added as Datadog tags.
+	kubernetesDDTags = map[string]struct{}{
+		"architecture":                {},
+		"availability-zone":           {},
+		"chronos_job":                 {},
+		"chronos_job_owner":           {},
+		"cluster_name":                {},
+		"container_id":                {},
+		"container_name":              {},
+		"dd_remote_config_id":         {},
+		"dd_remote_config_rev":        {},
+		"display_container_name":      {},
+		"docker_image":                {},
+		"ecs_cluster_name":            {},
+		"ecs_container_name":          {},
+		"eks_fargate_node":            {},
+		"env":                         {},
+		"git.commit.sha":              {},
+		"git.repository_url":          {},
+		"image_id":                    {},
+		"image_name":                  {},
+		"image_tag":                   {},
+		"kube_app_component":          {},
+		"kube_app_instance":           {},
+		"kube_app_managed_by":         {},
+		"kube_app_name":               {},
+		"kube_app_part_of":            {},
+		"kube_app_version":            {},
+		"kube_container_name":         {},
+		"kube_cronjob":                {},
+		"kube_daemon_set":             {},
+		"kube_deployment":             {},
+		"kube_job":                    {},
+		"kube_namespace":              {},
+		"kube_ownerref_kind":          {},
+		"kube_ownerref_name":          {},
+		"kube_priority_class":         {},
+		"kube_qos":                    {},
+		"kube_replica_set":            {},
+		"kube_replication_controller": {},
+		"kube_service":                {},
+		"kube_stateful_set":           {},
+		"language":                    {},
+		"marathon_app":                {},
+		"mesos_task":                  {},
+		"nomad_dc":                    {},
+		"nomad_group":                 {},
+		"nomad_job":                   {},
+		"nomad_namespace":             {},
+		"nomad_task":                  {},
+		"oshift_deployment":           {},
+		"oshift_deployment_config":    {},
+		"os_name":                     {},
+		"os_version":                  {},
+		"persistentvolumeclaim":       {},
+		"pod_name":                    {},
+		"pod_phase":                   {},
+		"rancher_container":           {},
+		"rancher_service":             {},
+		"rancher_stack":               {},
+		"region":                      {},
+		"service":                     {},
+		"short_image":                 {},
+		"swarm_namespace":             {},
+		"swarm_service":               {},
+		"task_name":                   {},
+		"task_family":                 {},
+		"task_version":                {},
+		"task_arn":                    {},
+		"version":                     {},
+	}
 )
 
 // TagsFromAttributes converts a selected list of attributes
@@ -132,6 +207,11 @@ func TagsFromAttributes(attrs pcommon.Map) []string {
 		if datadogKey, found := kubernetesMapping[key]; found && value.Str() != "" {
 			tags = append(tags, fmt.Sprintf("%s:%s", datadogKey, value.Str()))
 		}
+
+		// Kubernetes DD tags
+		if _, found := kubernetesDDTags[key]; found {
+			tags = append(tags, fmt.Sprintf("%s:%s", key, value.Str()))
+		}
 		return true
 	})
 

pkg/otlp/attributes/attributes_test.go

@@ -39,6 +39,7 @@ func TestTagsFromAttributes(t *testing.T) {
 		conventions.AttributeDeploymentEnvironment: "prod",
 		conventions.AttributeContainerName:         "custom",
 		"datadog.container.tag.custom.team":        "otel",
+		"kube_cronjob":                             "cron",
 	}
 	attrs := pcommon.NewMap()
 	attrs.FromRaw(attributeMap)
@@ -53,6 +54,7 @@ func TestTagsFromAttributes(t *testing.T) {
 		fmt.Sprintf("%s:%s", "env", "prod"),
 		fmt.Sprintf("%s:%s", "container_name", "custom"),
 		fmt.Sprintf("%s:%s", "custom.team", "otel"),
+		fmt.Sprintf("%s:%s", "kube_cronjob", "cron"),
 	}, TagsFromAttributes(attrs))
 }
 

pkg/otlp/logs/transform_test.go

@@ -435,7 +435,7 @@ func TestTranslator(t *testing.T) {
 				}(),
 			},
 			want: datadogV2.HTTPLogItem{
-				Ddtags:  datadog.PtrString("otel_source:test"),
+				Ddtags:  datadog.PtrString("service:otlp_col,otel_source:test"),
 				Message: *datadog.PtrString(""),
 				AdditionalProperties: map[string]string{
 					"app":              "test",