Skip to content

Commit 5edb0ae

Browse files
committed
use privileged mode
1 parent e5871d3 commit 5edb0ae

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/OpenTelemetryAgent.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent;
77

8-
import io.opentelemetry.javaagent.bootstrap.AgentArgUtil;
98
import io.opentelemetry.javaagent.bootstrap.AgentInitializer;
109
import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder;
1110
import io.opentelemetry.javaagent.bootstrap.JavaagentFileHolder;
@@ -54,11 +53,10 @@ public static void agentmain(String agentArgs, Instrumentation inst) {
5453
private static void startAgent(
5554
Instrumentation inst, @Nullable String agentArgs, boolean fromPremain) {
5655
try {
57-
AgentArgUtil.setSystemProperties(agentArgs);
5856
File javaagentFile = installBootstrapJar(inst);
5957
InstrumentationHolder.setInstrumentation(inst);
6058
JavaagentFileHolder.setJavaagentFile(javaagentFile);
61-
AgentInitializer.initialize(inst, javaagentFile, fromPremain);
59+
AgentInitializer.initialize(inst, javaagentFile, fromPremain, agentArgs);
6260
} catch (Throwable ex) {
6361
// Don't rethrow. We don't have a log manager here, so just print.
6462
System.err.println("ERROR " + OpenTelemetryAgent.class.getName());

javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,19 @@ public final class AgentInitializer {
2828
private static boolean isSecurityManagerSupportEnabled = false;
2929
private static volatile boolean agentStarted = false;
3030

31-
public static void initialize(Instrumentation inst, File javaagentFile, boolean fromPremain)
31+
public static void initialize(
32+
Instrumentation inst, File javaagentFile, boolean fromPremain, String agentArgs)
3233
throws Exception {
3334
if (agentClassLoader != null) {
3435
return;
3536
}
3637

38+
doPrivileged(
39+
() -> {
40+
AgentArgUtil.setSystemProperties(agentArgs);
41+
return null;
42+
});
43+
3744
// we expect that at this point agent jar has been appended to boot class path and all agent
3845
// classes are loaded in boot loader
3946
if (AgentInitializer.class.getClassLoader() != null) {

0 commit comments

Comments
 (0)