Skip to content

Commit 3e4366f

Browse files
committed
opentelemetry: Replace anonymous classes with lambdas/method references for TargetFilter
1 parent d227ef9 commit 3e4366f

2 files changed

Lines changed: 5 additions & 20 deletions

File tree

opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,7 @@ public Builder targetAttributeFilter(@Nullable Predicate<String> filter) {
454454
if (filter == null) {
455455
this.targetFilter = null;
456456
} else {
457-
this.targetFilter = new TargetFilter() {
458-
@Override
459-
public boolean test(String target) {
460-
return filter.test(target);
461-
}
462-
};
457+
this.targetFilter = filter::test;
463458
}
464459
return this;
465460
}

opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryMetricsModuleTest.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,15 +1715,10 @@ public void targetAttributeFilter_notSet_usesOriginalTarget() {
17151715
public void targetAttributeFilter_allowsTarget_usesOriginalTarget() {
17161716
// Test that when filter allows the target, the original target is used
17171717
String target = "dns:///example.com";
1718-
TargetFilter targetFilter = new TargetFilter() {
1719-
@Override
1720-
public boolean test(String target) {
1721-
return target.contains("example.com");
1722-
}
1723-
};
17241718
OpenTelemetryMetricsResource resource = GrpcOpenTelemetry.createMetricInstruments(testMeter,
17251719
enabledMetricsMap, disableDefaultMetrics);
1726-
OpenTelemetryMetricsModule module = newOpenTelemetryMetricsModule(resource, targetFilter);
1720+
OpenTelemetryMetricsModule module = newOpenTelemetryMetricsModule(resource,
1721+
t -> t.contains("example.com"));
17271722

17281723
Channel interceptedChannel =
17291724
ClientInterceptors.intercept(
@@ -1764,15 +1759,10 @@ public boolean test(String target) {
17641759
public void targetAttributeFilter_rejectsTarget_mapsToOther() {
17651760
// Test that when filter rejects the target, it is mapped to "other"
17661761
String target = "dns:///example.com";
1767-
TargetFilter targetFilter = new TargetFilter() {
1768-
@Override
1769-
public boolean test(String target) {
1770-
return target.contains("allowed.com");
1771-
}
1772-
};
17731762
OpenTelemetryMetricsResource resource = GrpcOpenTelemetry.createMetricInstruments(testMeter,
17741763
enabledMetricsMap, disableDefaultMetrics);
1775-
OpenTelemetryMetricsModule module = newOpenTelemetryMetricsModule(resource, targetFilter);
1764+
OpenTelemetryMetricsModule module = newOpenTelemetryMetricsModule(resource,
1765+
t -> t.contains("allowed.com"));
17761766

17771767
Channel interceptedChannel =
17781768
ClientInterceptors.intercept(

0 commit comments

Comments
 (0)