logtail-rack 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1586d9af9309d5e2195cb64715fec586f80990faad899b745bf4451ae033d206
-  data.tar.gz: 6971194227e47830e74da08039a6878b8b92b3fbcc879c085b41a6caa053dad7
+  metadata.gz: 76c8e9ab5c1364f1a345a7a20e6c24ef277ff8be9b8f3c9a173bbc9263f6d695
+  data.tar.gz: ad6237cc17307742c7263ec59afe93e77476d7410b8e94fe4a0f32129f22565b
 SHA512:
-  metadata.gz: 921675d8114b08db6429503b412e914d21e0f50358d921628e296ccc4fb01b43d4b2d256aa6194a545ff9940922ad42e64470435b66235cdc8fd1030fa6718f8
-  data.tar.gz: e1a28533af67cc52e3b2803abeb3c8c2ed3db970f8e02354adc1678cf6ce1d879d24c90b4c85a338f685a548aae64c457bdc3cfebf12145db8924a8e656d9eb5
+  metadata.gz: 2d520a022a670a9a8116a0b460aa3a765d3ddcdce4598c30ace1bea5d7cc4e8494ebea7fcdaa01210eac676d7220eba6010d9cabf3f182e4edf36db0a224f00f
+  data.tar.gz: 6fdb85a21302164570c07359a948c8a2a036ef582f0fa7a0a4078c0d7ad86d3d19d30a455709253e88c600a45e09c722e77bfdb89775247bb7308f6218bfbf50

data/lib/logtail-rack/http_events.rb

@@ -136,14 +136,14 @@ module Logtail
             end
 
           elsif collapse_into_single_event?
-            start = Time.now
-
+            request_start = Time.now
             status, headers, body = @app.call(env)
+            request_end = Time.now
 
             Config.instance.logger.info do
               http_context = CurrentContext.fetch(:http)
-              content_length = headers[CONTENT_LENGTH_KEY]
-              duration_ms = (Time.now - start) * 1000.0
+              content_length = safe_to_i(headers[CONTENT_LENGTH_KEY])
+              duration_ms = (request_end - request_start) * 1000.0
 
               http_response = HTTPResponse.new(
                 content_length: content_length,
@@ -174,21 +174,19 @@ module Logtail
 
             [status, headers, body]
           else
-            start = Time.now
-
             Config.instance.logger.info do
               event_body = capture_request_body? ? request.body_content : nil
               http_request = HTTPRequest.new(
                 body: event_body,
-                content_length: request.content_length,
+                content_length: safe_to_i(request.content_length),
                 headers: request.headers,
-                host: request.host,
+                host: force_encoding(request.host),
                 method: request.request_method,
                 path: request.path,
                 port: request.port,
-                query_string: request.query_string,
+                query_string: force_encoding(request.query_string),
                 request_id: request.request_id,
-                scheme: request.scheme,
+                scheme: force_encoding(request.scheme),
                 body_limit: self.class.http_body_limit,
                 headers_to_sanitize: self.class.http_header_filters,
               )
@@ -213,12 +211,14 @@ module Logtail
               }
             end
 
+            request_start = Time.now
             status, headers, body = @app.call(env)
+            request_end = Time.now
 
             Config.instance.logger.info do
               event_body = capture_response_body? ? body : nil
-              content_length = headers[CONTENT_LENGTH_KEY]
-              duration_ms = (Time.now - start) * 1000.0
+              content_length = safe_to_i(headers[CONTENT_LENGTH_KEY])
+              duration_ms = (request_end - request_start) * 1000.0
 
               http_response = HTTPResponse.new(
                 body: event_body,
@@ -271,6 +271,18 @@ module Logtail
               false
             end
           end
+
+          def safe_to_i(val)
+            val.nil? ? nil : val.to_i
+          end
+
+          def force_encoding(value)
+            if value.respond_to?(:force_encoding)
+              value.dup.force_encoding('UTF-8')
+            else
+              value
+            end
+          end
       end
     end
   end

data/lib/logtail-rack/http_request.rb

@@ -1,3 +1,5 @@
+require "logtail-rack/util/encoding"
+
 module Logtail
   module Integrations
     module Rack
@@ -24,7 +26,7 @@ module Logtail
           @service_name = attributes[:service_name]
 
           if @headers
-            @headers_json = @headers.to_json
+            @headers_json = Util::Encoding.force_utf8_encoding(@headers).to_json
           end
         end
 

data/lib/logtail-rack/http_response.rb

@@ -1,3 +1,5 @@
+require "logtail-rack/util/encoding"
+
 module Logtail
   module Integrations
     module Rack
@@ -19,7 +21,7 @@ module Logtail
           @duration_ms = attributes[:duration_ms]
 
           if @headers
-            @headers_json = @headers.to_json
+            @headers_json = Util::Encoding.force_utf8_encoding(@headers).to_json
           end
         end
 

data/lib/logtail-rack/util/encoding.rb

@@ -0,0 +1,15 @@
+module Logtail
+  module Util
+    class Encoding
+      def self.force_utf8_encoding(data)
+        if data.respond_to?(:force_encoding)
+          data.dup.force_encoding('UTF-8')
+        elsif data.respond_to?(:transform_values)
+          data.transform_values { |val| Logtail::Util::Encoding.force_utf8_encoding(val) }
+        else
+          data
+        end
+      end
+    end
+  end
+end

data/lib/logtail-rack/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rack
-      VERSION = "0.1.2"
+      VERSION = "0.1.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Logtail
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -110,6 +110,7 @@ files:
 - lib/logtail-rack/middleware.rb
 - lib/logtail-rack/session_context.rb
 - lib/logtail-rack/user_context.rb
+- lib/logtail-rack/util/encoding.rb
 - lib/logtail-rack/util/request.rb
 - lib/logtail-rack/version.rb
 - logtail-ruby-rack.gemspec