fixup! feat: normalize benchmark mode to AverageTime under CodSpeed

Author: not-matthias

jmh-fork/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java

@@ -292,24 +292,22 @@ private Collection<RunResult> internalRun() throws RunnerException {
             boolean isInstrumented = InstrumentHooks.getInstance().isInstrumented();
             List<BenchmarkListEntry> newBenchmarks = new ArrayList<>();
             for (BenchmarkListEntry br : benchmarks) {
-                if (br.getMode() == Mode.All) {
-                    if (isInstrumented) {
-                        // CodSpeed: normalize Mode.All to AverageTime
+                if (isInstrumented) {
+                    // CodSpeed: normalize any mode to AverageTime
+                    if (br.getMode() != Mode.AverageTime) {
                         out.println("# CodSpeed: normalizing benchmark mode to AverageTime " +
-                            "(was: Mode.All) for " + br.getUsername() + ".");
-                        newBenchmarks.add(br.cloneWith(Mode.AverageTime));
-                    } else {
-                        // Standard JMH: expand Mode.All into all concrete modes
-                        for (Mode m : Mode.values()) {
-                            if (m == Mode.All) continue;
-                            newBenchmarks.add(br.cloneWith(m));
-                        }
+                            "(was: " + br.getMode() + ") for " + br.getUsername() + ".");
                     }
-                } else if (isInstrumented && br.getMode() != Mode.AverageTime) {
-                    // CodSpeed: normalize any non-AverageTime annotation mode to AverageTime
-                    out.println("# CodSpeed: normalizing benchmark mode to AverageTime " +
-                        "(was: " + br.getMode() + ") for " + br.getUsername() + ".");
                     newBenchmarks.add(br.cloneWith(Mode.AverageTime));
+                    continue;
+                }
+
+                // Standard JMH: expand Mode.All into all concrete modes
+                if (br.getMode() == Mode.All) {
+                    for (Mode m : Mode.values()) {
+                        if (m == Mode.All) continue;
+                        newBenchmarks.add(br.cloneWith(m));
+                    }
                 } else {
                     newBenchmarks.add(br);
                 }