Skip to content

Commit 7adc071

Browse files
committed
Skipping crash tracking on OS X
1 parent 7e114b3 commit 7adc071

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,12 @@ abstract class AbstractSmokeTest extends ProcessManager {
133133
def javaProperties() {
134134
def tmpDir = "/tmp"
135135
def errorFileValue = tmpDir + "/hs_err_pid%p.log"
136-
def errorScript = tmpDir + "/dd_crash_uploader." + getScriptExtension()
137-
def onErrorValue = '"' + errorScript + ' %p"'
138136

139137
def ret = [
140138
"${getMaxMemoryArgumentForFork()}",
141139
"${getMinMemoryArgumentForFork()}",
142140
"-javaagent:${shadowJarPath}",
143141
isIBM ? "-Xdump:directory=" + tmpDir : "-XX:ErrorFile=" + errorFileValue,
144-
"-XX:OnError=" + onErrorValue,
145142
"-Ddd.trace.agent.port=${server.address.port}",
146143
"-Ddd.env=${ENV}",
147144
"-Ddd.version=${VERSION}",
@@ -155,6 +152,17 @@ abstract class AbstractSmokeTest extends ProcessManager {
155152
"-Dorg.slf4j.simpleLogger.defaultLogLevel=${logLevel()}",
156153
"-Ddd.site="
157154
]
155+
156+
157+
// DQH - 13 Nov 2024 - Crashtracking bash script oesn't work on OS X,
158+
// so skipping crash tracking on OS X
159+
if (!Platform.isMac()) {
160+
def errorScript = tmpDir + "/dd_crash_uploader." + getScriptExtension()
161+
def onErrorValue = '"' + errorScript + ' %p"'
162+
163+
ret += "-XX:OnError=" + onErrorValue
164+
}
165+
158166
if (inferServiceName()) {
159167
ret += "-Ddd.service.name=${SERVICE_NAME}"
160168
}

0 commit comments

Comments
 (0)