Skip to content

Fixing oversight of missing synchronized on long version of recalibrate #9480

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

Merged
dougqh merged 4 commits into from
Sep 8, 2025
Merged

Fixing oversight of missing synchronized on long version of recalibrate #9480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
890133b
Fixing oversight of missing synchronized on long version of recalibrate
dougqh Sep 5, 2025
f4fc788
Adding spotbugs suppression
dougqh Sep 5, 2025
497e65f
spotless
dougqh Sep 5, 2025
0522f88
Removing leftover SIZE variable
dougqh Sep 5, 2025
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
7 changes: 6 additions & 1 deletion dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import datadog.communication.serialization.EncodingCache;
import datadog.trace.common.writer.ddagent.SimpleUtf8Cache.CacheEntry;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.nio.charset.StandardCharsets;

/**
Expand Down Expand Up @@ -63,6 +64,10 @@
* calling ValueUtf8Cache#reclibrate will adjust promotion thresholds to
* provide better cache utilization.
*/
@SuppressFBWarnings(
value = "IS2_INCONSISTENT_SYNC",
justification =
"stat updates are deliberately racy - sync is only used to prevent simultaneous bulk updates")
public final class GenerationalUtf8Cache implements EncodingCache {
static final int MAX_EDEN_CAPACITY = 512;
static final int MAX_TENURED_CAPACITY = 1024;
Expand Down Expand Up @@ -156,7 +161,7 @@ public synchronized void recalibrate() {
*
* <p>While still racy this method is synchronized to avoid simultaneous recalibrations
*/
public void recalibrate(long accessTimeMs) {
public synchronized void recalibrate(long accessTimeMs) {
this.accessTimeMs = accessTimeMs;

recalibrate(this.edenEntries);
Expand Down
2 changes: 0 additions & 2 deletions dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ public final class SimpleUtf8Cache implements EncodingCache {

private static final int MAX_PROBES = 4;

private final int SIZE = 64;

private final int[] markers;
private final CacheEntry[] entries;

Expand Down