Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public void methodAdvice(MethodTransformer transformer) {
@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".Target_datadog_jctools_counters_FixedSizeStripedLongCounterFields",
packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
packageName + ".Target_org_datadog_jmxfetch_App",
packageName + ".Target_org_datadog_jmxfetch_Status",
Expand All @@ -51,7 +50,6 @@ public String[] muzzleIgnoredClassNames() {
"jdk.vm.ci.meta.ResolvedJavaType",
"jdk.vm.ci.meta.ResolvedJavaField",
// ignore helper class names as usual
packageName + ".Target_datadog_jctools_counters_FixedSizeStripedLongCounterFields",
packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
packageName + ".Target_org_datadog_jmxfetch_App",
packageName + ".Target_org_datadog_jmxfetch_Status",
Expand All @@ -62,7 +60,6 @@ public String[] muzzleIgnoredClassNames() {
public static class FindTargetClassesAdvice {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void onExit(@Advice.Return(readOnly = false) List<Class<?>> result) {
result.add(Target_datadog_jctools_counters_FixedSizeStripedLongCounterFields.class);
result.add(Target_datadog_jctools_util_UnsafeRefArrayAccess.class);
result.add(Target_org_datadog_jmxfetch_App.class);
result.add(Target_org_datadog_jmxfetch_Status.class);
Expand Down

This file was deleted.

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

import static java.util.concurrent.TimeUnit.MICROSECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;

import de.thetaphi.forbiddenapis.SuppressForbidden;
import java.util.concurrent.atomic.LongAdder;
import org.jctools.counters.CountersFactory;
import org.jctools.counters.FixedSizeStripedLongCounter;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.Threads;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;

/*
* Benchmark Mode Cnt Score Error Units
* LongAdderBenchmark.benchLongAdderIncrement avgt 0.009 us/op
* LongAdderBenchmark.benchLongAdderSum avgt 0.297 us/op
* LongAdderBenchmark.benchStripedCounterIncrement avgt 0.071 us/op
* LongAdderBenchmark.benchStripedCounterSum avgt 0.425 us/op
*/
@State(Scope.Benchmark)
@Warmup(iterations = 1, time = 30, timeUnit = SECONDS)
@Measurement(iterations = 1, time = 30, timeUnit = SECONDS)
@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(MICROSECONDS)
@Fork(value = 1)
@SuppressForbidden
public class LongAdderBenchmark {
public final LongAdder adder = new LongAdder();
public final FixedSizeStripedLongCounter counter =
CountersFactory.createFixedSizeStripedCounter(8);

@Benchmark
@Threads(Threads.MAX)
public void benchLongAdderIncrement(Blackhole blackhole) {
adder.increment();
}

@Benchmark
@Threads(Threads.MAX)
public void benchStripedCounterIncrement(Blackhole blackhole) {
counter.inc();
}

@Benchmark
@Threads(Threads.MAX)
public void benchLongAdderSum(Blackhole blackhole) {
adder.increment();
blackhole.consume(adder.sum());
}

@Benchmark
@Threads(Threads.MAX)
public void benchStripedCounterSum(Blackhole blackhole) {
counter.inc();
blackhole.consume(counter.get());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.jctools.counters.CountersFactory;
import org.jctools.counters.FixedSizeStripedLongCounter;
import java.util.concurrent.atomic.LongAdder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -30,10 +29,8 @@ public class PayloadDispatcherImpl implements ByteBufferConsumer, PayloadDispatc
private RemoteMapper mapper;
private WritableFormatter packer;

private final FixedSizeStripedLongCounter droppedSpanCount =
CountersFactory.createFixedSizeStripedCounter(8);
private final FixedSizeStripedLongCounter droppedTraceCount =
CountersFactory.createFixedSizeStripedCounter(8);
private final LongAdder droppedSpanCount = new LongAdder();
private final LongAdder droppedTraceCount = new LongAdder();

public PayloadDispatcherImpl(
RemoteMapperDiscovery mapperDiscovery,
Expand All @@ -60,8 +57,8 @@ public Collection<RemoteApi> getApis() {

@Override
public void onDroppedTrace(int spanCount) {
droppedSpanCount.inc(spanCount);
droppedTraceCount.inc();
droppedSpanCount.add(spanCount);
droppedTraceCount.increment();
}

@Override
Expand Down Expand Up @@ -97,8 +94,8 @@ Payload newPayload(int messageCount, ByteBuffer buffer) {
return mapper
.newPayload()
.withBody(messageCount, buffer)
.withDroppedSpans(droppedSpanCount.getAndReset())
.withDroppedTraces(droppedTraceCount.getAndReset());
.withDroppedSpans(droppedSpanCount.sumThenReset())
.withDroppedTraces(droppedTraceCount.sumThenReset());
}

@Override
Expand Down
Loading