logtail-rack 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a300b8b1a0f76372588d891e8276f146dd26ba6dca23a1c84dc56f91d60a80d
-  data.tar.gz: 659ccf160bb42b6ab59a09346e87278cdfb3fca73a74e1271934fed3011c1a60
+  metadata.gz: 16509c0d376658470e6f30a21f35dc6bba83213dbf000d38557280f3535c2d62
+  data.tar.gz: a666f568f5d25ae865ccfffb411813723eb7f0097393dc71abec06822b6e8e8a
 SHA512:
-  metadata.gz: a394a028579fa0f400690ce6fc3b79d307f023db9d8a056e0d1febf0f02a320d413368bd02a2c998087b132003ffec15d1f9efe0e9dbea40a29a0474753dd492
-  data.tar.gz: cf5a7093d2934706e1333fcff32c6996675a8b73a44ba042a533a662e9f5764b1a2e966a3f88c24f24d9afaf9990f546447b52d9928159e3a15e6cf269f17aab
+  metadata.gz: 200ed7c0ebac2fb76803ac8811c0d4f72dbd9c1ff02e59706d52955018b3509829fee9168da4667b244baa7f3f1aad8bf2168f4c5ce8f8c2cc94120826b7d982
+  data.tar.gz: 952d5d52989861145c2b0f621f7046d7936c265c74872094d202dc28b4d2b542f090e7e7c29c4bf6ad70d212fea11d00fa2636bf22b392a3769faaeab29ef4ba

data/lib/logtail-rack/http_context.rb

@@ -11,10 +11,10 @@ module Logtail
         def call(env)
           request = Util::Request.new(env)
           context = Contexts::HTTP.new(
-            host: request.host,
-            method: request.request_method,
+            host: request.host.force_encoding('UTF-8'),
+            method: request.request_method.force_encoding('UTF-8'),
             path: request.path,
-            remote_addr: request.ip,
+            remote_addr: request.ip.force_encoding('UTF-8'),
             request_id: request.request_id
           )
 

data/lib/logtail-rack/http_events.rb

@@ -142,7 +142,7 @@ module Logtail
 
             Config.instance.logger.info do
               http_context = CurrentContext.fetch(:http)
-              content_length = headers[CONTENT_LENGTH_KEY]
+              content_length = safe_to_i(headers[CONTENT_LENGTH_KEY])
               duration_ms = (Time.now - start) * 1000.0
 
               http_response = HTTPResponse.new(
@@ -180,15 +180,15 @@ module Logtail
               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,
               )
@@ -217,7 +217,7 @@ module Logtail
 
             Config.instance.logger.info do
               event_body = capture_response_body? ? body : nil
-              content_length = headers[CONTENT_LENGTH_KEY]
+              content_length = safe_to_i(headers[CONTENT_LENGTH_KEY])
               duration_ms = (Time.now - start) * 1000.0
 
               http_response = HTTPResponse.new(
@@ -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.1"
+      VERSION = "0.1.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Logtail
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-09-30 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