ref: resolve TODO & minimize changes

Author: jpnurmi

src/Sentry/Http/HttpTransportBase.cs

@@ -187,20 +187,8 @@ protected internal virtual HttpRequestMessage CreateRequest(Envelope envelope)
             throw new InvalidOperationException("The DSN is expected to be set at this point.");
         }
 
-        var dsn = Dsn.Parse(_options.Dsn);
-        var authHeader =
-            $"Sentry sentry_version={_options.SentryVersion}," +
-            $"sentry_client={SdkVersion.Instance.Name}/{SdkVersion.Instance.Version}," +
-            $"sentry_key={dsn.PublicKey}" +
-            (dsn.SecretKey is { } secretKey ? $",sentry_secret={secretKey}" : null);
-
-        return new HttpRequestMessage
-        {
-            RequestUri = dsn.GetEnvelopeEndpointUri(),
-            Method = HttpMethod.Post,
-            Headers = { { "X-Sentry-Auth", authHeader } },
-            Content = new EnvelopeHttpContent(envelope, _options.DiagnosticLogger, _clock)
-        };
+        var content = new EnvelopeHttpContent(envelope, _options.DiagnosticLogger, _clock);
+        return _options.CreateRequest(content);
     }
 
     /// <summary>

src/Sentry/Platforms/Native/CFunctions.cs

@@ -141,9 +141,8 @@ public static bool Init(SentryOptions options)
 
         unsafe
         {
-            var transport = new NativeHttpTransport(options, options.GetHttpClient());
             var cTransport = sentry_transport_new(&nativeTransport);
-            sentry_transport_set_state(cTransport, GCHandle.ToIntPtr(GCHandle.Alloc(transport)));
+            sentry_transport_set_state(cTransport, GCHandle.ToIntPtr(GCHandle.Alloc(options)));
             sentry_transport_set_free_func(cTransport, &nativeTransportFree);
             sentry_options_set_transport(cOptions, cTransport);
         }
@@ -399,19 +398,28 @@ private static void nativeTransport(IntPtr envelope, IntPtr state)
     {
         try
         {
-            var transport = GCHandle.FromIntPtr(state).Target as NativeHttpTransport;
-            if (transport is not null)
+            var options = GCHandle.FromIntPtr(state).Target as SentryOptions;
+            if (options is not null)
             {
                 var data = sentry_envelope_serialize(envelope, out var size);
-                transport.SendData(data, (uint)size);
+                var content = new StringContent(Marshal.PtrToStringAnsi(data, (int)size));
                 sentry_free(data);
+
+                using var client = options.GetHttpClient();
+                using var request = options.CreateRequest(content);
+                // TODO: fix integration-test/sentry-server.py with gzip compression
+                // client.SendAsync(request).GetAwaiter().GetResult();
+                client.Send(request);
             }
-            sentry_envelope_free(envelope);
         }
         catch
         {
             // never allow an exception back to native code - it would crash the app
         }
+        finally
+        {
+            sentry_envelope_free(envelope);
+        }
     }
 
     [UnmanagedCallersOnly]

src/Sentry/Platforms/Native/NativeHttpTransport.cs

@@ -245,6 +245,23 @@ internal HttpClient GetHttpClient()
         return factory.Create(this);
     }
 
+    internal HttpRequestMessage CreateRequest(HttpContent content)
+    {
+        var authHeader =
+            $"Sentry sentry_version={SentryVersion}," +
+            $"sentry_client={SdkVersion.Instance.Name}/{SdkVersion.Instance.Version}," +
+            $"sentry_key={ParsedDsn.PublicKey}" +
+            (ParsedDsn.SecretKey is { } secretKey ? $",sentry_secret={secretKey}" : null);
+
+        return new HttpRequestMessage
+        {
+            RequestUri = ParsedDsn.GetEnvelopeEndpointUri(),
+            Method = HttpMethod.Post,
+            Headers = { { "X-Sentry-Auth", authHeader } },
+            Content = content
+        };
+    }
+
     /// <summary>
     /// Scope state processor.
     /// </summary>