Skip to content

Commit 2b0f80c

Browse files
committed
remove duplicated code
1 parent e1e0423 commit 2b0f80c

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

span-stacktrace/src/main/java/io/opentelemetry/contrib/stacktrace/StackTraceSpanProcessor.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.context.Context;
10-
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1110
import io.opentelemetry.sdk.trace.ReadWriteSpan;
1211
import io.opentelemetry.sdk.trace.ReadableSpan;
1312
import io.opentelemetry.sdk.trace.internal.ExtendedSpanProcessor;
1413
import java.io.PrintWriter;
1514
import java.io.StringWriter;
16-
import java.time.Duration;
1715
import java.util.function.Predicate;
1816

1917
public class StackTraceSpanProcessor implements ExtendedSpanProcessor {
2018

21-
private static final String CONFIG_MIN_DURATION =
22-
"otel.java.experimental.span-stacktrace.min.duration";
23-
private static final Duration CONFIG_MIN_DURATION_DEFAULT = Duration.ofMillis(5);
24-
2519
// inlined incubating attribute to prevent direct dependency on incubating semconv
2620
private static final AttributeKey<String> SPAN_STACKTRACE =
2721
AttributeKey.stringKey("code.stacktrace");
@@ -40,16 +34,6 @@ public StackTraceSpanProcessor(
4034
this.filterPredicate = filterPredicate;
4135
}
4236

43-
/**
44-
* @param config configuration
45-
* @param filterPredicate extra filter function to exclude spans if needed
46-
*/
47-
public StackTraceSpanProcessor(ConfigProperties config, Predicate<ReadableSpan> filterPredicate) {
48-
this(
49-
config.getDuration(CONFIG_MIN_DURATION, CONFIG_MIN_DURATION_DEFAULT).toNanos(),
50-
filterPredicate);
51-
}
52-
5337
@Override
5438
public boolean isStartRequired() {
5539
return false;

span-stacktrace/src/test/java/io/opentelemetry/contrib/stacktrace/StackTraceSpanProcessorTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ void spanWithExistingStackTrace() {
7373
}
7474

7575
private static void checkSpanWithStackTrace(
76-
Predicate<ReadableSpan> filterPredicate, String configString, long spanDurationNanos) {
76+
Predicate<ReadableSpan> filterPredicate, String minDurationString, long spanDurationNanos) {
7777
checkSpan(
7878
filterPredicate,
79-
configString,
79+
minDurationString,
8080
spanDurationNanos,
8181
Function.identity(),
8282
(stackTrace) ->
@@ -86,18 +86,18 @@ private static void checkSpanWithStackTrace(
8686
}
8787

8888
private static void checkSpanWithoutStackTrace(
89-
Predicate<ReadableSpan> filterPredicate, String configString, long spanDurationNanos) {
89+
Predicate<ReadableSpan> filterPredicate, String minDurationString, long spanDurationNanos) {
9090
checkSpan(
9191
filterPredicate,
92-
configString,
92+
minDurationString,
9393
spanDurationNanos,
9494
Function.identity(),
9595
(stackTrace) -> assertThat(stackTrace).describedAs("no stack trace expected").isNull());
9696
}
9797

9898
private static void checkSpan(
9999
Predicate<ReadableSpan> filterPredicate,
100-
String configString,
100+
String minDurationString,
101101
long spanDurationNanos,
102102
Function<SpanBuilder, SpanBuilder> customizeSpanBuilder,
103103
Consumer<String> stackTraceCheck) {
@@ -107,13 +107,14 @@ private static void checkSpan(
107107
SpanProcessor exportProcessor = SimpleSpanProcessor.create(spansExporter);
108108

109109
Map<String, String> configMap = new HashMap<>();
110-
if (configString != null) {
111-
configMap.put("otel.java.experimental.span-stacktrace.min.duration", configString);
110+
if (minDurationString != null) {
111+
configMap.put("otel.java.experimental.span-stacktrace.min.duration", minDurationString);
112112
}
113+
long minDuration = StackTraceAutoConfig.getMinDuration(
114+
DefaultConfigProperties.createFromMap(configMap));
113115

114116
StackTraceSpanProcessor processor =
115-
new StackTraceSpanProcessor(
116-
DefaultConfigProperties.createFromMap(configMap), filterPredicate);
117+
new StackTraceSpanProcessor(minDuration, filterPredicate);
117118

118119
try (OpenTelemetrySdk sdk =
119120
OpenTelemetrySdk.builder()

0 commit comments

Comments
 (0)