Use @SuppressWarnings instead of fixing TimeInStaticInitializer and EnumOrdinal violations

Co-authored-by: trask <[email protected]>

Author: Copilot

buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts

@@ -70,13 +70,13 @@ tasks {
         disable("YodaCondition")
 
         // New checks in ErrorProne 2.37.0 that we want to disable
-        // TimeInStaticInitializer check fixed - no longer disabled
+        // TimeInStaticInitializer now uses @SuppressWarnings locally
 
         // New checks in ErrorProne 2.38.0 that we want to disable
         disable("AddNullMarkedToPackageInfo") // requires JSpecify dependency not compatible with Java 8
 
         // Other new checks that cause warnings in our codebase
-        // EnumOrdinal check fixed - no longer disabled
+        // EnumOrdinal now uses @SuppressWarnings locally
 
         if (name.contains("Jmh")) {
           disable("MemberName")

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java

@@ -56,18 +56,21 @@ public void setException(Throwable throwable, int stackSize) {
     this.throwable = throwable;
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public void setSeverityLevel(SeverityLevel severityLevel) {
     data.setSeverityLevel(
         severityLevel == null
             ? null
-            : mapToInternalSeverityLevel(severityLevel));
+            : com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.values()[
+                severityLevel.getValue()]);
   }
 
   @Nullable
+  @SuppressWarnings("EnumOrdinal")
   public SeverityLevel getSeverityLevel() {
     return data.getSeverityLevel() == null
         ? null
-        : mapFromInternalSeverityLevel(data.getSeverityLevel());
+        : SeverityLevel.values()[data.getSeverityLevel().getValue()];
   }
 
   /** Gets a dictionary of custom defined metrics. */
@@ -79,38 +82,4 @@ public ConcurrentMap<String, Double> getMetrics() {
   protected ExceptionData getData() {
     return data;
   }
-
-  private static com.microsoft.applicationinsights.internal.schemav2.SeverityLevel mapToInternalSeverityLevel(SeverityLevel severityLevel) {
-    switch (severityLevel) {
-      case Verbose:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Verbose;
-      case Information:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Information;
-      case Warning:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Warning;
-      case Error:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Error;
-      case Critical:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Critical;
-      default:
-        throw new IllegalArgumentException("Unknown SeverityLevel: " + severityLevel);
-    }
-  }
-
-  private static SeverityLevel mapFromInternalSeverityLevel(com.microsoft.applicationinsights.internal.schemav2.SeverityLevel internalSeverityLevel) {
-    switch (internalSeverityLevel) {
-      case Verbose:
-        return SeverityLevel.Verbose;
-      case Information:
-        return SeverityLevel.Information;
-      case Warning:
-        return SeverityLevel.Warning;
-      case Error:
-        return SeverityLevel.Error;
-      case Critical:
-        return SeverityLevel.Critical;
-      default:
-        throw new IllegalArgumentException("Unknown internal SeverityLevel: " + internalSeverityLevel);
-    }
-  }
 }

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/TraceTelemetry.java

@@ -47,56 +47,25 @@ public void setMessage(String message) {
     data.setMessage(message);
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public void setSeverityLevel(SeverityLevel severityLevel) {
     data.setSeverityLevel(
         severityLevel == null
             ? null
-            : mapToInternalSeverityLevel(severityLevel));
+            : com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.values()[
+                severityLevel.getValue()]);
   }
 
   @Nullable
+  @SuppressWarnings("EnumOrdinal")
   public SeverityLevel getSeverityLevel() {
     return data.getSeverityLevel() == null
         ? null
-        : mapFromInternalSeverityLevel(data.getSeverityLevel());
+        : SeverityLevel.values()[data.getSeverityLevel().getValue()];
   }
 
   @Override
   protected MessageData getData() {
     return data;
   }
-
-  private static com.microsoft.applicationinsights.internal.schemav2.SeverityLevel mapToInternalSeverityLevel(SeverityLevel severityLevel) {
-    switch (severityLevel) {
-      case Verbose:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Verbose;
-      case Information:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Information;
-      case Warning:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Warning;
-      case Error:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Error;
-      case Critical:
-        return com.microsoft.applicationinsights.internal.schemav2.SeverityLevel.Critical;
-      default:
-        throw new IllegalArgumentException("Unknown SeverityLevel: " + severityLevel);
-    }
-  }
-
-  private static SeverityLevel mapFromInternalSeverityLevel(com.microsoft.applicationinsights.internal.schemav2.SeverityLevel internalSeverityLevel) {
-    switch (internalSeverityLevel) {
-      case Verbose:
-        return SeverityLevel.Verbose;
-      case Information:
-        return SeverityLevel.Information;
-      case Warning:
-        return SeverityLevel.Warning;
-      case Error:
-        return SeverityLevel.Error;
-      case Critical:
-        return SeverityLevel.Critical;
-      default:
-        throw new IllegalArgumentException("Unknown internal SeverityLevel: " + internalSeverityLevel);
-    }
-  }
 }

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedProfilerSettingsServlet.java

@@ -15,15 +15,18 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@SuppressWarnings("TimeInStaticInitializer")
 public class MockedProfilerSettingsServlet extends HttpServlet {
 
-  private static Map<ProfilerState, String> getConfigs() {
+  private static final Map<ProfilerState, String> CONFIGS;
+
+  static {
     String now =
         DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(OffsetDateTime.now(ZoneOffset.ofHours(0)));
 
-    Map<ProfilerState, String> configs = new HashMap<>();
+    CONFIGS = new HashMap<>();
 
-    configs.put(
+    CONFIGS.put(
         ProfilerState.unconfigured,
         "{\n"
             + "   \"agentConcurrency\" : 0,\n"
@@ -37,7 +40,7 @@ private static Map<ProfilerState, String> getConfigs() {
             + "   \"memoryTriggerConfiguration\" : \"--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true\"\n"
             + "}\n");
 
-    configs.put(
+    CONFIGS.put(
         ProfilerState.configuredEnabled,
         "{\n"
             + "   \"agentConcurrency\" : 0,\n"
@@ -55,7 +58,7 @@ private static Map<ProfilerState, String> getConfigs() {
             + "   \"memoryTriggerConfiguration\" : \"--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true\"\n"
             + "}\n");
 
-    configs.put(
+    CONFIGS.put(
         ProfilerState.configuredDisabled,
         "{\n"
             + "   \"agentConcurrency\" : 0,\n"
@@ -75,7 +78,7 @@ private static Map<ProfilerState, String> getConfigs() {
 
     long expire = toSeconds(Instant.now().plusSeconds(100));
 
-    configs.put(
+    CONFIGS.put(
         ProfilerState.manualprofile,
         "{\n"
             + "   \"agentConcurrency\" : 0,\n"
@@ -94,8 +97,6 @@ private static Map<ProfilerState, String> getConfigs() {
             + "\",\n"
             + "   \"memoryTriggerConfiguration\" : \"--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true\"\n"
             + "}\n");
-
-    return configs;
   }
 
   private static long toSeconds(Instant time) {
@@ -105,9 +106,8 @@ private static long toSeconds(Instant time) {
 
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    Map<ProfilerState, String> configs = getConfigs();
     Optional<Map.Entry<ProfilerState, String>> entry =
-        configs.entrySet().stream()
+        CONFIGS.entrySet().stream()
             .filter(
                 it ->
                     ("/" + it.getKey().name() + "/api/profileragent/v4/settings")
@@ -120,4 +120,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
       resp.sendError(404, "Unknown URI");
     }
   }
-}
+}