Skip to content

Fixed the span drop criteria parsing logic #287

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 1 commit into from
Nov 18, 2021
Merged

Fixed the span drop criteria parsing logic #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions ...r/span-normalizer/src/main/java/org/hypertrace/core/spannormalizer/jaeger/SpanFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,8 @@ public boolean shouldDropSpan(
@Nullable
private Pair<String, String> convertToPair(String s) {
if (s != null && s.contains(COLON)) {
String[] parts = s.split(COLON);
if (parts.length == 2) {
return Pair.of(parts[0], parts[1]);
}
int colonIndex = s.indexOf(COLON);
return Pair.of(s.substring(0, colonIndex), s.substring(colonIndex + 1));
}
return null;
}
Expand Down
49 changes: 39 additions & 10 deletions ...r/src/test/java/org/hypertrace/core/spannormalizer/jaeger/JaegerSpanPreProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,49 @@ public void testDropSpanWithMultipleCriterion() {
"tenantIdTagKey",
"tenant-key",
"spanDropCriterion",
List.of("foo:bar,k1:v1", "k2:v2"))));
List.of("foo:bar,k1:v1", "k2:v2", "http.url:https://foo.bar"))));

JaegerSpanPreProcessor jaegerSpanPreProcessor =
new JaegerSpanPreProcessor(ConfigFactory.parseMap(configs));
Process process = Process.newBuilder().setServiceName("testService").build();
Span span =
Span.newBuilder()
.setProcess(process)
.addTags(KeyValue.newBuilder().setKey("tenant-key").setVStr(tenantId).build())
.addTags(KeyValue.newBuilder().setKey("foo").setVStr("bar").build())
.addTags(KeyValue.newBuilder().setKey("k2").setVStr("v2").build())
.build();
PreProcessedSpan preProcessedSpan = jaegerSpanPreProcessor.preProcessSpan(span);
Assertions.assertNull(preProcessedSpan);
{
Span span =
Span.newBuilder()
.setProcess(process)
.addTags(KeyValue.newBuilder().setKey("tenant-key").setVStr(tenantId).build())
.addTags(KeyValue.newBuilder().setKey("foo").setVStr("bar").build())
.addTags(KeyValue.newBuilder().setKey("k2").setVStr("v2").build())
.build();
PreProcessedSpan preProcessedSpan = jaegerSpanPreProcessor.preProcessSpan(span);
// Span dropped due to matching condition: k2:v2
Assertions.assertNull(preProcessedSpan);
}

{
Span span =
Span.newBuilder()
.setProcess(process)
.addTags(KeyValue.newBuilder().setKey("tenant-key").setVStr(tenantId).build())
.addTags(KeyValue.newBuilder().setKey("foo").setVStr("bar").build())
.addTags(KeyValue.newBuilder().setKey("http.url").setVStr("https://foo.bar").build())
.build();
PreProcessedSpan preProcessedSpan = jaegerSpanPreProcessor.preProcessSpan(span);
// Span dropped due to matching condition: http.url:https://foo.bar
Assertions.assertNull(preProcessedSpan);
}

{
Span span =
Span.newBuilder()
.setProcess(process)
.addTags(KeyValue.newBuilder().setKey("tenant-key").setVStr(tenantId).build())
.addTags(KeyValue.newBuilder().setKey("foo").setVStr("bar").build())
.addTags(KeyValue.newBuilder().setKey("http.url").setVStr("https://valid").build())
.build();
PreProcessedSpan preProcessedSpan = jaegerSpanPreProcessor.preProcessSpan(span);
// Span not dropped since there is no matching condition
Assertions.assertNotNull(preProcessedSpan);
}
}

@Test
Expand Down