Merge 8b1b62b into f274c79

getsentry · Jul 5, 2023 · 7954f77 · 7954f77
2 parents f274c79 + 8b1b62b
commit 7954f77
Show file tree

Hide file tree

Showing 60 changed files with 830 additions and 192 deletions.
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
diff --git a/sentry/src/main/java/io/sentry/Breadcrumb.java b/sentry/src/main/java/io/sentry/Breadcrumb.java
@@ -561,8 +561,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.TIMESTAMP).value(logger, timestamp);
     if (message != null) {

diff --git a/sentry/src/main/java/io/sentry/InternalSentrySdk.java b/sentry/src/main/java/io/sentry/InternalSentrySdk.java
@@ -0,0 +1,39 @@
+package io.sentry;
+
+import io.sentry.util.MapObjectWriter;
+import java.util.HashMap;
+import java.util.Map;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@ApiStatus.Internal
+public final class InternalSentrySdk {
+
+  @NotNull
+  public static Map<String, Object> serializeScope(@Nullable Scope scope) {
+    final @NotNull Map<String, Object> data = new HashMap<>();
+    if (scope == null) {
+      return data;
+    }
+
+    final @NotNull SentryOptions options = scope.getOptions();
+    final @NotNull ILogger logger = options.getLogger();
+    final @NotNull ObjectWriter writer = new MapObjectWriter(data);
+
+    try {
+      writer.name("user").value(logger, scope.getUser());
+      writer.name("contexts").value(logger, scope.getContexts());
+      writer.name("tags").value(logger, scope.getTags());
+      writer.name("extras").value(logger, scope.getExtras());
+      writer.name("fingerprint").value(logger, scope.getFingerprint());
+      writer.name("level").value(logger, scope.getLevel());
+      writer.name("breadcrumbs").value(logger, scope.getBreadcrumbs());
+    } catch (Exception e) {
+      options.getLogger().log(SentryLevel.ERROR, "Could not serialize scope.", e);
+      return new HashMap<>();
+    }
+
+    return data;
+  }
+}
diff --git a/sentry/src/main/java/io/sentry/JsonObjectSerializer.java b/sentry/src/main/java/io/sentry/JsonObjectSerializer.java
@@ -33,7 +33,7 @@ public JsonObjectSerializer(int maxDepth) {
   }
 
   public void serialize(
-      @NotNull JsonObjectWriter writer, @NotNull ILogger logger, @Nullable Object object)
+      @NotNull ObjectWriter writer, @NotNull ILogger logger, @Nullable Object object)
       throws IOException {
     if (object == null) {
       writer.nullValue();
@@ -89,7 +89,7 @@ public void serialize(
   // Helper
 
   private void serializeDate(
-      @NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull Date date)
+      @NotNull ObjectWriter writer, @NotNull ILogger logger, @NotNull Date date)
       throws IOException {
     try {
       writer.value(DateUtils.getTimestamp(date));
@@ -100,7 +100,7 @@ private void serializeDate(
   }
 
   private void serializeTimeZone(
-      @NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull TimeZone timeZone)
+      @NotNull ObjectWriter writer, @NotNull ILogger logger, @NotNull TimeZone timeZone)
       throws IOException {
     try {
       writer.value(timeZone.getID());
@@ -111,7 +111,7 @@ private void serializeTimeZone(
   }
 
   private void serializeCollection(
-      @NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull Collection<?> collection)
+      @NotNull ObjectWriter writer, @NotNull ILogger logger, @NotNull Collection<?> collection)
       throws IOException {
     writer.beginArray();
     for (Object object : collection) {
@@ -121,7 +121,7 @@ private void serializeCollection(
   }
 
   private void serializeMap(
-      @NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull Map<?, ?> map)
+      @NotNull ObjectWriter writer, @NotNull ILogger logger, @NotNull Map<?, ?> map)
       throws IOException {
     writer.beginObject();
     for (Object key : map.keySet()) {

diff --git a/sentry/src/main/java/io/sentry/JsonObjectWriter.java b/sentry/src/main/java/io/sentry/JsonObjectWriter.java
@@ -6,18 +6,85 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public final class JsonObjectWriter extends JsonWriter {
+public final class JsonObjectWriter implements ObjectWriter {
 
+  private final JsonWriter jsonWriter;
   private final JsonObjectSerializer jsonObjectSerializer;
 
   public JsonObjectWriter(Writer out, int maxDepth) {
-    super(out);
+    jsonWriter = new JsonWriter(out);
     jsonObjectSerializer = new JsonObjectSerializer(maxDepth);
   }
 
+  @Override
+  public JsonObjectWriter beginArray() throws IOException {
+    jsonWriter.beginArray();
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter endArray() throws IOException {
+    jsonWriter.endArray();
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter beginObject() throws IOException {
+    jsonWriter.beginObject();
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter endObject() throws IOException {
+    jsonWriter.endObject();
+    return this;
+  }
+
   @Override
   public JsonObjectWriter name(String name) throws IOException {
-    super.name(name);
+    jsonWriter.name(name);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(String value) throws IOException {
+    jsonWriter.value(value);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter nullValue() throws IOException {
+    jsonWriter.nullValue();
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(boolean value) throws IOException {
+    jsonWriter.value(value);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(Boolean value) throws IOException {
+    jsonWriter.value(value);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(double value) throws IOException {
+    jsonWriter.value(value);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(long value) throws IOException {
+    jsonWriter.value(value);
+    return this;
+  }
+
+  @Override
+  public JsonObjectWriter value(Number value) throws IOException {
+    jsonWriter.value(value);
     return this;
   }
 
@@ -29,9 +96,14 @@ public JsonObjectWriter name(String name) throws IOException {
    * @param object Object to encode. May be null.
    * @return this writer.
    */
+  @Override
   public JsonObjectWriter value(@NotNull ILogger logger, @Nullable Object object)
       throws IOException {
     jsonObjectSerializer.serialize(this, logger, object);
     return this;
   }
+
+  public void setIndent(@NotNull final String indent) {
+    jsonWriter.setIndent(indent);
+  }
 }
diff --git a/sentry/src/main/java/io/sentry/JsonSerializable.java b/sentry/src/main/java/io/sentry/JsonSerializable.java
@@ -4,5 +4,5 @@
 import org.jetbrains.annotations.NotNull;
 
 public interface JsonSerializable {
-  void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger) throws IOException;
+  void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException;
 }
diff --git a/sentry/src/main/java/io/sentry/ObjectWriter.java b/sentry/src/main/java/io/sentry/ObjectWriter.java
@@ -0,0 +1,33 @@
+package io.sentry;
+
+import java.io.IOException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface ObjectWriter {
+  ObjectWriter beginArray() throws IOException;
+
+  ObjectWriter endArray() throws IOException;
+
+  ObjectWriter beginObject() throws IOException;
+
+  ObjectWriter endObject() throws IOException;
+
+  ObjectWriter name(String name) throws IOException;
+
+  ObjectWriter value(String value) throws IOException;
+
+  ObjectWriter nullValue() throws IOException;
+
+  ObjectWriter value(boolean value) throws IOException;
+
+  ObjectWriter value(Boolean value) throws IOException;
+
+  ObjectWriter value(double value) throws IOException;
+
+  ObjectWriter value(long value) throws IOException;
+
+  ObjectWriter value(Number value) throws IOException;
+
+  ObjectWriter value(@NotNull ILogger logger, @Nullable Object object) throws IOException;
+}
diff --git a/sentry/src/main/java/io/sentry/ProfilingTraceData.java b/sentry/src/main/java/io/sentry/ProfilingTraceData.java
@@ -385,7 +385,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(final @NotNull JsonObjectWriter writer, final @NotNull ILogger logger)
+  public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger logger)
       throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.ANDROID_API_LEVEL).value(logger, androidApiLevel);

diff --git a/sentry/src/main/java/io/sentry/ProfilingTransactionData.java b/sentry/src/main/java/io/sentry/ProfilingTransactionData.java
@@ -144,8 +144,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.ID).value(logger, id);
     writer.name(JsonKeys.TRACE_ID).value(logger, traceId);

diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java
@@ -802,6 +802,11 @@ public void withTransaction(final @NotNull IWithTransaction callback) {
     }
   }
 
+  @NotNull
+  SentryOptions getOptions() {
+    return options;
+  }
+
   @ApiStatus.Internal
   public @Nullable Session getSession() {
     return session;

diff --git a/sentry/src/main/java/io/sentry/SentryBaseEvent.java b/sentry/src/main/java/io/sentry/SentryBaseEvent.java
@@ -345,9 +345,7 @@ public static final class JsonKeys {
 
   public static final class Serializer {
     public void serialize(
-        @NotNull SentryBaseEvent baseEvent,
-        @NotNull JsonObjectWriter writer,
-        @NotNull ILogger logger)
+        @NotNull SentryBaseEvent baseEvent, @NotNull ObjectWriter writer, @NotNull ILogger logger)
         throws IOException {
       if (baseEvent.eventId != null) {
         writer.name(JsonKeys.EVENT_ID).value(logger, baseEvent.eventId);

diff --git a/sentry/src/main/java/io/sentry/SentryEnvelopeHeader.java b/sentry/src/main/java/io/sentry/SentryEnvelopeHeader.java
@@ -89,8 +89,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     if (eventId != null) {
       writer.name(JsonKeys.EVENT_ID).value(logger, eventId);

diff --git a/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java
@@ -103,8 +103,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     if (contentType != null) {
       writer.name(JsonKeys.CONTENT_TYPE).value(contentType);

diff --git a/sentry/src/main/java/io/sentry/SentryEvent.java b/sentry/src/main/java/io/sentry/SentryEvent.java
@@ -248,8 +248,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.TIMESTAMP).value(logger, timestamp);
     if (message != null) {

diff --git a/sentry/src/main/java/io/sentry/SentryItemType.java b/sentry/src/main/java/io/sentry/SentryItemType.java
@@ -54,8 +54,7 @@ public String getItemType() {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.value(itemType);
   }
 

diff --git a/sentry/src/main/java/io/sentry/SentryLevel.java b/sentry/src/main/java/io/sentry/SentryLevel.java
@@ -13,8 +13,7 @@ public enum SentryLevel implements JsonSerializable {
   FATAL;
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.value(name().toLowerCase(Locale.ROOT));
   }
 

diff --git a/sentry/src/main/java/io/sentry/SentryLockReason.java b/sentry/src/main/java/io/sentry/SentryLockReason.java
@@ -117,8 +117,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.TYPE).value(type);
     if (address != null) {

diff --git a/sentry/src/main/java/io/sentry/Session.java b/sentry/src/main/java/io/sentry/Session.java
@@ -357,8 +357,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     if (sessionId != null) {
       writer.name(JsonKeys.SID).value(sessionId.toString());

diff --git a/sentry/src/main/java/io/sentry/SpanContext.java b/sentry/src/main/java/io/sentry/SpanContext.java
@@ -231,8 +231,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(JsonKeys.TRACE_ID);
     traceId.serialize(writer, logger);

diff --git a/sentry/src/main/java/io/sentry/SpanId.java b/sentry/src/main/java/io/sentry/SpanId.java
@@ -44,8 +44,7 @@ public String toString() {
   // JsonElementSerializer
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.value(value);
   }
 

diff --git a/sentry/src/main/java/io/sentry/SpanStatus.java b/sentry/src/main/java/io/sentry/SpanStatus.java
@@ -106,8 +106,7 @@ private boolean matches(int httpStatusCode) {
   // JsonSerializable
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.value(name().toLowerCase(Locale.ROOT));
   }
 

diff --git a/sentry/src/main/java/io/sentry/TraceContext.java b/sentry/src/main/java/io/sentry/TraceContext.java
@@ -193,8 +193,7 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
-      throws IOException {
+  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
     writer.beginObject();
     writer.name(TraceContext.JsonKeys.TRACE_ID).value(logger, traceId);
     writer.name(TraceContext.JsonKeys.PUBLIC_KEY).value(publicKey);