Skip to content

Fix flaky check raw file injection smoke test #10920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bm1549 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix flaky check raw file injection smoke test #10920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...oke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.function.Supplier;

public abstract class BaseApplication {
public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(10);
public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(30);

public abstract void doLog(String message);

Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
assert logLines[1].endsWith("- ${tagsPart} ${firstTraceId} ${firstSpanId} - INSIDE FIRST SPAN")
assert logLines[2].endsWith("- ${tagsPart} - AFTER FIRST SPAN") || logLines[2].endsWith("- ${tagsPart} 0 0 - AFTER FIRST SPAN")
assert logLines[3].endsWith("- ${tagsPart} ${secondTraceId} ${secondSpanId} - INSIDE SECOND SPAN")
assert logLines[4].endsWith("- - INSIDE THIRD SPAN") || logLines[0].endsWith("- 0 0 - INSIDE THIRD SPAN")
assert logLines[4].endsWith("- - INSIDE THIRD SPAN") || logLines[4].endsWith("- 0 0 - INSIDE THIRD SPAN")
assert logLines[5].endsWith("- ${tagsPart} ${forthTraceId} ${forthSpanId} - INSIDE FORTH SPAN")
assert logLines[6].endsWith("- ${tagsPart} - AFTER FORTH SPAN") || logLines[0].endsWith("- ${tagsPart} 0 0 - AFTER FORTH SPAN")
assert logLines[6].endsWith("- ${tagsPart} - AFTER FORTH SPAN") || logLines[6].endsWith("- ${tagsPart} 0 0 - AFTER FORTH SPAN")
return true
}

Expand Down
Loading