Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
bc42093
Trim per-span work on metrics aggregator publish path
dougqh May 15, 2026
808d63d
Add SpanKindFilter and CoreSpan.isKind for bitmask-based kind checks
dougqh May 15, 2026
6aa620e
Use SpanKindFilter in ConflatingMetricsAggregator
dougqh May 15, 2026
a02d0a9
Add DDSpan-based variant of ConflatingMetricsAggregator JMH benchmark
dougqh May 15, 2026
ed38f18
Tighten SpanKindFilter encapsulation
dougqh May 15, 2026
034afc0
Defer MetricKey construction and cache lookups to the aggregator thread
dougqh May 15, 2026
3a056b3
Report aggregator inbox-full drops via health metrics
dougqh May 15, 2026
3355865
Merge branch 'master' into dougqh/conflating-metrics-producer-wins
dougqh May 18, 2026
950499c
Merge branch 'dougqh/conflating-metrics-producer-wins' into dougqh/co…
dougqh May 18, 2026
0294058
Add Hashtable and LongHashingUtils to datadog.trace.util
dougqh May 18, 2026
f751ab4
Add AggregateTable + AggregateEntry backed by Hashtable
dougqh May 15, 2026
f1b030a
Swap LRUCache for AggregateTable in Aggregator + route disable() clear
dougqh May 15, 2026
3738c85
Eliminate MetricKey: inline its fields onto AggregateEntry
dougqh May 15, 2026
46a9055
Add unit tests for Hashtable and LongHashingUtils
dougqh May 18, 2026
031dc89
Apply spotless formatting to Hashtable and LongHashingUtils
dougqh May 18, 2026
f9e63b9
Add JMH benchmarks for Hashtable.D1 and D2
dougqh May 18, 2026
a534e4f
Add benchmark results to HashtableBenchmark header
dougqh May 18, 2026
ba66a36
Address review feedback on Hashtable
dougqh May 19, 2026
3108941
Fix dropped argument in HashingUtils 5-arg Object hash
dougqh May 19, 2026
1415f12
Address review feedback on Hashtable
dougqh May 19, 2026
b7cee2f
Drop reflection in iterator tests via package-private D1.buckets
dougqh May 19, 2026
8414960
Resize previousCounts for inbox-full health metric
dougqh May 19, 2026
553ffb8
Fold AggregateMetric into AggregateEntry
dougqh May 19, 2026
07ed635
Avoid capturing lambda in Aggregator.report
dougqh May 19, 2026
df58ad7
Add context-passing forEach to Hashtable.D1 and D2
dougqh May 19, 2026
9c6e95c
Move forEach loop body to Support helper
dougqh May 19, 2026
7ab47f7
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 19, 2026
590ab4a
Delegate AggregateTable.forEach to Support.forEach
dougqh May 19, 2026
447ea33
Move bucket-head cast to Support.bucket helper
dougqh May 19, 2026
46f147a
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 19, 2026
dd5e13f
Use Support.bucket and type chain walks as AggregateEntry
dougqh May 19, 2026
df7f98f
Drop d1_/d2_ prefix from per-table benchmark methods
dougqh May 19, 2026
e6ecc16
Add Hashtable.Support helpers: MAX_RATIO, insertHeadEntry, MutatingTa…
dougqh May 19, 2026
a409d5d
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 19, 2026
96b40b8
Simplify AggregateTable via new Hashtable.Support helpers
dougqh May 19, 2026
55ca204
Swap MAX_RATIO numerator/denominator pair for a single float + scaled…
dougqh May 19, 2026
7b9eccd
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 19, 2026
192de0c
Address second-round review on AggregateTable / Aggregator
dougqh May 19, 2026
4bac439
Tighten Hashtable docs + rename MAX_CAPACITY to MAX_BUCKETS
dougqh May 19, 2026
de289a0
Dedupe chain-head splice in D1/D2 via keyHash insertHeadEntry overload
dougqh May 19, 2026
2dd65ed
Tighten Entry.next encapsulation; doc hasNext; add D1/D2 getOrCreate
dougqh May 19, 2026
cc8d98a
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 19, 2026
6a9063b
Use keyHash insertHeadEntry overload in AggregateTable.findOrInsert
dougqh May 19, 2026
dbb1702
Replace // nullable comments with @Nullable annotations on AggregateE…
dougqh May 19, 2026
545e74c
Drop redundant load-factor comment from AggregateTable ctor
dougqh May 19, 2026
9983a59
Import java.util.Objects in AggregateEntry instead of fully qualifying
dougqh May 19, 2026
d2e4477
Document evictOneStale cost and disable() best-effort offer
dougqh May 19, 2026
24969db
Skip SpanSnapshot allocation when the inbox is already at capacity
dougqh May 19, 2026
66ec7f6
Hashtable: add missing braces and detach removed/replaced entries
dougqh May 20, 2026
be823ab
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 20, 2026
10956b2
Add Hashtable and LongHashingUtils to datadog.trace.util
dougqh May 18, 2026
035dc09
Add unit tests for Hashtable and LongHashingUtils
dougqh May 18, 2026
7728b60
Apply spotless formatting to Hashtable and LongHashingUtils
dougqh May 18, 2026
8cd2d86
Add JMH benchmarks for Hashtable.D1 and D2
dougqh May 18, 2026
c689ef9
Add benchmark results to HashtableBenchmark header
dougqh May 18, 2026
75790eb
Address review feedback on Hashtable
dougqh May 19, 2026
6056ff7
Fix dropped argument in HashingUtils 5-arg Object hash
dougqh May 19, 2026
da55021
Address review feedback on Hashtable
dougqh May 19, 2026
8b8b088
Drop reflection in iterator tests via package-private D1.buckets
dougqh May 19, 2026
0fde7cd
Add context-passing forEach to Hashtable.D1 and D2
dougqh May 19, 2026
6d6c2e0
Move forEach loop body to Support helper
dougqh May 19, 2026
268de2b
Move bucket-head cast to Support.bucket helper
dougqh May 19, 2026
93813b9
Drop d1_/d2_ prefix from per-table benchmark methods
dougqh May 19, 2026
11a58bf
Add Hashtable.Support helpers: MAX_RATIO, insertHeadEntry, MutatingTa…
dougqh May 19, 2026
8f1828d
Swap MAX_RATIO numerator/denominator pair for a single float + scaled…
dougqh May 19, 2026
c0d3e26
Tighten Hashtable docs + rename MAX_CAPACITY to MAX_BUCKETS
dougqh May 19, 2026
a0978ba
Dedupe chain-head splice in D1/D2 via keyHash insertHeadEntry overload
dougqh May 19, 2026
e604a8f
Tighten Entry.next encapsulation; doc hasNext; add D1/D2 getOrCreate
dougqh May 19, 2026
e2642cd
Hashtable: add missing braces and detach removed/replaced entries
dougqh May 20, 2026
585ca56
Rename LongHashingUtils.hashCodeX(Object) to hash(Object) for API con…
dougqh May 20, 2026
aab5b3b
Merge remote-tracking branch 'origin/master' into dougqh/optimize-met…
dougqh May 20, 2026
88f169f
Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key
dougqh May 20, 2026
795ba76
Merge remote-tracking branch 'origin/master' into dougqh/conflating-m…
dougqh May 20, 2026
e455801
Introduce slim PeerTagSchema; capture peer-tag values not pairs
dougqh May 20, 2026
c2ff012
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 20, 2026
e766fd3
Address PR #11381 review (round 2)
dougqh May 21, 2026
8cfa4a5
Cover inbox-full fast-path in ConflatingMetricsAggregator.publish
dougqh May 21, 2026
3644470
Reconcile PeerTagSchema once per reporting cycle on the aggregator th…
dougqh May 21, 2026
1d1ba4d
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
e7d0b42
Add bootstrap + reconcile coverage for PeerTagSchema
dougqh May 21, 2026
3d4f380
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
9391c48
Use writer.finishBucket() count in bootstrap test for cascade compati…
dougqh May 21, 2026
ba3225c
Use writer.finishBucket() count in bootstrap test for cascade compati…
dougqh May 21, 2026
ec857b2
Merge branch 'master' into dougqh/conflating-metrics-background-work
dougqh May 21, 2026
ba0d390
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
0b86066
Preserve TRACER_METRICS_MAX_PENDING semantic + drop stale imports
dougqh May 21, 2026
f71384e
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
5c78dbb
Add AdversarialMetricsBenchmark for capacity-bound stress testing
dougqh May 21, 2026
471f8f7
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
70c20ef
Trim AdversarialMetricsBenchmark counters and clarify printout
dougqh May 21, 2026
7a074e0
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
68848ad
Close PeerTagSchema reconcile race + cover the swap branch
dougqh May 21, 2026
3fa7ac7
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
df3b31d
Adapt reconcileSwapsSchemaWhenTagSetChanges to AggregateEntry shape
dougqh May 21, 2026
2ea61c5
Clarify materializePeerTags hit-counting loop
dougqh May 21, 2026
8ec956d
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
a606692
Fix MetricsIntegrationTest entry recording call site
dougqh May 21, 2026
913e7d7
Make ConflatingMetricAggregatorTest counter checks actually verify
dougqh May 21, 2026
2dcea9a
Drop dead recordDurations(int, AtomicLongArray) batch API
dougqh May 21, 2026
50b06e5
Warn about colon split in AggregateEntry.of test factory
dougqh May 21, 2026
b0f21bf
Add coverage for disable() -> ClearSignal threading path
dougqh May 21, 2026
5a4685f
Drop unused Tags imports flagged by codenarc
dougqh May 21, 2026
200028d
Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/…
dougqh May 21, 2026
a1863db
Update dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerT…
dougqh May 22, 2026
a75bc4a
Address sarahchen6's review pass
dougqh May 22, 2026
4871892
Clamp TRACER_METRICS_MAX_PENDING instead of throwing on overflow
dougqh May 22, 2026
5f73c2d
Fix duplicate-entry bug for null-fielded SpanSnapshots
dougqh May 22, 2026
9dddf0a
Clear dirty flag in ClearSignal handler
dougqh May 22, 2026
2c8ad26
Merge branch 'master' into dougqh/conflating-metrics-background-work
dougqh May 22, 2026
80778c4
Drop conditional null-skip from peer-tag hashing
dougqh May 22, 2026
21e7545
Delete dead Aggregator.clearAggregates()
dougqh May 22, 2026
877d95c
Cursor-resume eviction in AggregateTable via half-open MutatingTableI…
dougqh May 22, 2026
e2f2585
Move AggregateEntry.of() test factory out of production class
dougqh May 22, 2026
2536aa2
Fix AggregateEntry equals/hashCode contract violation
dougqh May 22, 2026
c0449a3
Don't trample queued STOP in ClearSignal handler
dougqh May 22, 2026
be13431
Implement PeerTagSchema.equals symmetric with hashCode
dougqh May 22, 2026
d174938
Route service and spanKind through canonicalize for null-safety
dougqh May 22, 2026
641b5ef
Suppress forbiddenApis for tearDown's System.err diagnostics
dougqh May 22, 2026
7eedb25
Merge branch 'master' into dougqh/conflating-metrics-background-work
dougqh May 22, 2026
ce5b38b
Use DDAgentFeaturesDiscovery.state() hash for PeerTagSchema reconcile
dougqh May 22, 2026
2eaa58f
Convert TRACER_METRICS_MAX_PENDING rationale to /* */ block comment
dougqh May 22, 2026
cd56981
Merge remote-tracking branch 'origin/dougqh/conflating-metrics-backgr…
dougqh May 22, 2026
d1df95e
Add cardinality-isolation companions to AdversarialMetricsBenchmark
dougqh May 22, 2026
4a4b72e
Merge remote-tracking branch 'origin/dougqh/conflating-metrics-backgr…
dougqh May 22, 2026
133d3c1
Consolidate contentEquals; remove redundant stringContentEquals
dougqh May 26, 2026
2ae738b
Rename AggregateEntries -> AggregateEntryFixtures
dougqh May 26, 2026
f68ad4f
Tidy PR-iteration history out of test comments
dougqh May 26, 2026
6fdc2de
Merge remote-tracking branch 'origin/master' into dougqh/optimize-met…
dougqh May 26, 2026
3f32dfd
Merge remote-tracking branch 'origin/master' into dougqh/optimize-met…
dougqh May 26, 2026
2d1536c
Make AggregateEntry.ERROR_TAG / TOP_LEVEL_TAG package-private
dougqh May 26, 2026
5bf4d90
Move AggregateEntry equality contract to test-only helper
dougqh May 26, 2026
a67ac23
Consolidate AggregateEntryFixtures into AggregateEntryTestUtils
dougqh May 26, 2026
1eb6826
Document deliberate cohesion + single-writer invariant on AggregateEntry
dougqh May 26, 2026
d5065f2
Avoid recomputing keyHash on AggregateTable miss
dougqh May 26, 2026
e6f2399
Document AggregateEntry.clear key-field persistence + SignalItem sing…
dougqh May 27, 2026
dcb1898
Drop useless @SuppressFBWarnings on AggregateEntry
dougqh May 27, 2026
a06c2a8
Update stale Javadoc on AggregateEntry's no-equals contract
dougqh May 27, 2026
acf2ffa
Tighten AggregateEntry / PeerTagSchema surface area
dougqh May 27, 2026
ccb4a4b
Tighten AggregateEntry surface — drop one-line factory, doc the conve…
dougqh May 27, 2026
d0c0be8
Merge branch 'master' into dougqh/optimize-metric-key
dougqh May 27, 2026
4af16c1
Drop unused UTF8BytesString import in MetricsIntegrationTest
dougqh May 27, 2026
dcd3407
Merge branch 'master' into dougqh/optimize-metric-key
dougqh May 27, 2026
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

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
package datadog.trace.common.metrics;

import datadog.trace.util.Hashtable;
import datadog.trace.util.Hashtable.MutatingTableIterator;
import datadog.trace.util.Hashtable.Support;
import java.util.function.BiConsumer;
import java.util.function.Consumer;

/**
* Consumer-side {@link AggregateEntry} store, keyed on the raw fields of a {@link SpanSnapshot}.
*
* <p>Replaces the prior {@code LRUCache<MetricKey, AggregateMetric>}. The win is on the
* steady-state hit path: a snapshot lookup is a 64-bit hash compute + bucket walk + field-wise
* {@code matches}, with no per-snapshot {@link AggregateEntry} allocation and no UTF8 cache
* lookups. The UTF8-encoded forms (formerly held on {@code MetricKey}) and the mutable counters
* (formerly held on {@code AggregateMetric}) both live on the {@link AggregateEntry} now, built
* once per unique key at insert time.
*
* <p><b>Not thread-safe.</b> The aggregator thread is the sole writer of both this table and its
* contained {@link AggregateEntry} state. Any cross-thread request that needs to mutate -- e.g.
* {@link ConflatingMetricsAggregator#disable()} -- must funnel onto the aggregator thread via the
* inbox (see the {@code ClearSignal} routing in {@link Aggregator}). The invariant is convention-
* enforced; nothing here checks the calling thread at runtime, so a wrong-thread call would corrupt
* bucket chains silently.
*/
final class AggregateTable {

private final Hashtable.Entry[] buckets;
private final int maxAggregates;
private int size;

/**
* Bucket index where the last {@link #evictOneStale} successfully removed an entry. The next call
* resumes from this bucket so a fast-evicting workload doesn't repeatedly re-walk the same hot
* entries clustered near bucket 0. Reset to {@code 0} by {@link #clear}.
*/
private int evictCursor;

AggregateTable(int maxAggregates) {
this.buckets = Support.create(maxAggregates, Support.MAX_RATIO);
this.maxAggregates = maxAggregates;
}

int size() {
return size;
}

boolean isEmpty() {
return size == 0;
}

/**
* Returns the {@link AggregateEntry} to update for {@code snapshot}, lazily creating one on miss.
* Returns {@code null} when the table is at capacity and no stale entry can be evicted -- the
* caller should drop the data point in that case.
*/
AggregateEntry findOrInsert(SpanSnapshot snapshot) {
long keyHash = AggregateEntry.hashOf(snapshot);
for (AggregateEntry candidate = Support.bucket(buckets, keyHash);
candidate != null;
candidate = candidate.next()) {
if (candidate.matches(keyHash, snapshot)) {
return candidate;
}
}
if (size >= maxAggregates && !evictOneStale()) {
return null;
}
AggregateEntry entry = new AggregateEntry(snapshot, keyHash);
Support.insertHeadEntry(buckets, keyHash, entry);
size++;
return entry;
}

/**
* Unlinks the first entry whose {@code getHitCount() == 0}, resuming the scan from {@link
* #evictCursor} so back-to-back evictions amortize to O(1) per call. Worst case for a single call
* is still O(N) when nearly every entry is hot, but a sustained eviction stream never re-scans
* the hot prefix more than twice across N evictions.
*
* <p>The semantic intent: at cap with all entries live, drop the new key (reported via {@code
* onStatsAggregateDropped}) rather than evicting an established one. Cap is sized to the
* steady-state working set, so eviction is rare; this cursor optimization handles the
* pathological "persistently at cap" case.
*/
private boolean evictOneStale() {
Comment thread
dougqh marked this conversation as resolved.
// Two passes -- [cursor, length) then [0, cursor) -- using the half-open-range iterator. The
// second pass is naturally empty when cursor==0, so no extra check needed.
return evictOneStaleInRange(evictCursor, buckets.length)
|| evictOneStaleInRange(0, evictCursor);
}

/** Scans {@code [startBucket, endBucket)} for the first stale entry and unlinks it. */
private boolean evictOneStaleInRange(int startBucket, int endBucket) {
MutatingTableIterator<AggregateEntry> iter =
Support.mutatingTableIterator(buckets, startBucket, endBucket);
while (iter.hasNext()) {
AggregateEntry e = iter.next();
if (e.getHitCount() == 0) {
int bucket = iter.currentBucket();
iter.remove();
size--;
evictCursor = bucket;
return true;
}
}
return false;
}

void forEach(Consumer<AggregateEntry> consumer) {
Support.forEach(buckets, consumer);
}

/**
* Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation on
* each invocation -- pass a non-capturing {@link BiConsumer} (typically a {@code static final})
* plus whatever side-band state it needs as {@code context}.
*/
<T> void forEach(T context, BiConsumer<T, AggregateEntry> consumer) {
Support.forEach(buckets, context, consumer);
}

/** Removes entries whose {@code getHitCount() == 0}. */
void expungeStaleAggregates() {
for (MutatingTableIterator<AggregateEntry> iter = Support.mutatingTableIterator(buckets);
iter.hasNext(); ) {
AggregateEntry e = iter.next();
if (e.getHitCount() == 0) {
iter.remove();
size--;
}
}
}

void clear() {
Support.clear(buckets);
size = 0;
evictCursor = 0;
}
}
Loading