From 640c439358d19dd7a579647e80062a63fd1eaf15 Mon Sep 17 00:00:00 2001 From: Ben Kilimnik <47846691+benkilimnik@users.noreply.github.com> Date: Tue, 27 Feb 2024 03:06:22 -0500 Subject: [PATCH] Ebpf entity defs: change span.kind to trace_role (#1500) * ebpf entity defs: change span.kind to trace_role Signed-off-by: Benjamin Kilimnik * add quotes around instrumentation provider 'nr_ebpf_agent' Signed-off-by: Benjamin Kilimnik --------- Signed-off-by: Benjamin Kilimnik --- entity-types/ebpf-client/definition.yml | 4 ++-- entity-types/ebpf-client/tests/Span.json | 2 +- entity-types/ebpf-redis_server/definition.yml | 2 +- entity-types/ebpf-redis_server/tests/Span.json | 2 +- relationships/synthesis/EBPF-CLIENT-to-EBPF_REDIS.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/entity-types/ebpf-client/definition.yml b/entity-types/ebpf-client/definition.yml index 9f075dc8d..373381697 100644 --- a/entity-types/ebpf-client/definition.yml +++ b/entity-types/ebpf-client/definition.yml @@ -9,8 +9,8 @@ synthesis: encodeIdentifierInGUID: true conditions: - attribute: instrumentation.provider - value: nr_ebpf_agent - - attribute: span.kind + value: "nr_ebpf_agent" + - attribute: trace_role value: "client" tags: local_addr: diff --git a/entity-types/ebpf-client/tests/Span.json b/entity-types/ebpf-client/tests/Span.json index 3f4cde07d..1ca429ba2 100644 --- a/entity-types/ebpf-client/tests/Span.json +++ b/entity-types/ebpf-client/tests/Span.json @@ -2,7 +2,7 @@ { "redis.req_cmd": "HMGET", "instrumentation.provider": "nr_ebpf_agent", - "span.kind": "client", + "trace_role": "client", "local_addr": "192.xxx.x.xx", "local_port": "92" , "remote_addr": "198.xxx.x.xx", diff --git a/entity-types/ebpf-redis_server/definition.yml b/entity-types/ebpf-redis_server/definition.yml index eae406287..dde823d80 100644 --- a/entity-types/ebpf-redis_server/definition.yml +++ b/entity-types/ebpf-redis_server/definition.yml @@ -15,7 +15,7 @@ synthesis: present: true - attribute: instrumentation.provider value: "nr_ebpf_agent" - - attribute: span.kind + - attribute: trace_role value: "server" tags: local_addr: diff --git a/entity-types/ebpf-redis_server/tests/Span.json b/entity-types/ebpf-redis_server/tests/Span.json index 6f915a966..de14f9685 100644 --- a/entity-types/ebpf-redis_server/tests/Span.json +++ b/entity-types/ebpf-redis_server/tests/Span.json @@ -2,7 +2,7 @@ { "redis.req_cmd": "HMGET", "instrumentation.provider": "nr_ebpf_agent", - "span.kind": "server", + "trace_role": "server", "local_addr": "198.xxx.x.xx", "local_port": "98", "remote_addr": "192.xxx.x.xx", diff --git a/relationships/synthesis/EBPF-CLIENT-to-EBPF_REDIS.yml b/relationships/synthesis/EBPF-CLIENT-to-EBPF_REDIS.yml index 1752ede44..65cb4f552 100644 --- a/relationships/synthesis/EBPF-CLIENT-to-EBPF_REDIS.yml +++ b/relationships/synthesis/EBPF-CLIENT-to-EBPF_REDIS.yml @@ -8,7 +8,7 @@ relationships: anyOf: [ "Span" ] - attribute: entity.type anyOf: [ "REDIS_SERVER" ] - - attribute: span.kind + - attribute: trace_role value: "server" relationship: expires: P75M @@ -32,7 +32,7 @@ relationships: anyOf: [ "Span" ] - attribute: entity.type anyOf: [ "EBPF_CLIENT" ] - - attribute: span.kind + - attribute: trace_role value: "client" - attribute: redis.req_cmd present: true