[Logs 11] Add severityNumber to SentryLogEvent (#4391)

* Add Log feature to Java SDK

* Rate limit for log items

* Add options for logs

* Add batch processor for logs

* Use a separate ExecutorService for log batching

* Reduce locking when log event is created

* Add system tests for Logs

* Separate enum for SentryLogLevel

* Remove logsSampleRate option

* Move logs options out of experimental namespace

* Add severity_number to SentryLogItem

Author: adinauer

sentry/api/sentry.api

@@ -3043,12 +3043,14 @@ public final class io/sentry/SentryLogEvent : io/sentry/JsonSerializable, io/sen
 	public fun getAttributes ()Ljava/util/Map;
 	public fun getBody ()Ljava/lang/String;
 	public fun getLevel ()Lio/sentry/SentryLogLevel;
+	public fun getSeverityNumber ()Ljava/lang/Integer;
 	public fun getTimestamp ()Ljava/lang/Double;
 	public fun getUnknown ()Ljava/util/Map;
 	public fun serialize (Lio/sentry/ObjectWriter;Lio/sentry/ILogger;)V
 	public fun setAttributes (Ljava/util/Map;)V
 	public fun setBody (Ljava/lang/String;)V
 	public fun setLevel (Lio/sentry/SentryLogLevel;)V
+	public fun setSeverityNumber (Ljava/lang/Integer;)V
 	public fun setTimestamp (Ljava/lang/Double;)V
 	public fun setUnknown (Ljava/util/Map;)V
 }
@@ -3063,6 +3065,7 @@ public final class io/sentry/SentryLogEvent$JsonKeys {
 	public static final field ATTRIBUTES Ljava/lang/String;
 	public static final field BODY Ljava/lang/String;
 	public static final field LEVEL Ljava/lang/String;
+	public static final field SEVERITY_NUMBER Ljava/lang/String;
 	public static final field TIMESTAMP Ljava/lang/String;
 	public static final field TRACE_ID Ljava/lang/String;
 	public fun <init> ()V

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

@@ -16,6 +16,7 @@ public final class SentryLogEvent implements JsonUnknown, JsonSerializable {
   private @NotNull Double timestamp;
   private @NotNull String body;
   private @NotNull SentryLogLevel level;
+  private @Nullable Integer severityNumber;
 
   private @Nullable Map<String, SentryLogEventAttributeValue> attributes;
   private @Nullable Map<String, Object> unknown;
@@ -72,11 +73,20 @@ public void setAttributes(final @Nullable Map<String, SentryLogEventAttributeVal
     this.attributes = attributes;
   }
 
+  public @Nullable Integer getSeverityNumber() {
+    return severityNumber;
+  }
+
+  public void setSeverityNumber(@Nullable Integer severityNumber) {
+    this.severityNumber = severityNumber;
+  }
+
   // region json
   public static final class JsonKeys {
     public static final String TIMESTAMP = "timestamp";
     public static final String TRACE_ID = "trace_id";
     public static final String LEVEL = "level";
+    public static final String SEVERITY_NUMBER = "severity_number";
     public static final String BODY = "body";
     public static final String ATTRIBUTES = "attributes";
   }
@@ -90,6 +100,9 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
     writer.name(JsonKeys.TRACE_ID).value(logger, traceId);
     writer.name(JsonKeys.BODY).value(body);
     writer.name(JsonKeys.LEVEL).value(logger, level);
+    if (severityNumber != null) {
+      writer.name(JsonKeys.SEVERITY_NUMBER).value(logger, severityNumber);
+    }
     if (attributes != null) {
       writer.name(JsonKeys.ATTRIBUTES).value(logger, attributes);
     }
@@ -124,6 +137,7 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
       @Nullable Double timestamp = null;
       @Nullable String body = null;
       @Nullable SentryLogLevel level = null;
+      @Nullable Integer severityNumber = null;
       @Nullable Map<String, SentryLogEventAttributeValue> attributes = null;
 
       reader.beginObject();
@@ -142,6 +156,9 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
           case JsonKeys.LEVEL:
             level = reader.nextOrNull(logger, new SentryLogLevel.Deserializer());
             break;
+          case JsonKeys.SEVERITY_NUMBER:
+            severityNumber = reader.nextIntegerOrNull();
+            break;
           case JsonKeys.ATTRIBUTES:
             attributes =
                 reader.nextMapOrNull(logger, new SentryLogEventAttributeValue.Deserializer());
@@ -187,6 +204,7 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
       final SentryLogEvent logEvent = new SentryLogEvent(traceId, timestamp, body, level);
 
       logEvent.setAttributes(attributes);
+      logEvent.setSeverityNumber(severityNumber);
       logEvent.setUnknown(unknown);
 
       return logEvent;

sentry/src/main/java/io/sentry/logger/LoggerApi.java

@@ -116,6 +116,7 @@ private void captureLog(
       final SentryLogEvent logEvent =
           new SentryLogEvent(traceId, timestampToUse, messageToUse, level);
       logEvent.setAttributes(createAttributes(message, spanId, args));
+      logEvent.setSeverityNumber(level.getSeverityNumber());
 
       scopes.getClient().captureLog(logEvent, scopes.getCombinedScopeView(), hint);
     } catch (Throwable e) {

sentry/src/test/java/io/sentry/protocol/SentryLogsSerializationTest.kt

@@ -34,6 +34,7 @@ class SentryLogsSerializationTest {
                         "sentry.sdk.version" to SentryLogEventAttributeValue("string", "8.11.1"),
                         "sentry.trace.parent_span_id" to SentryLogEventAttributeValue("string", "f28b86350e534671")
                     )
+                    it.severityNumber = 10
                 }
             )
         )

sentry/src/test/resources/json/sentry_logs.json

@@ -6,6 +6,7 @@
       "trace_id": "5c1f73d39486827b9e60ceb1fc23277a",
       "body": "42e6bd2a-c45e-414d-8066-ed5196fbc686",
       "level": "info",
+      "severity_number": 10,
       "attributes":
       {
         "sentry.sdk.name":