From 91a69df9c8f63bb0afc2510792631f8ed57c332e Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Fri, 25 Oct 2024 14:27:42 +0530 Subject: [PATCH 01/10] feat: Added kiness delivery stream --- .../candidates/AWSKINESISDELIVERYSTREAM.yml | 16 ++++++++++++++++ ...XT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 relationships/candidates/AWSKINESISDELIVERYSTREAM.yml create mode 100644 relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml diff --git a/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml b/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml new file mode 100644 index 000000000..0eb76f705 --- /dev/null +++ b/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml @@ -0,0 +1,16 @@ +category: AWSKINESISDELIVERYSTREAM +lookups: + - entityTypes: + - domain: INFRA + type: AWSKINESISDELIVERYSTREAM + tags: + matchingMode: ALL + predicates: + - tagKeys: ["aws.arn"] + field: cloudResourceId + onMatch: + onMultipleMatches: RELATE_ALL + onMiss: + action: CREATE_UNINSTRUMENTED + uninstrumented: + type: AWSKINESISDELIVERYSTREAM \ No newline at end of file diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml new file mode 100644 index 000000000..8bcab8c47 --- /dev/null +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -0,0 +1,10 @@ +relationships: + - name: extServiceCallsInfraKinesisDeliveryStream + version: "1" + origins: + - Distributed Tracing + conditions: + - attribute: eventType + anyOf: [ "Span" ] + - attribute: rpc.service + anyOf: [ "kinesis" ] \ No newline at end of file From ca29b24bdf88db6e279b6fb881e9f19651087fdb Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Tue, 29 Oct 2024 11:50:46 +0530 Subject: [PATCH 02/10] feat: Added relationship condition --- ...SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml new file mode 100644 index 000000000..112fefb55 --- /dev/null +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -0,0 +1,22 @@ +relationships: + - name: extServiceCallsInfraKinesisDeliveryStream + version: "1" + origins: + - Distributed Tracing + conditions: + - attribute: eventType + anyOf: [ "Span" ] + - attribute: rpc.service + anyOf: [ "kinesis", Firehose ] + relationship: + expires: P75M + relationshipType: CALLS + source: + extractGuid: + attribute: entity.guid + target: + lookupGuid: + candidateCategory: AWSKINESISDELIVERYSTREAM + fields: + - field: cloudResourceId + attribute: cloud.resource_id \ No newline at end of file From 233e9a5d3964f133b0d795334bc47e7e44972a9c Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Tue, 29 Oct 2024 14:47:51 +0530 Subject: [PATCH 03/10] fix: Added apm kinesis relation file --- .../APM-APPLICATION-to-INFRA-KINESIS.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml new file mode 100644 index 000000000..2f8da1490 --- /dev/null +++ b/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml @@ -0,0 +1,24 @@ +relationships: + - name: AWSKINESISSTREAM + version: "1" + origins: + - Distributed Tracing + conditions: + - attribute: eventType + anyOf: [ "Span" ] + - attribute: cloud.platform + anyOf: [ "aws_kinesis_data_streams"] + - attribute: cloud.resource_id + regex: "^arn:aws:kinesis:([^:]*):([^:]*):stream:([^:]*)" + relationship: + expires: P75M + relationshipType: CALLS + source: + extractGuid: + attribute: entity.guid + target: + lookupGuid: + candidateCategory: AWSKINESISSTREAM + fields: + - field: cloudResourceId + attribute: cloud.resource_id \ No newline at end of file From bce08df30bc6f344fae4dcb1ae490779da564e1b Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Tue, 29 Oct 2024 14:56:07 +0530 Subject: [PATCH 04/10] fix:Removed apm relation file --- .../APM-APPLICATION-to-INFRA-KINESIS.yml | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml deleted file mode 100644 index 2f8da1490..000000000 --- a/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESIS.yml +++ /dev/null @@ -1,24 +0,0 @@ -relationships: - - name: AWSKINESISSTREAM - version: "1" - origins: - - Distributed Tracing - conditions: - - attribute: eventType - anyOf: [ "Span" ] - - attribute: cloud.platform - anyOf: [ "aws_kinesis_data_streams"] - - attribute: cloud.resource_id - regex: "^arn:aws:kinesis:([^:]*):([^:]*):stream:([^:]*)" - relationship: - expires: P75M - relationshipType: CALLS - source: - extractGuid: - attribute: entity.guid - target: - lookupGuid: - candidateCategory: AWSKINESISSTREAM - fields: - - field: cloudResourceId - attribute: cloud.resource_id \ No newline at end of file From d2dd934747e21a924ccede9d81ea1327240b9656 Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Tue, 12 Nov 2024 14:28:43 +0530 Subject: [PATCH 05/10] fix: Add new condition --- .../synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml index 112fefb55..318aa85d4 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -6,8 +6,11 @@ relationships: conditions: - attribute: eventType anyOf: [ "Span" ] + - attribute: instrumentation.provider + anyOf: [ "opentelemetry" ] - attribute: rpc.service - anyOf: [ "kinesis", Firehose ] + anyOf: [ Firehose ] + relationship: expires: P75M relationshipType: CALLS From 122b600fe95bf73b6f0a6a25dc1c7382fcc9cf09 Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Wed, 13 Nov 2024 15:08:23 +0530 Subject: [PATCH 06/10] fix: Added quotes in array --- .../synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml index 318aa85d4..1e0b9f8af 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -9,7 +9,7 @@ relationships: - attribute: instrumentation.provider anyOf: [ "opentelemetry" ] - attribute: rpc.service - anyOf: [ Firehose ] + anyOf: [ "Firehose" ] relationship: expires: P75M From 9f6acf4b34cdb1f0ae56a54ea348300153becd0d Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Mon, 18 Nov 2024 16:35:03 +0530 Subject: [PATCH 07/10] fix: Updated the tagkeys --- relationships/candidates/AWSKINESISDELIVERYSTREAM.yml | 2 +- .../synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml b/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml index 0eb76f705..e88d0fc34 100644 --- a/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml +++ b/relationships/candidates/AWSKINESISDELIVERYSTREAM.yml @@ -6,7 +6,7 @@ lookups: tags: matchingMode: ALL predicates: - - tagKeys: ["aws.arn"] + - tagKeys: ["aws.Arn", "aws.arn"] field: cloudResourceId onMatch: onMultipleMatches: RELATE_ALL diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml index 1e0b9f8af..8bbfae7c2 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -10,7 +10,6 @@ relationships: anyOf: [ "opentelemetry" ] - attribute: rpc.service anyOf: [ "Firehose" ] - relationship: expires: P75M relationshipType: CALLS From 7f32fef520b8d1602906e6668c3d97e4867945f5 Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Mon, 10 Feb 2025 14:44:13 +0530 Subject: [PATCH 08/10] fix: Added support semantic convention --- .../synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml | 8 ++++++++ .../synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml | 8 ++++++++ .../EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 6 ++++++ .../synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml | 6 ++++++ .../synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml | 6 ++++++ 5 files changed, 34 insertions(+) diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml index 4d1aa6f64..dd8c9b61b 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml @@ -6,8 +6,16 @@ relationships: conditions: - attribute: eventType anyOf: [ "Span"] + - attribute: instrumentation.provider + anyOf: [ "opentelemetry" ] + - attribute: newrelic.source + anyOf: [ "api.traces.otlp" ] + - attribute: entity.type + anyOf: [ "SERVICE" ] - attribute: rpc.service anyOf: [ "Lambda" ] + - attribute: cloud.resource_id + regex: "^arn:aws:lambda:([^:]*):([^:]*):function:([^:]*):([^/]*)$" relationship: expires: P75M relationshipType: CALLS diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml index e469f3fdd..84e9681e5 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml @@ -6,6 +6,14 @@ relationships: conditions: - attribute: eventType anyOf: [ "Span" ] + - attribute: instrumentation.provider + anyOf: [ "opentelemetry" ] + - attribute: newrelic.source + anyOf: [ "api.traces.otlp" ] + - attribute: entity.type + anyOf: [ "SERVICE" ] + - attribute: cloud.resource_id + regex: "^arn:aws:dynamodb:([^:]*):([^:]*):table/([^/]*)$" - attribute: rpc.service anyOf: [ "DynamoDB" ] relationship: diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml index 8bbfae7c2..d84ff3e40 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -8,8 +8,14 @@ relationships: anyOf: [ "Span" ] - attribute: instrumentation.provider anyOf: [ "opentelemetry" ] + - attribute: newrelic.source + anyOf: [ "api.traces.otlp" ] + - attribute: entity.type + anyOf: [ "SERVICE" ] - attribute: rpc.service anyOf: [ "Firehose" ] + - attribute: cloud.resource_id + regex: "^arn:aws:firehose:([^:]*):([^:]*):deliverystream/([^:]*)" relationship: expires: P75M relationshipType: CALLS diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml index 2cb74e9c2..763e1173b 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml @@ -8,8 +8,14 @@ relationships: anyOf: [ "Span" ] - attribute: instrumentation.provider anyOf: [ "opentelemetry" ] + - attribute: newrelic.source + anyOf: [ "api.traces.otlp" ] + - attribute: entity.type + anyOf: [ "SERVICE" ] - attribute: rpc.service anyOf: [ "kinesis" ] + - attribute: cloud.resource_id + regex: "^arn:aws:kinesis:([^:]*):([^:]*):stream/([^:]*)" relationship: expires: P75M relationshipType: CALLS diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml index 9c8be9d18..5e56ae3f4 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml @@ -8,8 +8,14 @@ relationships: anyOf: [ "Span" ] - attribute: instrumentation.provider anyOf: [ "opentelemetry" ] + - attribute: newrelic.source + anyOf: [ "api.traces.otlp" ] + - attribute: entity.type + anyOf: [ "SERVICE" ] - attribute: rpc.service anyOf: [ "Redshift" ] + - attribute: server.address + regex: '^[a-zA-Z0-9\-]+\.[a-z0-9]+\.[a-zA-Z0-9\-]+\.redshift\.amazonaws\.com$' relationship: expires: P75M relationshipType: CALLS From 830c5c240f79b87b1073b9e9fd50f1bf1203d596 Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Mon, 10 Feb 2025 14:59:05 +0530 Subject: [PATCH 09/10] fix: Fixed build space issue --- relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml index 84e9681e5..d8c6cb66b 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml @@ -12,7 +12,7 @@ relationships: anyOf: [ "api.traces.otlp" ] - attribute: entity.type anyOf: [ "SERVICE" ] - - attribute: cloud.resource_id + - attribute: cloud.resource_id regex: "^arn:aws:dynamodb:([^:]*):([^:]*):table/([^/]*)$" - attribute: rpc.service anyOf: [ "DynamoDB" ] From 085d332198582a49759bab53c87b77585b787a47 Mon Sep 17 00:00:00 2001 From: Vinay Kumar Konatala Date: Mon, 10 Feb 2025 16:44:53 +0530 Subject: [PATCH 10/10] fix: Added origin as opentelemetry --- .../synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml | 3 +-- relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml | 3 +-- .../synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml | 3 +-- relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml | 3 +-- .../synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml index dd8c9b61b..5846329a4 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSLAMBDAALIAS.yml @@ -3,11 +3,10 @@ relationships: version: "1" origins: - Distributed Tracing + - OpenTelemetry conditions: - attribute: eventType anyOf: [ "Span"] - - attribute: instrumentation.provider - anyOf: [ "opentelemetry" ] - attribute: newrelic.source anyOf: [ "api.traces.otlp" ] - attribute: entity.type diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml index d8c6cb66b..b25419725 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-DYNAMODBTABLE.yml @@ -3,11 +3,10 @@ relationships: version: "1" origins: - Distributed Tracing + - OpenTelemetry conditions: - attribute: eventType anyOf: [ "Span" ] - - attribute: instrumentation.provider - anyOf: [ "opentelemetry" ] - attribute: newrelic.source anyOf: [ "api.traces.otlp" ] - attribute: entity.type diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml index d84ff3e40..c7c458ddf 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISDELIVERYSTREAM.yml @@ -3,11 +3,10 @@ relationships: version: "1" origins: - Distributed Tracing + - OpenTelemetry conditions: - attribute: eventType anyOf: [ "Span" ] - - attribute: instrumentation.provider - anyOf: [ "opentelemetry" ] - attribute: newrelic.source anyOf: [ "api.traces.otlp" ] - attribute: entity.type diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml index 763e1173b..4262b6d21 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-KINESISSTREAM.yml @@ -3,11 +3,10 @@ relationships: version: "1" origins: - Distributed Tracing + - OpenTelemetry conditions: - attribute: eventType anyOf: [ "Span" ] - - attribute: instrumentation.provider - anyOf: [ "opentelemetry" ] - attribute: newrelic.source anyOf: [ "api.traces.otlp" ] - attribute: entity.type diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml index 5e56ae3f4..6208fcd73 100644 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml +++ b/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml @@ -3,11 +3,10 @@ relationships: version: "1" origins: - Distributed Tracing + - OpenTelemetry conditions: - attribute: eventType anyOf: [ "Span" ] - - attribute: instrumentation.provider - anyOf: [ "opentelemetry" ] - attribute: newrelic.source anyOf: [ "api.traces.otlp" ] - attribute: entity.type