Skip to content

Commit 0a32614

Browse files
adinauerclaude
adinauer
and
claude
committed
ref(spring): Derive span operation from operationName in startSpan
Remove redundant first parameter since it was always "cache." + operationName. The prefix is now applied inside the helper method. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 4e794ef commit 0a32614

File tree

4 files changed

+63
-68
lines changed

4 files changed

+63
-68
lines changed

‎sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public SentryJCacheWrapper(final @NotNull Cache<K, V> delegate, final @NotNull I
5151

5252
@Override
5353
public V get(final K key) {
54-
final ISpan span = startSpan("cache.get", key, "get");
54+
final ISpan span = startSpan(key, "get");
5555
if (span == null) {
5656
return delegate.get(key);
5757
}
@@ -71,7 +71,7 @@ public V get(final K key) {
7171

7272
@Override
7373
public Map<K, V> getAll(final Set<? extends K> keys) {
74-
final ISpan span = startSpanForKeys("cache.getAll", keys, "getAll");
74+
final ISpan span = startSpanForKeys(keys, "getAll");
7575
if (span == null) {
7676
return delegate.getAll(keys);
7777
}
@@ -98,7 +98,7 @@ public boolean containsKey(final K key) {
9898

9999
@Override
100100
public void put(final K key, final V value) {
101-
final ISpan span = startSpan("cache.put", key, "put");
101+
final ISpan span = startSpan(key, "put");
102102
if (span == null) {
103103
delegate.put(key, value);
104104
return;
@@ -117,7 +117,7 @@ public void put(final K key, final V value) {
117117

118118
@Override
119119
public V getAndPut(final K key, final V value) {
120-
final ISpan span = startSpan("cache.getAndPut", key, "getAndPut");
120+
final ISpan span = startSpan(key, "getAndPut");
121121
if (span == null) {
122122
return delegate.getAndPut(key, value);
123123
}
@@ -136,7 +136,7 @@ public V getAndPut(final K key, final V value) {
136136

137137
@Override
138138
public void putAll(final Map<? extends K, ? extends V> map) {
139-
final ISpan span = startSpanForKeys("cache.putAll", map.keySet(), "putAll");
139+
final ISpan span = startSpanForKeys(map.keySet(), "putAll");
140140
if (span == null) {
141141
delegate.putAll(map);
142142
return;
@@ -155,7 +155,7 @@ public void putAll(final Map<? extends K, ? extends V> map) {
155155

156156
@Override
157157
public boolean putIfAbsent(final K key, final V value) {
158-
final ISpan span = startSpan("cache.putIfAbsent", key, "putIfAbsent");
158+
final ISpan span = startSpan(key, "putIfAbsent");
159159
if (span == null) {
160160
return delegate.putIfAbsent(key, value);
161161
}
@@ -174,7 +174,7 @@ public boolean putIfAbsent(final K key, final V value) {
174174

175175
@Override
176176
public boolean replace(final K key, final V oldValue, final V newValue) {
177-
final ISpan span = startSpan("cache.replace", key, "replace");
177+
final ISpan span = startSpan(key, "replace");
178178
if (span == null) {
179179
return delegate.replace(key, oldValue, newValue);
180180
}
@@ -193,7 +193,7 @@ public boolean replace(final K key, final V oldValue, final V newValue) {
193193

194194
@Override
195195
public boolean replace(final K key, final V value) {
196-
final ISpan span = startSpan("cache.replace", key, "replace");
196+
final ISpan span = startSpan(key, "replace");
197197
if (span == null) {
198198
return delegate.replace(key, value);
199199
}
@@ -212,7 +212,7 @@ public boolean replace(final K key, final V value) {
212212

213213
@Override
214214
public V getAndReplace(final K key, final V value) {
215-
final ISpan span = startSpan("cache.getAndReplace", key, "getAndReplace");
215+
final ISpan span = startSpan(key, "getAndReplace");
216216
if (span == null) {
217217
return delegate.getAndReplace(key, value);
218218
}
@@ -233,7 +233,7 @@ public V getAndReplace(final K key, final V value) {
233233

234234
@Override
235235
public boolean remove(final K key) {
236-
final ISpan span = startSpan("cache.remove", key, "remove");
236+
final ISpan span = startSpan(key, "remove");
237237
if (span == null) {
238238
return delegate.remove(key);
239239
}
@@ -252,7 +252,7 @@ public boolean remove(final K key) {
252252

253253
@Override
254254
public boolean remove(final K key, final V oldValue) {
255-
final ISpan span = startSpan("cache.remove", key, "remove");
255+
final ISpan span = startSpan(key, "remove");
256256
if (span == null) {
257257
return delegate.remove(key, oldValue);
258258
}
@@ -271,7 +271,7 @@ public boolean remove(final K key, final V oldValue) {
271271

272272
@Override
273273
public V getAndRemove(final K key) {
274-
final ISpan span = startSpan("cache.getAndRemove", key, "getAndRemove");
274+
final ISpan span = startSpan(key, "getAndRemove");
275275
if (span == null) {
276276
return delegate.getAndRemove(key);
277277
}
@@ -290,7 +290,7 @@ public V getAndRemove(final K key) {
290290

291291
@Override
292292
public void removeAll(final Set<? extends K> keys) {
293-
final ISpan span = startSpanForKeys("cache.removeAll", keys, "removeAll");
293+
final ISpan span = startSpanForKeys(keys, "removeAll");
294294
if (span == null) {
295295
delegate.removeAll(keys);
296296
return;
@@ -309,7 +309,7 @@ public void removeAll(final Set<? extends K> keys) {
309309

310310
@Override
311311
public void removeAll() {
312-
final ISpan span = startSpan("cache.removeAll", null, "removeAll");
312+
final ISpan span = startSpan(null, "removeAll");
313313
if (span == null) {
314314
delegate.removeAll();
315315
return;
@@ -330,7 +330,7 @@ public void removeAll() {
330330

331331
@Override
332332
public void clear() {
333-
final ISpan span = startSpan("cache.clear", null, "clear");
333+
final ISpan span = startSpan(null, "clear");
334334
if (span == null) {
335335
delegate.clear();
336336
return;
@@ -358,7 +358,7 @@ public void close() {
358358
public <T> T invoke(
359359
final K key, final EntryProcessor<K, V, T> entryProcessor, final Object... arguments)
360360
throws EntryProcessorException {
361-
final ISpan span = startSpan("cache.invoke", key, "invoke");
361+
final ISpan span = startSpan(key, "invoke");
362362
if (span == null) {
363363
return delegate.invoke(key, entryProcessor, arguments);
364364
}
@@ -380,7 +380,7 @@ public <T> Map<K, EntryProcessorResult<T>> invokeAll(
380380
final Set<? extends K> keys,
381381
final EntryProcessor<K, V, T> entryProcessor,
382382
final Object... arguments) {
383-
final ISpan span = startSpanForKeys("cache.invokeAll", keys, "invokeAll");
383+
final ISpan span = startSpanForKeys(keys, "invokeAll");
384384
if (span == null) {
385385
return delegate.invokeAll(keys, entryProcessor, arguments);
386386
}
@@ -453,9 +453,7 @@ public Iterator<Entry<K, V>> iterator() {
453453
// -- span helpers --
454454

455455
private @Nullable ISpan startSpan(
456-
final @NotNull String operation,
457-
final @Nullable Object key,
458-
final @NotNull String operationName) {
456+
final @Nullable Object key, final @NotNull String operationName) {
459457
if (!scopes.getOptions().isEnableCacheTracing()) {
460458
return null;
461459
}
@@ -468,7 +466,8 @@ public Iterator<Entry<K, V>> iterator() {
468466
final SpanOptions spanOptions = new SpanOptions();
469467
spanOptions.setOrigin(TRACE_ORIGIN);
470468
final String keyString = key != null ? String.valueOf(key) : null;
471-
final ISpan span = activeSpan.startChild(operation, keyString, spanOptions);
469+
final ISpan span =
470+
activeSpan.startChild("cache." + operationName, keyString, spanOptions);
472471
if (span.isNoOp()) {
473472
return null;
474473
}
@@ -480,9 +479,7 @@ public Iterator<Entry<K, V>> iterator() {
480479
}
481480

482481
private @Nullable ISpan startSpanForKeys(
483-
final @NotNull String operation,
484-
final @NotNull Set<?> keys,
485-
final @NotNull String operationName) {
482+
final @NotNull Set<?> keys, final @NotNull String operationName) {
486483
if (!scopes.getOptions().isEnableCacheTracing()) {
487484
return null;
488485
}
@@ -494,7 +491,8 @@ public Iterator<Entry<K, V>> iterator() {
494491

495492
final SpanOptions spanOptions = new SpanOptions();
496493
spanOptions.setOrigin(TRACE_ORIGIN);
497-
final ISpan span = activeSpan.startChild(operation, delegate.getName(), spanOptions);
494+
final ISpan span =
495+
activeSpan.startChild("cache." + operationName, delegate.getName(), spanOptions);
498496
if (span.isNoOp()) {
499497
return null;
500498
}

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
4242

4343
@Override
4444
public @Nullable ValueWrapper get(final @NotNull Object key) {
45-
final ISpan span = startSpan("cache.get", key, "get");
45+
final ISpan span = startSpan(key, "get");
4646
if (span == null) {
4747
return delegate.get(key);
4848
}
@@ -62,7 +62,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
6262

6363
@Override
6464
public @Nullable <T> T get(final @NotNull Object key, final @Nullable Class<T> type) {
65-
final ISpan span = startSpan("cache.get", key, "get");
65+
final ISpan span = startSpan(key, "get");
6666
if (span == null) {
6767
return delegate.get(key, type);
6868
}
@@ -83,7 +83,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
8383

8484
@Override
8585
public @Nullable <T> T get(final @NotNull Object key, final @NotNull Callable<T> valueLoader) {
86-
final ISpan span = startSpan("cache.get", key, "get");
86+
final ISpan span = startSpan(key, "get");
8787
if (span == null) {
8888
return delegate.get(key, valueLoader);
8989
}
@@ -110,7 +110,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
110110

111111
@Override
112112
public @Nullable CompletableFuture<?> retrieve(final @NotNull Object key) {
113-
final ISpan span = startSpan("cache.retrieve", key, "retrieve");
113+
final ISpan span = startSpan(key, "retrieve");
114114
if (span == null) {
115115
return delegate.retrieve(key);
116116
}
@@ -145,7 +145,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
145145
@Override
146146
public <T> CompletableFuture<T> retrieve(
147147
final @NotNull Object key, final @NotNull Supplier<CompletableFuture<T>> valueLoader) {
148-
final ISpan span = startSpan("cache.retrieve", key, "retrieve");
148+
final ISpan span = startSpan(key, "retrieve");
149149
if (span == null) {
150150
return delegate.retrieve(key, valueLoader);
151151
}
@@ -180,7 +180,7 @@ public <T> CompletableFuture<T> retrieve(
180180

181181
@Override
182182
public void put(final @NotNull Object key, final @Nullable Object value) {
183-
final ISpan span = startSpan("cache.put", key, "put");
183+
final ISpan span = startSpan(key, "put");
184184
if (span == null) {
185185
delegate.put(key, value);
186186
return;
@@ -200,7 +200,7 @@ public void put(final @NotNull Object key, final @Nullable Object value) {
200200
@Override
201201
public @Nullable ValueWrapper putIfAbsent(
202202
final @NotNull Object key, final @Nullable Object value) {
203-
final ISpan span = startSpan("cache.putIfAbsent", key, "putIfAbsent");
203+
final ISpan span = startSpan(key, "putIfAbsent");
204204
if (span == null) {
205205
return delegate.putIfAbsent(key, value);
206206
}
@@ -219,7 +219,7 @@ public void put(final @NotNull Object key, final @Nullable Object value) {
219219

220220
@Override
221221
public void evict(final @NotNull Object key) {
222-
final ISpan span = startSpan("cache.evict", key, "evict");
222+
final ISpan span = startSpan(key, "evict");
223223
if (span == null) {
224224
delegate.evict(key);
225225
return;
@@ -238,7 +238,7 @@ public void evict(final @NotNull Object key) {
238238

239239
@Override
240240
public boolean evictIfPresent(final @NotNull Object key) {
241-
final ISpan span = startSpan("cache.evictIfPresent", key, "evictIfPresent");
241+
final ISpan span = startSpan(key, "evictIfPresent");
242242
if (span == null) {
243243
return delegate.evictIfPresent(key);
244244
}
@@ -257,7 +257,7 @@ public boolean evictIfPresent(final @NotNull Object key) {
257257

258258
@Override
259259
public void clear() {
260-
final ISpan span = startSpan("cache.clear", null, "clear");
260+
final ISpan span = startSpan(null, "clear");
261261
if (span == null) {
262262
delegate.clear();
263263
return;
@@ -276,7 +276,7 @@ public void clear() {
276276

277277
@Override
278278
public boolean invalidate() {
279-
final ISpan span = startSpan("cache.invalidate", null, "invalidate");
279+
final ISpan span = startSpan(null, "invalidate");
280280
if (span == null) {
281281
return delegate.invalidate();
282282
}
@@ -294,9 +294,7 @@ public boolean invalidate() {
294294
}
295295

296296
private @Nullable ISpan startSpan(
297-
final @NotNull String operation,
298-
final @Nullable Object key,
299-
final @NotNull String operationName) {
297+
final @Nullable Object key, final @NotNull String operationName) {
300298
if (!scopes.getOptions().isEnableCacheTracing()) {
301299
return null;
302300
}
@@ -309,7 +307,8 @@ public boolean invalidate() {
309307
final SpanOptions spanOptions = new SpanOptions();
310308
spanOptions.setOrigin(TRACE_ORIGIN);
311309
final String keyString = key != null ? String.valueOf(key) : null;
312-
final ISpan span = activeSpan.startChild(operation, keyString, spanOptions);
310+
final ISpan span =
311+
activeSpan.startChild("cache." + operationName, keyString, spanOptions);
313312
if (span.isNoOp()) {
314313
return null;
315314
}

0 commit comments

Comments
 (0)