File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
main/java/datadog/trace/bootstrap
test/groovy/datadog/trace/agent Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 1
1
package datadog .trace .bootstrap ;
2
2
3
+ import datadog .environment .SystemProperties ;
3
4
import de .thetaphi .forbiddenapis .SuppressForbidden ;
4
5
import java .io .BufferedReader ;
5
6
import java .io .IOException ;
@@ -174,7 +175,7 @@ public static String getAgentVersion() throws IOException {
174
175
}
175
176
176
177
private static void checkProfilerEnv (final String [] args ) throws Exception {
177
- String tmpDir = args .length == 2 ? args [1 ] : System . getProperty ("java.io.tmpdir" );
178
+ String tmpDir = args .length == 2 ? args [1 ] : SystemProperties . get ("java.io.tmpdir" );
178
179
179
180
installAgentCLI ().getMethod ("checkProfilerEnv" , String .class ).invoke (null , tmpDir );
180
181
}
Original file line number Diff line number Diff line change @@ -55,15 +55,15 @@ class InitializationTelemetryTest extends Specification {
55
55
56
56
def " incomplete agent start-up" () {
57
57
// In this case, the SecurityManager blocks a custom permission that is checked by bytebuddy causing
58
- // agent initialization to fail. However, we should catch the exception allowing the application
58
+ // agent initialization to fail. However, we should catch the exception allowing the application
59
59
// to run normally.
60
60
when :
61
61
def result = InitializationTelemetryCheck . runTestJvm(InitializationTelemetryCheck.BlockByteBuddy )
62
62
63
63
then :
64
64
result. exitCode == 0
65
65
! result. telemetryJson. contains(' library_entrypoint.complete' )
66
- result. telemetryJson. contains(' error_type:java.lang.IllegalStateException ' )
66
+ result. telemetryJson. contains(' error_type:java.lang.reflect.InvocationTargetException ' )
67
67
}
68
68
69
69
def " block forwarder env var" () {
You can’t perform that action at this time.
0 commit comments