feat(metrics): [Trace Metrics 24] PR Feedback

sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessor.java

@@ -12,7 +12,7 @@ public final class AndroidMetricsBatchProcessor extends MetricsBatchProcessor
     implements AppState.AppStateListener {
 
   public AndroidMetricsBatchProcessor(
-      @NotNull SentryOptions options, @NotNull ISentryClient client) {
+      final @NotNull SentryOptions options, final @NotNull ISentryClient client) {
     super(options, client);
     AppState.getInstance().addAppStateListener(this);
   }

sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessorFactory.java

@@ -9,7 +9,7 @@
 public final class AndroidMetricsBatchProcessorFactory implements IMetricsBatchProcessorFactory {
   @Override
   public @NotNull IMetricsBatchProcessor create(
-      @NotNull SentryOptions options, @NotNull SentryClient client) {
+      final @NotNull SentryOptions options, final @NotNull SentryClient client) {
     return new AndroidMetricsBatchProcessor(options, client);
   }
 }

sentry/src/main/java/io/sentry/SentryLogEvent.java

@@ -53,7 +53,7 @@ public void setTimestamp(final @NotNull Double timestamp) {
     return body;
   }
 
-  public void setBody(@NotNull String body) {
+  public void setBody(final @NotNull String body) {
     this.body = body;
   }
 
@@ -88,7 +88,7 @@ public void setAttribute(
     return severityNumber;
   }
 
-  public void setSeverityNumber(@Nullable Integer severityNumber) {
+  public void setSeverityNumber(final @Nullable Integer severityNumber) {
     this.severityNumber = severityNumber;
   }
 
@@ -120,7 +120,7 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
 
     if (unknown != null) {
       for (String key : unknown.keySet()) {
-        Object value = unknown.get(key);
+        final Object value = unknown.get(key);
         writer.name(key).value(logger, value);
       }
     }
@@ -185,29 +185,29 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
       reader.endObject();
 
       if (traceId == null) {
-        String message = "Missing required field \"" + JsonKeys.TRACE_ID + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TRACE_ID + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (timestamp == null) {
-        String message = "Missing required field \"" + JsonKeys.TIMESTAMP + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TIMESTAMP + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (body == null) {
-        String message = "Missing required field \"" + JsonKeys.BODY + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.BODY + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (level == null) {
-        String message = "Missing required field \"" + JsonKeys.LEVEL + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.LEVEL + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }

sentry/src/main/java/io/sentry/SentryLogEventAttributeValue.java

@@ -99,8 +99,8 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
       reader.endObject();
 
       if (type == null) {
-        String message = "Missing required field \"" + JsonKeys.TYPE + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TYPE + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }

sentry/src/main/java/io/sentry/SentryLogEvents.java

@@ -81,8 +81,8 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
       reader.endObject();
 
       if (items == null) {
-        String message = "Missing required field \"" + JsonKeys.ITEMS + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.ITEMS + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }

sentry/src/main/java/io/sentry/SentryMetricsEvent.java

@@ -79,39 +79,39 @@ public void setTimestamp(final @NotNull Double timestamp) {
     return name;
   }
 
-  public void setName(@NotNull String name) {
+  public void setName(final @NotNull String name) {
     this.name = name;
   }
 
   public @NotNull String getType() {
     return type;
   }
 
-  public void setType(@NotNull String type) {
+  public void setType(final @NotNull String type) {
     this.type = type;
   }
 
   public @Nullable String getUnit() {
     return unit;
   }
 
-  public void setUnit(@Nullable String unit) {
+  public void setUnit(final @Nullable String unit) {
     this.unit = unit;
   }
 
   public @Nullable SpanId getSpanId() {
     return spanId;
   }
 
-  public void setSpanId(@Nullable SpanId spanId) {
+  public void setSpanId(final @Nullable SpanId spanId) {
     this.spanId = spanId;
   }
 
   public @NotNull Double getValue() {
     return value;
   }
 
-  public void setValue(@NotNull Double value) {
+  public void setValue(final @NotNull Double value) {
     this.value = value;
   }
 
@@ -241,36 +241,36 @@ public static final class Deserializer implements JsonDeserializer<SentryMetrics
       reader.endObject();
 
       if (traceId == null) {
-        String message = "Missing required field \"" + JsonKeys.TRACE_ID + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TRACE_ID + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (timestamp == null) {
-        String message = "Missing required field \"" + JsonKeys.TIMESTAMP + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TIMESTAMP + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (type == null) {
-        String message = "Missing required field \"" + JsonKeys.TYPE + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.TYPE + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (name == null) {
-        String message = "Missing required field \"" + JsonKeys.NAME + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.NAME + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }
 
       if (value == null) {
-        String message = "Missing required field \"" + JsonKeys.VALUE + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.VALUE + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }

sentry/src/main/java/io/sentry/SentryMetricsEvents.java

@@ -81,8 +81,8 @@ public static final class Deserializer implements JsonDeserializer<SentryMetrics
       reader.endObject();
 
       if (items == null) {
-        String message = "Missing required field \"" + JsonKeys.ITEMS + "\"";
-        Exception exception = new IllegalStateException(message);
+        final String message = "Missing required field \"" + JsonKeys.ITEMS + "\"";
+        final Exception exception = new IllegalStateException(message);
         logger.log(SentryLevel.ERROR, message, exception);
         throw exception;
       }

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -3771,7 +3771,7 @@ public boolean isEnabled() {
      *
      * @param enableMetrics true if Sentry Metrics should be enabled
      */
-    public void setEnabled(boolean enableMetrics) {
+    public void setEnabled(final boolean enableMetrics) {
       this.enable = enableMetrics;
     }
 
@@ -3789,7 +3789,7 @@ public void setEnabled(boolean enableMetrics) {
      *
      * @param beforeSend the beforeSend callback for metrics
      */
-    public void setBeforeSend(@Nullable BeforeSendMetricCallback beforeSend) {
+    public void setBeforeSend(final @Nullable BeforeSendMetricCallback beforeSend) {
       this.beforeSend = beforeSend;
     }
 
@@ -3813,7 +3813,7 @@ public interface BeforeSendMetricCallback {
        * @return the original metric, mutated metric or null if metric was dropped
        */
       @Nullable
-      SentryMetricsEvent execute(@NotNull SentryMetricsEvent metric);
+      SentryMetricsEvent execute(final @NotNull SentryMetricsEvent metric);
     }
   }
 

sentry/src/main/java/io/sentry/metrics/DefaultMetricsBatchProcessorFactory.java

@@ -7,7 +7,7 @@
 public final class DefaultMetricsBatchProcessorFactory implements IMetricsBatchProcessorFactory {
   @Override
   public @NotNull IMetricsBatchProcessor create(
-      @NotNull SentryOptions options, @NotNull SentryClient client) {
+      final @NotNull SentryOptions options, final @NotNull SentryClient client) {
     return new MetricsBatchProcessor(options, client);
   }
 }

sentry/src/main/java/io/sentry/metrics/IMetricsBatchProcessor.java

@@ -9,7 +9,7 @@ public interface IMetricsBatchProcessor {
   void close(boolean isRestarting);
 
   /**
-   * Flushes log events.
+   * Flushes metrics.
    *
    * @param timeoutMillis time in milliseconds
    */

sentry/src/main/java/io/sentry/metrics/MetricsBatchProcessor.java

@@ -38,6 +38,7 @@ public class MetricsBatchProcessor implements IMetricsBatchProcessor {
   private static final @NotNull AutoClosableReentrantLock scheduleLock =
       new AutoClosableReentrantLock();
   private volatile boolean hasScheduled = false;
+  private volatile boolean isShuttingDown = false;
 
   private final @NotNull ReusableCountLatch pendingCount = new ReusableCountLatch();
 
@@ -51,6 +52,9 @@ public MetricsBatchProcessor(
 
   @Override
   public void add(final @NotNull SentryMetricsEvent metricsEvent) {
+    if (isShuttingDown) {
+      return;
+    }
     if (pendingCount.getCount() >= MAX_QUEUE_SIZE) {
       options
           .getClientReportRecorder()
@@ -65,6 +69,7 @@ public void add(final @NotNull SentryMetricsEvent metricsEvent) {
   @SuppressWarnings("FutureReturnValueIgnored")
   @Override
   public void close(final boolean isRestarting) {
+    isShuttingDown = true;
     if (isRestarting) {
       maybeSchedule(true, true);
       executorService.submit(() -> executorService.close(options.getShutdownTimeoutMillis()));