feat: drop store endpoint in favor of envelope

sentry-core/src/main/java/io/sentry/core/SentryEnvelope.java

@@ -64,4 +64,16 @@ public SentryEnvelope(
     return new SentryEnvelope(
         null, sdkVersion, SentryEnvelopeItem.fromSession(serializer, session));
   }
+
+  public static @NotNull SentryEnvelope fromEvent(
+      final @NotNull ISerializer serializer,
+      final @NotNull SentryEvent event,
+      final @Nullable SdkVersion sdkVersion)
+      throws IOException {
+    Objects.requireNonNull(serializer, "Serializer is required.");
+    Objects.requireNonNull(event, "Event is required.");
+
+    return new SentryEnvelope(
+        event.getEventId(), sdkVersion, SentryEnvelopeItem.fromEvent(serializer, event));
+  }
 }

sentry-core/src/main/java/io/sentry/core/transport/AsyncConnection.java

@@ -244,7 +244,7 @@ private final class EventSender implements Runnable {
     private final SentryEvent event;
     private final Object hint;
     private final IEventCache eventCache;
-    private final TransportResult failedResult = TransportResult.error(-1);
+    private final TransportResult failedResult = TransportResult.error();
 
     EventSender(
         final @NotNull SentryEvent event,
@@ -288,7 +288,10 @@ public void run() {
 
       if (transportGate.isConnected()) {
         try {
-          result = transport.send(event);
+          result =
+              transport.send(
+                  SentryEnvelope.fromEvent(
+                      options.getSerializer(), event, options.getSdkVersion()));
           if (result.isSuccess()) {
             eventCache.discard(event);
           } else {
@@ -325,7 +328,7 @@ private final class SessionSender implements Runnable {
     private final @NotNull SentryEnvelope envelope;
     private final @Nullable Object hint;
     private final @NotNull IEnvelopeCache sessionCache;
-    private final TransportResult failedResult = TransportResult.error(-1);
+    private final TransportResult failedResult = TransportResult.error();
 
     SessionSender(
         final @NotNull SentryEnvelope envelope,

sentry-core/src/main/java/io/sentry/core/transport/HttpTransport.java

@@ -9,7 +9,6 @@
 import io.sentry.core.ILogger;
 import io.sentry.core.ISerializer;
 import io.sentry.core.SentryEnvelope;
-import io.sentry.core.SentryEvent;
 import io.sentry.core.SentryOptions;
 import io.sentry.core.util.Objects;
 import io.sentry.core.util.StringUtils;
@@ -76,7 +75,6 @@ public String getCategory() {
   private final int connectionTimeout;
   private final int readTimeout;
   private final boolean bypassSecurity;
-  private final @NotNull URL storeUrl;
   private final @NotNull URL envelopeUrl;
   private final @NotNull SentryOptions options;
 
@@ -139,42 +137,15 @@ public HttpTransport(
 
     try {
       final URI uri = sentryUrl.toURI();
-      storeUrl = uri.resolve(uri.getPath() + "/store/").toURL();
       envelopeUrl = uri.resolve(uri.getPath() + "/envelope/").toURL();
     } catch (URISyntaxException | MalformedURLException e) {
       throw new IllegalArgumentException("Failed to compose the Sentry's server URL.", e);
     }
   }
 
-  // giving up on testing this method is probably the simplest way of having the rest of the class
-  // testable...
-  protected @NotNull HttpURLConnection open(final @Nullable Proxy proxy) throws IOException {
-    return open(storeUrl, proxy);
-  }
-
-  protected @NotNull HttpURLConnection open(final @NotNull URL url, final @Nullable Proxy proxy)
-      throws IOException {
-    return (HttpURLConnection) (proxy == null ? url.openConnection() : url.openConnection(proxy));
-  }
-
-  @Override
-  public @NotNull TransportResult send(final @NotNull SentryEvent event) throws IOException {
-    final HttpURLConnection connection = createConnection(false);
-    TransportResult result;
-
-    try (final OutputStream outputStream = connection.getOutputStream();
-        final GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        final Writer writer = new BufferedWriter(new OutputStreamWriter(gzip, UTF_8))) {
-
-      serializer.serialize(event, writer);
-    } catch (IOException e) {
-      logger.log(
-          ERROR, e, "An exception occurred while submitting the event to the Sentry server.");
-    } finally {
-      result =
-          readAndLog(connection, String.format("Event sent %s successfully.", event.getEventId()));
-    }
-    return result;
+  protected @NotNull HttpURLConnection open() throws IOException {
+    return (HttpURLConnection)
+        (proxy == null ? envelopeUrl.openConnection() : envelopeUrl.openConnection(proxy));
   }
 
   /**
@@ -235,27 +206,19 @@ public boolean isRetryAfter(final @NotNull String itemType) {
   /**
    * Create a HttpURLConnection connection Sets specific content-type if its an envelope or not
    *
-   * @param asEnvelope if its an envelope or not
    * @return the HttpURLConnection
    * @throws IOException if connection has a problem
    */
-  private @NotNull HttpURLConnection createConnection(boolean asEnvelope) throws IOException {
-    String contentType = "application/json";
-    HttpURLConnection connection;
-    if (asEnvelope) {
-      connection = open(envelopeUrl, proxy);
-      contentType = "application/x-sentry-envelope";
-    } else {
-      connection = open(proxy);
-    }
+  private @NotNull HttpURLConnection createConnection() throws IOException {
+    HttpURLConnection connection = open();
     connectionConfigurator.configure(connection);
 
     connection.setRequestMethod("POST");
     connection.setDoOutput(true);
     connection.setChunkedStreamingMode(0);
 
     connection.setRequestProperty("Content-Encoding", "gzip");
-    connection.setRequestProperty("Content-Type", contentType);
+    connection.setRequestProperty("Content-Type", "application/x-sentry-envelope");
     connection.setRequestProperty("Accept", "application/json");
 
     // https://stackoverflow.com/questions/52726909/java-io-ioexception-unexpected-end-of-stream-on-connection/53089882
@@ -274,7 +237,7 @@ public boolean isRetryAfter(final @NotNull String itemType) {
 
   @Override
   public @NotNull TransportResult send(final @NotNull SentryEnvelope envelope) throws IOException {
-    final HttpURLConnection connection = createConnection(true);
+    final HttpURLConnection connection = createConnection();
     TransportResult result;
 
     try (final OutputStream outputStream = connection.getOutputStream();
@@ -286,7 +249,7 @@ public boolean isRetryAfter(final @NotNull String itemType) {
       logger.log(
           ERROR, e, "An exception occurred while submitting the envelope to the Sentry server.");
     } finally {
-      result = readAndLog(connection, "Envelope sent successfully.");
+      result = readAndLog(connection);
     }
     return result;
   }
@@ -295,11 +258,9 @@ public boolean isRetryAfter(final @NotNull String itemType) {
    * Read responde code, retry after header and its error stream if there are errors and log it
    *
    * @param connection the HttpURLConnection
-   * @param message the message, if custom message if its an event or envelope
    * @return TransportResult.success if responseCode is 200 or TransportResult.error otherwise
    */
-  private @NotNull TransportResult readAndLog(
-      final @NotNull HttpURLConnection connection, final @NotNull String message) {
+  private @NotNull TransportResult readAndLog(final @NotNull HttpURLConnection connection) {
     try {
       final int responseCode = connection.getResponseCode();
 
@@ -316,7 +277,7 @@ public boolean isRetryAfter(final @NotNull String itemType) {
         return TransportResult.error(responseCode);
       }
 
-      logger.log(DEBUG, message);
+      logger.log(DEBUG, "Envelope sent successfully.");
 
       return TransportResult.success();
     } catch (IOException e) {

sentry-core/src/main/java/io/sentry/core/transport/ITransport.java

@@ -1,14 +1,11 @@
 package io.sentry.core.transport;
 
 import io.sentry.core.SentryEnvelope;
-import io.sentry.core.SentryEvent;
 import java.io.Closeable;
 import java.io.IOException;
 
 /** A transport is in charge of sending the event to the Sentry server. */
 public interface ITransport extends Closeable {
-  TransportResult send(SentryEvent event) throws IOException;
-
   boolean isRetryAfter(String type);
 
   TransportResult send(SentryEnvelope envelope) throws IOException;

sentry-core/src/main/java/io/sentry/core/transport/NoOpTransport.java

@@ -1,7 +1,6 @@
 package io.sentry.core.transport;
 
 import io.sentry.core.SentryEnvelope;
-import io.sentry.core.SentryEvent;
 import java.io.IOException;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -16,11 +15,6 @@ public static NoOpTransport getInstance() {
 
   private NoOpTransport() {}
 
-  @Override
-  public TransportResult send(SentryEvent event) throws IOException {
-    return TransportResult.success();
-  }
-
   @Override
   public boolean isRetryAfter(String type) {
     return false;

sentry-core/src/main/java/io/sentry/core/transport/StdoutTransport.java

@@ -2,7 +2,6 @@
 
 import io.sentry.core.ISerializer;
 import io.sentry.core.SentryEnvelope;
-import io.sentry.core.SentryEvent;
 import io.sentry.core.util.Objects;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -22,17 +21,6 @@ public StdoutTransport(final @NotNull ISerializer serializer) {
     this.serializer = Objects.requireNonNull(serializer, "Serializer is required");
   }
 
-  @Override
-  public TransportResult send(final @NotNull SentryEvent event) throws IOException {
-    Objects.requireNonNull(event, "SentryEvent is required");
-
-    try (final Writer writer = new BufferedWriter(new OutputStreamWriter(System.out, UTF_8));
-        final Writer printWriter = new PrintWriter(writer)) {
-      serializer.serialize(event, printWriter);
-      return TransportResult.success();
-    }
-  }
-
   @Override
   public boolean isRetryAfter(String type) {
     return false;
@@ -47,7 +35,7 @@ public TransportResult send(final @NotNull SentryEnvelope envelope) throws IOExc
       serializer.serialize(envelope, printWriter);
       return TransportResult.success();
     } catch (Exception e) {
-      return TransportResult.error(-1);
+      return TransportResult.error();
     }
   }
 

sentry-core/src/main/java/io/sentry/core/transport/TransportResult.java

@@ -1,12 +1,11 @@
 package io.sentry.core.transport;
 
-import io.sentry.core.SentryEvent;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * A result of {@link ITransport#send(SentryEvent)}. Note that this class is intentionally not
- * subclassable and has only two factory methods to capture the 2 possible states - success or
- * error.
+ * A result of {@link ITransport#send(io.sentry.core.SentryEnvelope)}. Note that this class is
+ * intentionally not subclassable and has only two factory methods to capture the 2 possible states
+ * - success or error.
  */
 public abstract class TransportResult {
 

sentry-core/src/test/java/io/sentry/core/transport/AsyncConnectionTest.kt

@@ -57,7 +57,7 @@ class AsyncConnectionTest {
         // given
         val ev = mock<SentryEvent>()
         whenever(fixture.transportGate.isConnected).thenReturn(true)
-        whenever(fixture.transport.send(any<SentryEvent>())).thenReturn(TransportResult.success())
+        whenever(fixture.transport.send(any())).thenReturn(TransportResult.success())
 
         // when
         fixture.getSUT().send(ev)
@@ -68,7 +68,9 @@ class AsyncConnectionTest {
         // because storeBeforeSend is enabled by default
         order.verify(fixture.eventCache).store(eq(ev))
 
-        order.verify(fixture.transport).send(eq(ev))
+        order.verify(fixture.transport).send(check {
+            assertEquals(ev.eventId, it.header.eventId)
+        })
         order.verify(fixture.eventCache).discard(eq(ev))
     }
 
@@ -125,7 +127,7 @@ class AsyncConnectionTest {
         // given
         val ev = mock<SentryEvent>()
         whenever(fixture.transportGate.isConnected).thenReturn(true)
-        whenever(fixture.transport.send(any<SentryEvent>())).thenReturn(TransportResult.error(500))
+        whenever(fixture.transport.send(any())).thenReturn(TransportResult.error(500))
 
         // when
         try {
@@ -140,7 +142,9 @@ class AsyncConnectionTest {
         // because storeBeforeSend is enabled by default
         order.verify(fixture.eventCache).store(eq(ev))
 
-        order.verify(fixture.transport).send(eq(ev))
+        order.verify(fixture.transport).send(check {
+            assertEquals(ev.eventId, it.header.eventId)
+        })
         verify(fixture.eventCache, never()).discard(any())
     }
 
@@ -173,7 +177,7 @@ class AsyncConnectionTest {
         // given
         val ev = mock<SentryEvent>()
         whenever(fixture.transportGate.isConnected).thenReturn(true)
-        whenever(fixture.transport.send(any<SentryEvent>())).thenThrow(IOException())
+        whenever(fixture.transport.send(any())).thenThrow(IOException())
 
         // when
         try {
@@ -184,7 +188,9 @@ class AsyncConnectionTest {
 
         // then
         val order = inOrder(fixture.transport, fixture.eventCache)
-        order.verify(fixture.transport).send(eq(ev))
+        order.verify(fixture.transport).send(check {
+            assertEquals(ev.eventId, it.header.eventId)
+        })
         verify(fixture.eventCache, never()).discard(any())
     }