Skip to content
Open
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 @@ -31,6 +31,7 @@
import datadog.trace.api.datastreams.StatsPoint;
import datadog.trace.api.datastreams.TransactionInfo;
import datadog.trace.api.experimental.DataStreamsContextCarrier;
import datadog.trace.api.internal.VisibleForTesting;
import datadog.trace.api.time.TimeSource;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.Tags;
Expand Down Expand Up @@ -522,7 +523,8 @@ public void clear() {
timeToBucket.clear();
}

void report() {
@VisibleForTesting
public void report() {
inbox.offer(REPORT);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,11 @@ void measuredSpansDoNotContributeToTopLevelCount(
}
}

@TableTest({"scenario | count", "count = 10 | 10 ", "count = 100 | 100 "})
@TableTest({
"scenario | count",
"count = 10 | 10 ",
"count = 100 | 100 "
})
void aggregateRepetitiveSpans(int count) throws Exception {
MetricWriter writer = mock(MetricWriter.class);
Sink sink = mock(Sink.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,11 @@ void testOnCloseScope() throws InterruptedException {
verifyNoMoreInteractions(statsD);
}

@TableTest({"scenario | manual", "automatic | false ", "manual | true "})
@TableTest({
"scenario | manual",
"automatic | false ",
"manual | true "
})
@ParameterizedTest(name = "testOnScopeCloseError [{index}]")
void testOnScopeCloseError(boolean manual) throws InterruptedException {
CountDownLatch latch = new CountDownLatch(manual ? 2 : 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ void testStartInvocationFailure() {

@TableTest(
value = {
"scenario | expected | eHeaderValue | tIdHeaderValue | sIdHeaderValue | sPIdHeaderValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
"error with non-string result | true | 'true' | '1234' | '5678' | 2 | | true | 'request123' ",
"success with string result | true | | '1234' | '5678' | 2 | '12345 ' | false | 'request456' "
})
"scenario | expected | eHeaderValue | tIdHeaderValue | sIdHeaderValue | sPIdHeaderValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
"error with non-string result | true | 'true' | '1234' | '5678' | 2 | | true | 'request123' ",
"success with string result | true | | '1234' | '5678' | 2 | '12345 ' | false | 'request456' "
})
void testEndInvocationSuccess(
boolean expected,
String eHeaderValue,
Expand Down Expand Up @@ -177,10 +177,10 @@ void testEndInvocationSuccess(

@TableTest(
value = {
"scenario | expected | headerValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
"error with non-string result | false | 'true' | | true | 'request123' ",
"success with string result | false | | '12345' | false | 'request456' "
})
"scenario | expected | headerValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
"error with non-string result | false | 'true' | | true | 'request123' ",
"success with string result | false | | '12345' | false | 'request456' "
})
void testEndInvocationFailure(
boolean expected,
String headerValue,
Expand Down

This file was deleted.

206 changes: 0 additions & 206 deletions dd-trace-core/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy

This file was deleted.

Loading