From 751ec6d935cc30f1303dfb56c352ae4452556231 Mon Sep 17 00:00:00 2001
From: Ben Kilimnik <47846691+benkilimnik@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:42:29 -0400
Subject: [PATCH] rebase (#1552)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
Co-authored-by: Javi Imbernón <javimb@newrelic.com>
---
 .../infra-kubernetes_pod/definition.yml       | 29 +++++++++++++++++++
 .../infra-kubernetes_pod/tests/Span.json      | 15 ++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 entity-types/infra-kubernetes_pod/tests/Span.json

diff --git a/entity-types/infra-kubernetes_pod/definition.yml b/entity-types/infra-kubernetes_pod/definition.yml
index e7ba784c9..72de7127e 100644
--- a/entity-types/infra-kubernetes_pod/definition.yml
+++ b/entity-types/infra-kubernetes_pod/definition.yml
@@ -62,3 +62,32 @@ synthesis:
       created_by_kind:
         # from kube-state-metrics kube_pod_info
         entityTagNames: [k8s.createdKind]
+
+  - compositeIdentifier:
+      separator: ":"
+      attributes:
+        - k8s.cluster.name
+        - k8s.namespace.name
+        - k8s.pod.name
+    encodeIdentifierInGUID: true
+    name: k8s.pod.name
+    conditions:
+      # identifier attributes
+      - attribute: k8s.pod.name
+        present: true
+      - attribute: k8s.namespace.name
+        present: true
+      - attribute: k8s.cluster.name
+        present: true
+      # ebpf data
+      - attribute: instrumentation.provider
+        value: "nr_ebpf_agent"
+    tags:
+      k8s.pod.name:
+        entityTagNames: [k8s.podName]
+      k8s.namespace.name:
+        entityTagNames: [k8s.namespaceName]
+      k8s.cluster.name:
+        entityTagNames: [k8s.clusterName]
+      k8s.node.name:
+        entityTagNames: [k8s.nodeName]
\ No newline at end of file
diff --git a/entity-types/infra-kubernetes_pod/tests/Span.json b/entity-types/infra-kubernetes_pod/tests/Span.json
new file mode 100644
index 000000000..913c266a4
--- /dev/null
+++ b/entity-types/infra-kubernetes_pod/tests/Span.json
@@ -0,0 +1,15 @@
+[
+  {
+    "protocol.name": "redis",
+    "instrumentation.provider": "nr_ebpf_agent",
+    "trace_role": "server",
+    "local_addr": "198.xxx.x.xx",
+    "local_port": "98",
+    "remote_addr": "192.xxx.x.xx",
+    "remote_port": "92",
+    "k8s.pod.name": "redis-0",
+    "k8s.namespace.name": "default",
+    "k8s.cluster.name": "k8s-cluster",
+    "newrelic.source": "api.traces.otlp"
+  }
+]
\ No newline at end of file