logtail-rack 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a63714ec66ecfdd4a4db3ffc637fe1b02da37422789fc7ea8617474b63f90367
-  data.tar.gz: 8fedbde00ed676731409c299e7e5183bc24daa049f21e9e5ffd7995706bc2dda
+  metadata.gz: fd113ab9b17ca26fa87eff47038f60d80eb83faf8e952272fdf50d78282cdb85
+  data.tar.gz: b10232307696b875ff0ed56fe3e2881e7d010362b2a8aa773a8cae4d40973f69
 SHA512:
-  metadata.gz: 3bc10f2ad042d60da36ea8491f214764028e045bde28db87fb68fb7de32278fe98ddf84105deda98a07cfdfb7e9ee9ffaf46056093fa670dd35043fb2d48d69a
-  data.tar.gz: 437553fcaf79354dcb76bef63bca8c58cb1dcd8c7972f3f0204bd7c2b2aad30e0943776b78de0b307a9148643cb2974a6d5b3fc2f7a7d31b80bfc3e4d0243177
+  metadata.gz: fda6074ed268d9674060dbd1b1356ad17872299956bcf4290b6748dc0ed247afac45a340e2e673ec5206bb81b9e55510b6a4295dae79dbb05a66b5195a79887a
+  data.tar.gz: 23028ed6c4bfcf5168556d37e73d79a3159b0565802dd35792720282722ca1de7be645795ecfc47a5f9899ee23ec19747fb0c7bcacb523244f94a6d4b0dfce3b

data/lib/logtail-rack/http_context.rb

@@ -1,6 +1,7 @@
 require "logtail/contexts/http"
 require "logtail/current_context"
 require "logtail-rack/middleware"
+require "logtail-rack/util/encoding"
 require "logtail-rack/util/request"
 
 module Logtail
@@ -11,10 +12,10 @@ module Logtail
         def call(env)
           request = Util::Request.new(env)
           context = Contexts::HTTP.new(
-            host: request.host.force_encoding('UTF-8'),
-            method: request.request_method.force_encoding('UTF-8'),
+            host: Util::Encoding.force_utf8_encoding(request.host),
+            method: Util::Encoding.force_utf8_encoding(request.request_method),
             path: request.path,
-            remote_addr: request.ip.force_encoding('UTF-8'),
+            remote_addr: Util::Encoding.force_utf8_encoding(request.ip),
             request_id: request.request_id
           )
 

data/lib/logtail-rack/http_events.rb

@@ -6,6 +6,7 @@ require "logtail/current_context"
 require "logtail-rack/http_request"
 require "logtail-rack/http_response"
 require "logtail-rack/middleware"
+require "logtail-rack/util/encoding"
 
 module Logtail
   module Integrations
@@ -179,13 +180,13 @@ module Logtail
                 body: event_body,
                 content_length: safe_to_i(request.content_length),
                 headers: filter_http_headers(request.headers),
-                host: force_encoding(request.host),
+                host: Util::Encoding.force_utf8_encoding(request.host),
                 method: request.request_method,
                 path: request.path,
                 port: request.port,
-                query_string: force_encoding(request.query_string),
+                query_string: Util::Encoding.force_utf8_encoding(request.query_string),
                 request_id: request.request_id,
-                scheme: force_encoding(request.scheme),
+                scheme: Util::Encoding.force_utf8_encoding(request.scheme),
               )
 
               {
@@ -277,14 +278,6 @@ module Logtail
           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/util/encoding.rb

@@ -3,7 +3,10 @@ module Logtail
     class Encoding
       def self.force_utf8_encoding(data)
         if data.respond_to?(:force_encoding)
-          data.dup.force_encoding('UTF-8')
+          encoded_data = data.dup.force_encoding('UTF-8')
+          encoded_data = data.dup.force_encoding("ISO-8859-1").encode("UTF-8") unless encoded_data.valid_encoding?
+          encoded_data = data.dup.encode('UTF-8', invalid: :replace, undef: :replace) unless encoded_data.valid_encoding?
+          encoded_data
         elsif data.respond_to?(:transform_values)
           data.transform_values { |val| Logtail::Util::Encoding.force_utf8_encoding(val) }
         else

data/lib/logtail-rack/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rack
-      VERSION = "0.2.2"
+      VERSION = "0.2.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Logtail
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail