Skip to content

Commit abcd3c1

Browse files
committed
Migrate dd-trace-core groovy files to java part 6
we migrate 6 tests - PendingTracerBufferTest - PendingTraceStrictWriteTest - PendingTraceTest - PendingTraceTestBase - TraceInterceptorTest - TracingConfigPollerTest
1 parent 3bca1f0 commit abcd3c1

17 files changed

Lines changed: 1775 additions & 1652 deletions

dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ public List<DDSpan> firstTrace() {
3333
return get(0);
3434
}
3535

36+
public int getTraceCount() {
37+
return traceCount.get();
38+
}
39+
3640
@SuppressFBWarnings("NN_NAKED_NOTIFY")
3741
@Override
3842
public void write(List<DDSpan> trace) {

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,6 +1391,11 @@ public String getSpanId(AgentSpan span) {
13911391
return "0";
13921392
}
13931393

1394+
// @VisibleForTesting
1395+
TraceInterceptors getInterceptors() {
1396+
return interceptors;
1397+
}
1398+
13941399
@Override
13951400
public boolean addTraceInterceptor(final TraceInterceptor interceptor) {
13961401
TraceInterceptor conflictingInterceptor = interceptors.add(interceptor);

dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ static DDSpan create(
125125
* @param timestampMicro if greater than zero, use this time instead of the current time
126126
* @param context the context used for the span
127127
*/
128-
private DDSpan(
128+
// @VisibleForTesting
129+
DDSpan(
129130
@Nonnull String instrumentationName,
130131
final long timestampMicro,
131132
@Nonnull DDSpanContext context,
@@ -680,6 +681,11 @@ public long getDurationNano() {
680681
return durationNano;
681682
}
682683

684+
// @VisibleForTesting
685+
void setDurationNano(long duration) {
686+
DURATION_NANO_UPDATER.set(this, duration);
687+
}
688+
683689
@Override
684690
public String getServiceName() {
685691
return context.getServiceName();

dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ public PendingTrace create(@Nonnull DDTraceId traceId, ConfigSnapshot traceConfi
139139
private static final AtomicLongFieldUpdater<PendingTrace> LAST_REFERENCED =
140140
AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "lastReferenced");
141141

142-
private PendingTrace(
142+
// @VisibleForTesting
143+
PendingTrace(
143144
@Nonnull CoreTracer tracer,
144145
@Nonnull DDTraceId traceId,
145146
@Nonnull PendingTraceBuffer pendingTraceBuffer,
@@ -238,6 +239,26 @@ int getPendingReferenceCount() {
238239
return pendingReferenceCount;
239240
}
240241

242+
// @VisibleForTesting
243+
PendingTraceBuffer getPendingTraceBuffer() {
244+
return pendingTraceBuffer;
245+
}
246+
247+
// @VisibleForTesting
248+
DDTraceId getTraceId() {
249+
return traceId;
250+
}
251+
252+
// @VisibleForTesting
253+
boolean isRootSpanWritten() {
254+
return rootSpanWritten;
255+
}
256+
257+
// @VisibleForTesting
258+
int getIsEnqueued() {
259+
return isEnqueued;
260+
}
261+
241262
boolean empty() {
242263
return 0 >= COMPLETED_SPAN_COUNT.get(this) + PENDING_REFERENCE_COUNT.get(this);
243264
}

dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,16 @@ public DelayingPendingTraceBuffer(
308308
LongRunningTracesTracker getRunningTracesTracker() {
309309
return runningTracesTracker;
310310
}
311+
312+
// @VisibleForTesting
313+
Thread getWorker() {
314+
return worker;
315+
}
316+
317+
// @VisibleForTesting
318+
MessagePassingBlockingQueue<Element> getQueue() {
319+
return queue;
320+
}
311321
}
312322

313323
static class DiscardingPendingTraceBuffer extends PendingTraceBuffer {

0 commit comments

Comments
 (0)