logtail-rack 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a63714ec66ecfdd4a4db3ffc637fe1b02da37422789fc7ea8617474b63f90367
-  data.tar.gz: 8fedbde00ed676731409c299e7e5183bc24daa049f21e9e5ffd7995706bc2dda
+  metadata.gz: 43f0b7693831d0097e1496ba79258afc7b8b7cda69d805fa99248cbc79812181
+  data.tar.gz: 23bdde6dc4a16420b3f8604edc3266775b248e2a51177be01c64a314577612d9
 SHA512:
-  metadata.gz: 3bc10f2ad042d60da36ea8491f214764028e045bde28db87fb68fb7de32278fe98ddf84105deda98a07cfdfb7e9ee9ffaf46056093fa670dd35043fb2d48d69a
-  data.tar.gz: 437553fcaf79354dcb76bef63bca8c58cb1dcd8c7972f3f0204bd7c2b2aad30e0943776b78de0b307a9148643cb2974a6d5b3fc2f7a7d31b80bfc3e4d0243177
+  metadata.gz: f9dc63f41ea21c4f31360608d82ec1cbf6652cac1774a28695a845a36858a95215ee24d49696278f07267266922659559cee8790a85767e64cd143e833232950
+  data.tar.gz: c1faf9719cac776039dac04d3acc9b91b9520f9f7983a4db242344e9f66cfedd37feb0bfe8b6575185b883918e45b37eaf76a61708f364dd627a8805349f6989

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),
+            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.3"
     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.3
 platform: ruby
 authors:
 - Logtail
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Logtail integration for Rack