Skip to content
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

Jump to bottom

Improve how the SpanFilterBuilder delegates to the SpanDataModifier. #607

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Improve how the SpanFilterBuilder delegates to the SpanDataModifier. #607

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
52 changes: 15 additions & 37 deletions splunk-otel-android/src/main/java/com/splunk/rum/SpanFilterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,21 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.rum.internal.export.SpanDataModifier;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;

/** Delegating wrapper around otel SpanDataModifier. */
public final class SpanFilterBuilder {

// TODO: Use pure upstream mechanism for this
private Predicate<String> rejectSpanNamesPredicate = spanName -> false;
private final Map<AttributeKey<?>, Predicate<?>> rejectSpanAttributesPredicates =
new HashMap<>();
private final Map<AttributeKey<?>, Function<?, ?>> spanAttributeReplacements = new HashMap<>();
private final SpanDataModifier spanDataModifier;

public SpanFilterBuilder(SpanExporter exporter) {
this(SpanDataModifier.builder(exporter));
}

public SpanFilterBuilder(SpanDataModifier spanDataModifier) {
this.spanDataModifier = spanDataModifier;
}

/**
* Remove matching spans from the exporter pipeline.
Expand All @@ -43,7 +45,8 @@ public final class SpanFilterBuilder {
* @return {@code this}.
*/
public SpanFilterBuilder rejectSpansByName(Predicate<String> spanNamePredicate) {
this.rejectSpanNamesPredicate = rejectSpanNamesPredicate.or(spanNamePredicate);
// TODO: Use pure upstream mechanism for this
spanDataModifier.rejectSpansByName(spanNamePredicate);
return this;
}

Expand All @@ -60,12 +63,7 @@ public SpanFilterBuilder rejectSpansByName(Predicate<String> spanNamePredicate)
*/
public <T> SpanFilterBuilder rejectSpansByAttributeValue(
AttributeKey<T> attributeKey, Predicate<? super T> attributeValuePredicate) {
rejectSpanAttributesPredicates.compute(
attributeKey,
(k, oldValue) ->
oldValue == null
? attributeValuePredicate
: ((Predicate<T>) oldValue).or(attributeValuePredicate));
spanDataModifier.rejectSpansByAttributeValue(attributeKey, attributeValuePredicate);
return this;
}

Expand Down Expand Up @@ -115,31 +113,11 @@ public <T> SpanFilterBuilder removeSpanAttribute(
*/
public <T> SpanFilterBuilder replaceSpanAttribute(
AttributeKey<T> attributeKey, Function<? super T, ? extends T> attributeValueModifier) {
spanAttributeReplacements.compute(
attributeKey,
(k, oldValue) ->
oldValue == null
? attributeValueModifier
: ((Function<T, T>) oldValue).andThen(attributeValueModifier));
spanDataModifier.replaceSpanAttribute(attributeKey, attributeValueModifier);
return this;
}

SpanExporter build(SpanExporter exporter) {
SpanDataModifier builder =
SpanDataModifier.builder(exporter).rejectSpansByName(rejectSpanNamesPredicate);
spanAttributeReplacements.forEach(
(attributeKey, function) -> {
AttributeKey<? super Object> key = (AttributeKey<? super Object>) attributeKey;
Function<? super Object, ? super Object> fn =
(Function<? super Object, ? super Object>) function;
builder.replaceSpanAttribute(key, fn);
});
rejectSpanAttributesPredicates.forEach(
((attributeKey, predicate) -> {
AttributeKey<? super Object> kk = (AttributeKey<? super Object>) attributeKey;
Predicate<? super Object> vv = (Predicate<? super Object>) predicate;
builder.rejectSpansByAttributeValue(kk, vv);
}));
return builder.build();
SpanExporter build() {
return spanDataModifier.build();
}
}
8 changes: 5 additions & 3 deletions splunk-otel-android/src/main/java/com/splunk/rum/SplunkRumBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public final class SplunkRumBuilder {
Duration slowRenderingDetectionPollInterval = DEFAULT_SLOW_RENDERING_DETECTION_POLL_INTERVAL;
Attributes globalAttributes = Attributes.empty();
@Nullable String deploymentEnvironment;
private final SpanFilterBuilder spanFilterBuilder = new SpanFilterBuilder();
private Consumer<SpanFilterBuilder> spanFilterConfigurer = x -> {};
int maxUsageMegabytes = DEFAULT_MAX_STORAGE_USE_MB;
boolean sessionBasedSamplerEnabled = false;
double sessionBasedSamplerRatio = 1.0;
Expand Down Expand Up @@ -242,7 +242,7 @@ public SplunkRumBuilder setDeploymentEnvironment(String environment) {
* @return {@code this}
*/
public SplunkRumBuilder filterSpans(Consumer<SpanFilterBuilder> configurer) {
configurer.accept(spanFilterBuilder);
this.spanFilterConfigurer = configurer;
return this;
}

Expand Down Expand Up @@ -320,7 +320,9 @@ ConfigFlags getConfigFlags() {
}

SpanExporter decorateWithSpanFilter(SpanExporter exporter) {
return spanFilterBuilder.build(exporter);
SpanFilterBuilder spanFilterBuilder = new SpanFilterBuilder(exporter);
this.spanFilterConfigurer.accept(spanFilterBuilder);
return spanFilterBuilder.build();
}

boolean isDebugEnabled() {
Expand Down