Skip to content

Commit 9348ff3

Browse files
authored
Merge pull request #5192 from getsentry/fix/cache-tracing-noop-span
fix(spring): [Cache Tracing 11] Skip cache span data when child span is NoOp
2 parents 09e6e09 + 5a729ca commit 9348ff3

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ public boolean invalidate() {
295295
spanOptions.setOrigin(TRACE_ORIGIN);
296296
final String keyString = key != null ? String.valueOf(key) : null;
297297
final ISpan span = activeSpan.startChild(operation, keyString, spanOptions);
298+
if (span.isNoOp()) {
299+
return null;
300+
}
298301
if (keyString != null) {
299302
span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
300303
}

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ public boolean invalidate() {
295295
spanOptions.setOrigin(TRACE_ORIGIN);
296296
final String keyString = key != null ? String.valueOf(key) : null;
297297
final ISpan span = activeSpan.startChild(operation, keyString, spanOptions);
298+
if (span.isNoOp()) {
299+
return null;
300+
}
298301
if (keyString != null) {
299302
span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
300303
}

sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ public boolean invalidate() {
223223
spanOptions.setOrigin(TRACE_ORIGIN);
224224
final String keyString = key != null ? String.valueOf(key) : null;
225225
final ISpan span = activeSpan.startChild(operation, keyString, spanOptions);
226+
if (span.isNoOp()) {
227+
return null;
228+
}
226229
if (keyString != null) {
227230
span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
228231
}

0 commit comments

Comments
 (0)