Skip to content

add enable/disable support for exclude span rules #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 25, 2022
Merged

add enable/disable support for exclude span rules #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
201695a
add enable/disable support
SrikarMannepalli Feb 25, 2022
9339569
address review comments
SrikarMannepalli Feb 25, 2022
7226cba
fix bug
SrikarMannepalli Feb 25, 2022
e92eb93
add test
SrikarMannepalli Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...oto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ message ExcludeSpanRuleDetails {
message ExcludeSpanRuleInfo {
string name = 1;
SpanFilter filter = 2;
bool disabled = 3;
}

message ExcludeSpanRuleMetadata {
Expand All @@ -68,6 +69,7 @@ message UpdateExcludeSpanRule {
string id = 1;
string name = 2;
SpanFilter filter = 3;
bool disabled = 4;
}

message SpanFilter {
Expand Down
1 change: 1 addition & 0 deletions ...n/java/org/hypertrace/span/processing/config/service/SpanProcessingConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ private ExcludeSpanRule buildUpdatedRule(
ExcludeSpanRuleInfo.newBuilder()
.setName(updateExcludeSpanRule.getName())
.setFilter(updateExcludeSpanRule.getFilter())
.setDisabled(updateExcludeSpanRule.getDisabled())
.build())
.build();
}
Expand Down
5 changes: 5 additions & 0 deletions ...va/org/hypertrace/span/processing/config/service/SpanProcessingConfigServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.hypertrace.span.processing.config.service;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -81,6 +82,7 @@ void testCrud() {
.setRuleInfo(
ExcludeSpanRuleInfo.newBuilder()
.setName("ruleName1")
.setDisabled(true)
.setFilter(
SpanFilter.newBuilder()
.setRelationalSpanFilter(
Expand All @@ -107,6 +109,7 @@ void testCrud() {
.setRuleInfo(
ExcludeSpanRuleInfo.newBuilder()
.setName("ruleName2")
.setDisabled(true)
.setFilter(
SpanFilter.newBuilder()
.setRelationalSpanFilter(
Expand Down Expand Up @@ -139,6 +142,7 @@ void testCrud() {
UpdateExcludeSpanRule.newBuilder()
.setId(firstCreatedExcludeSpanRule.getId())
.setName("updatedRuleName1")
.setDisabled(false)
.setFilter(
SpanFilter.newBuilder()
.setRelationalSpanFilter(
Expand All @@ -152,6 +156,7 @@ void testCrud() {
.getRuleDetails()
.getRule();
assertEquals("updatedRuleName1", updatedFirstExcludeSpanRule.getRuleInfo().getName());
assertFalse(updatedFirstExcludeSpanRule.getRuleInfo().getDisabled());

excludeSpanRules =
this.spanProcessingConfigServiceStub
Expand Down
10 changes: 1 addition & 9 deletions ...ertrace/span/processing/config/service/validation/SpanProcessingRequestValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,6 @@ void validatesCreateRequest() {
mockRequestContext, CreateExcludeSpanRuleRequest.newBuilder().build()));
when(mockRequestContext.getTenantId()).thenReturn(Optional.of(TEST_TENANT_ID));

assertInvalidArgStatusContaining(
"ExcludeSpanRuleInfo",
() ->
validator.validateOrThrow(
mockRequestContext,
CreateExcludeSpanRuleRequest.newBuilder()
.setRuleInfo(ExcludeSpanRuleInfo.newBuilder().build())
.build()));

assertInvalidArgStatusContaining(
"ExcludeSpanRuleInfo.name",
() ->
Expand All @@ -108,6 +99,7 @@ void validatesCreateRequest() {
.setRuleInfo(
ExcludeSpanRuleInfo.newBuilder()
.setName("name")
.setDisabled(true)
.setFilter(
SpanFilter.newBuilder()
.setRelationalSpanFilter(
Expand Down