Fix: AIKIDO_BLOCK read out even if token not set

Author: bitterpanda63

agent/src/main/java/dev/aikido/agent/Agent.java

@@ -2,9 +2,11 @@
 
 import dev.aikido.agent.wrappers.*;
 import dev.aikido.agent_api.Config;
+import dev.aikido.agent_api.helpers.env.BlockingEnv;
 import dev.aikido.agent_api.helpers.env.BooleanEnv;
 import dev.aikido.agent_api.helpers.logging.LogManager;
 import dev.aikido.agent_api.helpers.logging.Logger;
+import dev.aikido.agent_api.storage.ServiceConfigStore;
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
@@ -42,7 +44,10 @@ public static void premain(String agentArgs, Instrumentation inst) {
             .installOn(inst);
 
         logger.info("Instrumentation installed.");
-        
+
+        // We want to load in the blocking value here, it's important that this happens regardless of the token.
+        ServiceConfigStore.updateBlocking(new BlockingEnv().getValue());
+
         startDaemon(agentArgs);
     }
     private static class AikidoTransformer {
@@ -63,4 +68,4 @@ private static void setAikidoSysProperties() {
         System.setProperty("AIK_agent_dir", pathToAikidoDirectory);
         System.setProperty("AIK_agent_api_jar", jarPath);
     }
-}
+}

agent_api/src/main/java/dev/aikido/agent_api/background/BackgroundProcess.java

@@ -38,7 +38,6 @@ public void run() {
         }
         logger.trace("Starting agent thread: %s", Thread.currentThread());
 
-        ServiceConfigStore.updateBlocking(new BlockingEnv().getValue());
         ReportingApiHTTP api = new ReportingApiHTTP(getAikidoAPIEndpoint(), API_TIMEOUT, token);
         RealtimeAPI realtimeApi = new RealtimeAPI(token);