Skip to content

Commit 13d1c4b

Browse files
committed
Move SharedCommunicationObjects creation to InstallDatadogTracerCallback constructor
1 parent bf6ed5b commit 13d1c4b

File tree

1 file changed

+10
-11
lines changed
  • dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap

1 file changed

+10
-11
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -498,22 +498,13 @@ public void execute() {
498498
protected static class InstallDatadogTracerCallback extends ClassLoadCallBack {
499499
private final InitializationTelemetry initTelemetry;
500500
private final Instrumentation instrumentation;
501+
private final Object sco;
502+
private final Class<?> scoClass;
501503

502504
public InstallDatadogTracerCallback(
503505
InitializationTelemetry initTelemetry, Instrumentation instrumentation) {
504506
this.initTelemetry = initTelemetry;
505507
this.instrumentation = instrumentation;
506-
}
507-
508-
@Override
509-
public AgentThread agentThread() {
510-
return TRACE_STARTUP;
511-
}
512-
513-
@Override
514-
public void execute() {
515-
Object sco;
516-
Class<?> scoClass;
517508
try {
518509
scoClass =
519510
AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
@@ -525,7 +516,15 @@ public void execute() {
525516
| InvocationTargetException e) {
526517
throw new UndeclaredThrowableException(e);
527518
}
519+
}
520+
521+
@Override
522+
public AgentThread agentThread() {
523+
return TRACE_STARTUP;
524+
}
528525

526+
@Override
527+
public void execute() {
529528
installDatadogTracer(initTelemetry, scoClass, sco);
530529
maybeStartAppSec(scoClass, sco);
531530
maybeStartIast(instrumentation, scoClass, sco);

0 commit comments

Comments
 (0)