Skip to content

Added a timestamp to protect logs from being overwritten on retries. #11213

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

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Apr 27, 2026
Merged

Added a timestamp to protect logs from being overwritten on retries. #11213

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
11 changes: 10 additions & 1 deletion dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import com.google.common.collect.ImmutableSet
import datadog.trace.agent.test.utils.PortUtils
import java.nio.file.Files
import java.nio.file.Paths
import java.time.Instant
import java.time.ZoneOffset
import java.time.format.DateTimeFormatter
import java.util.concurrent.TimeUnit
import spock.lang.AutoCleanup
import spock.lang.Shared
Expand All @@ -17,6 +20,8 @@ abstract class ProcessManager extends Specification {
public static final String ENV = "smoketest"
public static final String VERSION = "99"
public static final Set<String> NOISY_ENVIRONMENT_VARIABLES = ImmutableSet.of('CI_COMMIT_MESSAGE', 'CI_COMMIT_DESCRIPTION')
private static final DateTimeFormatter LOG_FILE_TIMESTAMP_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss.SSS", Locale.ROOT).withZone(ZoneOffset.UTC)

@Shared
protected String buildDirectory = System.getProperty("datadog.smoketest.builddir")
Expand Down Expand Up @@ -45,9 +50,13 @@ abstract class ProcessManager extends Specification {
@Shared
protected Process testedProcess

// Added a timestamp to protect logs from being overwritten on retries.
@Shared
private String logFileTimestamp = LOG_FILE_TIMESTAMP_FORMATTER.format(Instant.now())

@Shared
private String[] logFilePaths = (0..<numberOfProcesses).collect { idx ->
"${buildDirectory}/reports/testProcess.${this.getClass().getName()}.${idx}.log"
"${buildDirectory}/reports/testProcess.${this.getClass().getName()}.${logFileTimestamp}.${idx}.log"
}

// Here for backwards compatibility with single process case
Expand Down
Loading