Give AIKIDO_DEBUG precedent

Author: bitterpanda63

agent_api/src/main/java/dev/aikido/agent_api/helpers/logging/Logger.java

@@ -19,12 +19,7 @@ public Logger(Class<?> logClass) {
         this.logLevel = DEFAULT_LOG_LEVEL;
         this.logClass = logClass;
 
-        // We first check "AIKIDO_DEBUG", because "AIKIDO_LOG_LEVEL" takes precedent.
-        BooleanEnv aikidoDebug = new BooleanEnv("AIKIDO_DEBUG", false);
-        if (aikidoDebug.getValue()) {
-            this.logLevel = LogLevel.DEBUG;
-        }
-        // "AIKIDO_LOG_LEVEL"
+        // We first check "AIKIDO_LOG_LEVEL", because "AIKIDO_DEBUG" takes precedent.
         String logLevelString = System.getenv("AIKIDO_LOG_LEVEL");
         if (logLevelString != null) {
             try {
@@ -33,6 +28,11 @@ public Logger(Class<?> logClass) {
                 this.error("Unknown log level `%s`", logLevelString);
             }
         }
+        // "AIKIDO_DEBUG"
+        BooleanEnv aikidoDebug = new BooleanEnv("AIKIDO_DEBUG", false);
+        if (aikidoDebug.getValue()) {
+            this.logLevel = LogLevel.TRACE;
+        }
     }
     public Logger(Class<?> logClass, LogLevel logLevel) {
         this.logLevel = logLevel;

agent_api/src/test/java/helpers/LoggingTest.java

@@ -109,10 +109,10 @@ public void testLoggerIsAikidoDebug(StdOut out) {
     }
 
     @Test
-    @SetEnvironmentVariable(key = "AIKIDO_LOG_LEVEL", value = "trace")
+    @SetEnvironmentVariable(key = "AIKIDO_LOG_LEVEL", value = "error")
     @SetEnvironmentVariable(key = "AIKIDO_DEBUG", value = "true")
     @StdIo
-    public void testLogLevelTakesPrecedentOverAikidoDebug(StdOut out) {
+    public void testDebugEnvTakesPrecedent(StdOut out) {
         // Check it reads environment variable
         Logger logger = new Logger(FileCollector.class);
         logger.info("TEST1");