Promote eBPF synthesis updates to prod (#2483)

* Release eBPF entity synthesis changes to prod

* fix: Remove incorrect origin

* fix: Remove APM metrics origin

---------

Co-authored-by: Adrian <[email protected]>

Author: ppant-code

entity-types/ext-service/definition.stg.yml

@@ -160,11 +160,12 @@ synthesis:
     conditions:
     - attribute: instrumentation.name
       value: nr_ebpf
+    - attribute: instrumentation.provider
+      value: opentelemetry
     - attribute: trace_role
       value: client
     - attribute: service.name
-    - attribute: ebpf_entity
-      present: false
+      present: true
     tags:
       k8s.cluster.name:
         entityTagName: k8s.clusterName
@@ -185,11 +186,12 @@ synthesis:
     conditions:
     - attribute: instrumentation.name
       value: nr_ebpf
+    - attribute: instrumentation.provider
+      value: opentelemetry
     - attribute: trace_role
       value: server
     - attribute: service.name
-    - attribute: ebpf_entity
-      present: false
+      present: true
     tags:
       k8s.cluster.name:
         entityTagName: k8s.clusterName
@@ -204,6 +206,34 @@ synthesis:
       local_addr:
       local_port:
 
+    # telemetry from NR eBPF agent with instrumentation.provider newrelic-ebpf
+  - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - service.name
+          - instrumentation.name
+    name: service.name
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: instrumentation.provider
+      value: newrelic-ebpf
+    - attribute: instrumentation.name
+      value: nr_ebpf
+    - attribute: service.name
+      present: true
+    tags:
+      k8s.cluster.name:
+        entityTagName: k8s.clusterName
+        ttl: P1D
+      k8s.namespace.name:
+        entityTagName: k8s.namespaceName
+        ttl: P1D
+      deployment.name:
+        entityTagName: k8s.deploymentName
+        ttl: P1D
+      host.name:
+      service.name:
+
     # IMPORTANT:
     # This rule matches on any telemetry with service.name
     # which is too broad for some telemetry sources, resulting
@@ -219,8 +249,6 @@ synthesis:
     - attribute: service.name
     - attribute: newrelic.entity.type
       present: false
-    - attribute: ebpf_entity
-      present: false
     tags:
       k8s.cluster.name:
         ttl: P1D