send gzipped requests (and uncompress them in the test server)

carlosalberto · Jun 5, 2017 · 0deebff · 0deebff
1 parent 4c2750f
commit 0deebff
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 35 deletions.
diff --git a/Src/LibHoney.Tests/HttpTestServer.cs b/Src/LibHoney.Tests/HttpTestServer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
+using System.IO.Compression;
 using System.Net;
 using System.Text;
 using System.Threading;
@@ -76,7 +77,8 @@ public void ServeOne (int statusCode, string body, TimeSpan timeout)
                 Thread.Sleep (timeout);
 
             // Save the payload
-            var reader = new StreamReader (request.InputStream);
+            var gzipStream = new GZipStream(request.InputStream, CompressionMode.Decompress);
+            var reader = new StreamReader (gzipStream);
             payloadItems.Add (reader.ReadToEnd ());
             headers.Add (request.Headers);
 

diff --git a/Src/LibHoney/Transmission.cs b/Src/LibHoney/Transmission.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.IO;
+using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -160,42 +162,56 @@ void DoSend (Event ev)
         {
             var uri = new Uri (ev.ApiHost + HoneyEventsUrl + ev.DataSet);
 
-            var req = new HttpRequestMessage () {
-                RequestUri = uri,
-                Method = HttpMethod.Post,
-                Content = new StringContent (ev.ToJSON (), Encoding.UTF8, "application/json")
-            };
-            req.Headers.Add (HoneyTeamKey, ev.WriteKey);
-            req.Headers.Add (HoneySamplerate, ev.SampleRate.ToString ());
-            req.Headers.Add (HoneyEventTime, ev.CreatedAtISO);
-
-            HttpResponseMessage result = null;
-            DateTime start = DateTime.Now;
-            string errorMessage = null;
-
-            try {
-                // Get the Result right away to hint the scheduler to run the task inline.
-                result = client.SendAsync (req).Result;
-            } catch (AggregateException exc) {
-                // Ignore network errors, but report them as responses.
-                if (!IsNetworkError (exc.InnerException, out errorMessage))
-                    throw;
-            }
+            using (MemoryStream ms = new MemoryStream()) {
+                using (GZipStream gzip = new GZipStream(ms,
+							CompressionMode.Compress, true))
+                {
+                    var evBytes = Encoding.UTF8.GetBytes(ev.ToJSON());
+                    gzip.Write(evBytes, 0, evBytes.Length);
+                }
 
-            Response res;
-            if (result != null)
-                res = new Response () {
-                    StatusCode = result.StatusCode,
-                    Body = result.Content.ReadAsStringAsync ().Result
-                };
-            else
-                res = new Response () {
-                    ErrorMessage = "Error while sending the event: " + errorMessage,
-                };
+                ms.Position = 0;
 
-            res.Duration = DateTime.Now - start;
-            res.Metadata = ev.Metadata;
-            EnqueueResponse (res);
+                var req = new HttpRequestMessage () {
+                    RequestUri = uri,
+                    Method = HttpMethod.Post,
+                    Content = new StreamContent(ms)
+                };
+                req.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+                req.Content.Headers.ContentEncoding.Add ("gzip");
+                req.Headers.Add (HoneyTeamKey, ev.WriteKey);
+                req.Headers.Add (HoneySamplerate, ev.SampleRate.ToString ());
+                req.Headers.Add (HoneyEventTime, ev.CreatedAtISO);
+
+                HttpResponseMessage result = null;
+                DateTime start = DateTime.Now;
+                string errorMessage = null;
+
+                try {
+                    // Get the Result right away to hint the scheduler to run the task inline.
+                    result = client.SendAsync (req).Result;
+                } catch (AggregateException exc) {
+                    // Ignore network errors, but report them as responses.
+                    if (!IsNetworkError (exc.InnerException, out errorMessage))
+                        throw;
+                }
+
+                Response res;
+                if (result != null) {
+                    res = new Response () {
+                        StatusCode = result.StatusCode,
+                        Body = result.Content.ReadAsStringAsync ().Result
+                    };
+                } else {
+                    res = new Response () {
+                        ErrorMessage = "Error while sending the event: " + errorMessage,
+                    };
+                }
+
+                res.Duration = DateTime.Now - start;
+                res.Metadata = ev.Metadata;
+                EnqueueResponse (res);
+            }
         }
 
         static bool IsNetworkError (Exception exc, out string errorMessage)