Skip to content

Commit 74f7b61

Browse files
committed
WIP
1 parent bc13b77 commit 74f7b61

2 files changed

Lines changed: 19 additions & 16 deletions

File tree

dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111

1212
class OpenTelemetrySmokeTest {
1313
private static final int TIMEOUT_SECONDS = 30;
14-
private static final File WORKING_DIRECTORY = new File(System.getProperty("datadog.smoketest.builddir"));
15-
private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.shadowJar.path");
14+
private static final File WORKING_DIRECTORY =
15+
new File(System.getProperty("datadog.smoketest.builddir"));
16+
private static final String APPLICATION_JAR =
17+
System.getProperty("datadog.smoketest.shadowJar.path");
1618

1719
@RegisterExtension
1820
static final SmokeApp app =
@@ -26,19 +28,19 @@ class OpenTelemetrySmokeTest {
2628

2729
@Test
2830
void receivesTraces() {
29-
app.traces().assertTraces(
30-
trace(span().root().operationName("Application.annotatedSpan")),
31-
trace(span().root().resourceName("span-0")),
32-
trace(span().root().resourceName("span-1")),
33-
trace(span().root().resourceName("span-2")),
34-
trace(span().root().resourceName("span-3")),
35-
trace(span().root().resourceName("span-4")),
36-
trace(span().root().resourceName("span-5")),
37-
trace(span().root().resourceName("span-6")),
38-
trace(span().root().resourceName("span-7")),
39-
trace(span().root().resourceName("span-8")),
40-
trace(span().root().resourceName("span-9"))
41-
);
31+
app.traces()
32+
.assertTraces(
33+
trace(span().root().operationName("Application.annotatedSpan")),
34+
trace(span().root().resourceName("span-0")),
35+
trace(span().root().resourceName("span-1")),
36+
trace(span().root().resourceName("span-2")),
37+
trace(span().root().resourceName("span-3")),
38+
trace(span().root().resourceName("span-4")),
39+
trace(span().root().resourceName("span-5")),
40+
trace(span().root().resourceName("span-6")),
41+
trace(span().root().resourceName("span-7")),
42+
trace(span().root().resourceName("span-8")),
43+
trace(span().root().resourceName("span-9")));
4244
app.assertCompletesWithValue(TIMEOUT_SECONDS, SECONDS, 0);
4345
}
4446
}

dd-smoke-tests/src/main/java/datadog/smoketest/SmokeApp.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.smoketest;
22

3+
import static datadog.trace.agent.test.utils.PortUtils.waitForPortToOpen;
34
import static java.util.concurrent.TimeUnit.SECONDS;
45

56
import datadog.smoketest.backend.TraceBackend;
@@ -215,7 +216,7 @@ public void beforeAll(ExtensionContext context) throws Exception {
215216
this.backend.start();
216217
launch();
217218
if (this.server) {
218-
PortUtils.waitForPortToOpen(this.httpPort, this.startupTimeoutSeconds, SECONDS, this.process);
219+
waitForPortToOpen(this.httpPort, this.startupTimeoutSeconds, SECONDS, this.process);
219220
} else if (!this.process.isAlive() && this.process.exitValue() != 0) {
220221
throw new IllegalStateException(
221222
"App '"

0 commit comments

Comments
 (0)