datadog-logging 0.1.0 → 0.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034c7b67db9ffcb8e23f438c92055f30d91a2538a327ebf816ac6c9dcf976c5d
-  data.tar.gz: f33eaff58f093ff02ecd054053ef80e61d110b517136c8533bba548e96dfe132
+  metadata.gz: e6e67830253a5ca07ceee35011b156b6a034118dad67e1fcd828c2b8d4aa5b3d
+  data.tar.gz: ced8cd8248e4d44908173e37dbe670cae1c72146b3b8ec3e4a8611368ce861b0
 SHA512:
-  metadata.gz: 424f1e50ea656741dbfbec79826bcf50608d5f4b2b7d756178bb450000e5a166871946b653b7843dc4fec042f97674d972e4428b77e785b035ccee3ece84f55e
-  data.tar.gz: bfd7aa46628923d2d98449ed9adfb8fa9e1799087246f89c5f9441c4db705a6566c1e7406030951745f1fe9e53dd36a5aa4ddb8a75a0d9cad32f95a66ccfbc74
+  metadata.gz: 9aac91a473b8f093047044edec3ca68f9a35526898fa9af7288ac14937fb3fc937fc44dfb27be2e4f4cb7cf513c61ad849f063b4cab6679dd5858b93ae4cf0da
+  data.tar.gz: 81b19152d046b6d26a5dbc3ae516ab9f3337af665cc9baa18250a235e495c2e21668cdf0116a89bd9ac24b29b3c4f4f51d8c2a7a13b0589742bdddc50ab6c255

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.1.0.2] - 2023-09-29
+
+- Define method 'log_rescued_responses?' for `Datadog::Logging::Middleware::LogExceptions` for Rails versions < to 7.0
+- Wrap method 'rescue_response?' for `Datadog::Logging::Middleware::LogExceptions` for Rails versions < to 7.0
+
+## [0.1.0.1] - 2023-09-25
+
+- Fix undefined method 'empty?' for nil:NilClass `Datadog::Logging::Logger#parsed_response`
+
 ## [0.1.0] - 2023-09-20
 
 - Initial release

data/lib/datadog/logging/logger.rb

@@ -106,7 +106,7 @@ module Datadog
       end
 
       def parsed_response(response)
-        return nil if response.body.empty?
+        return nil if response.body.nil? || response.body.empty?
 
         # If response is JSON, we want to get it as Hash
         if response.header['Content-Type']&.match(%r{application/json})

data/lib/datadog/logging/middleware/log_exceptions.rb

@@ -14,7 +14,7 @@ module Datadog
           logger = logger(request)
 
           return unless logger
-          return if !log_rescued_responses?(request) && wrapper.rescue_response?
+          return if !log_rescued_responses?(request) && rescue_response?(wrapper)
 
           exception = wrapper.exception
 
@@ -25,6 +25,23 @@ module Datadog
                        })
         end
 
+        def rescue_response?(wrapper)
+          if wrapper.respond_to?(:rescue_response?)
+            # From Rails 7.0
+            wrapper.rescue_response?
+          else
+            # Before Rails 7.0
+            wrapper.rescue_responses.key?(wrapper.exception.class.name)
+          end
+        end
+
+        # Starting with Rails 7.0, method is defined.
+        unless method_defined?(:log_rescued_responses?)
+          def log_rescued_responses?(request)
+            request.get_header('action_dispatch.log_rescued_responses')
+          end
+        end
+
       end
 
     end

data/lib/datadog/logging/version.rb

@@ -4,7 +4,7 @@ module Datadog
 
   module Logging
 
-    VERSION = '0.1.0'
+    VERSION = '0.1.0.2'
 
   end
 

data/sig/datadog/logging/middleware/log_exceptions.rbs

@@ -4,7 +4,11 @@ module Datadog
       class LogExceptions < ActionDispatch::DebugExceptions
         private
 
-        def log_error: (untyped request, untyped wrapper) -> Integer
+        def log_error: (untyped request, ExceptionWrapper wrapper) -> Integer
+
+        def log_rescued_responses?: (untyped request) -> untyped
+
+        def rescue_response?: (ExceptionWrapper wrapper) -> (bool)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-logging
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.2
 platform: ruby
 authors:
 - Matthieu CIAPPARA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies: []
 description:
 email: