From f26e5ca272daa12af599baf94f81bccb38e769a2 Mon Sep 17 00:00:00 2001 From: Shivansh Anand Srivastava Date: Fri, 7 Jun 2024 16:24:50 +0530 Subject: [PATCH 1/3] Proto change for adding evaluation targets for each exclude span rule --- .../v1/span_processing_config_service.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto index d40da4ab..84cc270e 100644 --- a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto +++ b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto @@ -66,8 +66,23 @@ message ExcludeSpanRuleInfo { SpanFilter filter = 2; bool disabled = 3; RuleType type = 4; + repeated EvaluationTarget evaluation_targets = 5; } +message EvaluationTarget { + oneof target { + Platform platform = 1; + PlatformAgent platform_agent = 2; + TracingAgent tracing_agent = 3; + } +} + +message Platform {} + +message PlatformAgent {} + +message TracingAgent {} + message ExcludeSpanRuleMetadata { google.protobuf.Timestamp creation_timestamp = 1; google.protobuf.Timestamp last_updated_timestamp = 2; From 8f9a40592ce1ea82e6db47209775a91c43992ab8 Mon Sep 17 00:00:00 2001 From: Shivansh Anand Srivastava Date: Fri, 7 Jun 2024 17:15:37 +0530 Subject: [PATCH 2/3] Proto change for adding evaluation targets for each exclude span rule --- .../service/v1/span_processing_config_service.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto index 84cc270e..720867f5 100644 --- a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto +++ b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto @@ -72,16 +72,16 @@ message ExcludeSpanRuleInfo { message EvaluationTarget { oneof target { Platform platform = 1; - PlatformAgent platform_agent = 2; - TracingAgent tracing_agent = 3; + Agent agent = 2; + AgentModule agent_module = 3; } } message Platform {} -message PlatformAgent {} +message Agent {} -message TracingAgent {} +message AgentModule {} message ExcludeSpanRuleMetadata { google.protobuf.Timestamp creation_timestamp = 1; From b5eba24d638bb26e2af46a1ef3aa94024616b9a1 Mon Sep 17 00:00:00 2001 From: Shivansh Anand Srivastava Date: Mon, 10 Jun 2024 14:29:21 +0530 Subject: [PATCH 3/3] Proto change for adding evaluation targets for each exclude span rule --- .../config/service/v1/span_processing_config_service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto index 720867f5..b9a5566b 100644 --- a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto +++ b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto @@ -54,6 +54,7 @@ message DeleteExcludeSpanRuleResponse { message ExcludeSpanRule { string id = 1; ExcludeSpanRuleInfo rule_info = 2; + repeated EvaluationTarget evaluation_targets = 3; } message ExcludeSpanRuleDetails { @@ -66,7 +67,6 @@ message ExcludeSpanRuleInfo { SpanFilter filter = 2; bool disabled = 3; RuleType type = 4; - repeated EvaluationTarget evaluation_targets = 5; } message EvaluationTarget {