Skip to content

Commit 459d2e8

Browse files
add enable/disable support for exclude span rules (#97)
* add enable/disable support * address review comments * fix bug * add test
1 parent 3a2276f commit 459d2e8

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ message ExcludeSpanRuleDetails {
5757
message ExcludeSpanRuleInfo {
5858
string name = 1;
5959
SpanFilter filter = 2;
60+
bool disabled = 3;
6061
}
6162

6263
message ExcludeSpanRuleMetadata {
@@ -68,6 +69,7 @@ message UpdateExcludeSpanRule {
6869
string id = 1;
6970
string name = 2;
7071
SpanFilter filter = 3;
72+
bool disabled = 4;
7173
}
7274

7375
message SpanFilter {

span-processing-config-service-impl/src/main/java/org/hypertrace/span/processing/config/service/SpanProcessingConfigServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ private ExcludeSpanRule buildUpdatedRule(
144144
ExcludeSpanRuleInfo.newBuilder()
145145
.setName(updateExcludeSpanRule.getName())
146146
.setFilter(updateExcludeSpanRule.getFilter())
147+
.setDisabled(updateExcludeSpanRule.getDisabled())
147148
.build())
148149
.build();
149150
}

span-processing-config-service-impl/src/test/java/org/hypertrace/span/processing/config/service/SpanProcessingConfigServiceImplTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.hypertrace.span.processing.config.service;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
45
import static org.junit.jupiter.api.Assertions.assertTrue;
56
import static org.mockito.ArgumentMatchers.any;
67
import static org.mockito.Mockito.mock;
@@ -81,6 +82,7 @@ void testCrud() {
8182
.setRuleInfo(
8283
ExcludeSpanRuleInfo.newBuilder()
8384
.setName("ruleName1")
85+
.setDisabled(true)
8486
.setFilter(
8587
SpanFilter.newBuilder()
8688
.setRelationalSpanFilter(
@@ -107,6 +109,7 @@ void testCrud() {
107109
.setRuleInfo(
108110
ExcludeSpanRuleInfo.newBuilder()
109111
.setName("ruleName2")
112+
.setDisabled(true)
110113
.setFilter(
111114
SpanFilter.newBuilder()
112115
.setRelationalSpanFilter(
@@ -139,6 +142,7 @@ void testCrud() {
139142
UpdateExcludeSpanRule.newBuilder()
140143
.setId(firstCreatedExcludeSpanRule.getId())
141144
.setName("updatedRuleName1")
145+
.setDisabled(false)
142146
.setFilter(
143147
SpanFilter.newBuilder()
144148
.setRelationalSpanFilter(
@@ -152,6 +156,7 @@ void testCrud() {
152156
.getRuleDetails()
153157
.getRule();
154158
assertEquals("updatedRuleName1", updatedFirstExcludeSpanRule.getRuleInfo().getName());
159+
assertFalse(updatedFirstExcludeSpanRule.getRuleInfo().getDisabled());
155160

156161
excludeSpanRules =
157162
this.spanProcessingConfigServiceStub

span-processing-config-service-impl/src/test/java/org/hypertrace/span/processing/config/service/validation/SpanProcessingRequestValidatorTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,6 @@ void validatesCreateRequest() {
8282
mockRequestContext, CreateExcludeSpanRuleRequest.newBuilder().build()));
8383
when(mockRequestContext.getTenantId()).thenReturn(Optional.of(TEST_TENANT_ID));
8484

85-
assertInvalidArgStatusContaining(
86-
"ExcludeSpanRuleInfo",
87-
() ->
88-
validator.validateOrThrow(
89-
mockRequestContext,
90-
CreateExcludeSpanRuleRequest.newBuilder()
91-
.setRuleInfo(ExcludeSpanRuleInfo.newBuilder().build())
92-
.build()));
93-
9485
assertInvalidArgStatusContaining(
9586
"ExcludeSpanRuleInfo.name",
9687
() ->
@@ -108,6 +99,7 @@ void validatesCreateRequest() {
10899
.setRuleInfo(
109100
ExcludeSpanRuleInfo.newBuilder()
110101
.setName("name")
102+
.setDisabled(true)
111103
.setFilter(
112104
SpanFilter.newBuilder()
113105
.setRelationalSpanFilter(

0 commit comments

Comments
 (0)