Fix changelog

elastic · Apr 2, 2024 · 6028f74 · 6028f74
1 parent a10ecd4
commit 6028f74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java
@@ -163,7 +163,7 @@ public static void initialize(@Nullable final String agentArguments, final Instr
             // server log appender requires buffering log events before the config and reporter are ready.
             .withLifecycleListener(ApmServerLogAppender.getInstance().getInitListener())
             .build();
-        initInstrumentation(tracer, instrumentation, premain);
+        //initInstrumentation(tracer, instrumentation, premain);
         tracer.start(premain);
     }
 

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java
@@ -737,6 +737,7 @@ private synchronized void startSync() {
             return;
         }
         apmServerClient.start();
+        /*
         reporter.start();
         for (LifecycleListener lifecycleListener : lifecycleListeners) {
             try {
@@ -745,6 +746,7 @@ private synchronized void startSync() {
                 logger.error("Failed to start " + lifecycleListener.getClass().getName(), e);
             }
         }
+        */
         tracerState = TracerState.RUNNING;
         if (recordingConfigOptionSet) {
             logger.info("Tracer switched to RUNNING state");

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerClient.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerClient.java
@@ -114,7 +114,8 @@ public void onChange(ConfigurationOption<?> configurationOption, List<URL> oldVa
                 setServerUrls(reporterConfiguration.getServerUrls());
             }
         });
-        setServerUrls(Collections.unmodifiableList(shuffledUrls));
+        // TODO: why does this prevent duplicate logging?
+        // setServerUrls(Collections.unmodifiableList(shuffledUrls));
     }
 
     /**