deimos-ruby 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5867eea57702a40d8e07589dc1f260e772ae6491d306c8f9829ab3841915c280
-  data.tar.gz: 75610a9efa79b1a94d0ce31da751aea4fdc58a49b0fd8f4b86286b80c1dd7a90
+  metadata.gz: a015ca37d59e16b4356d9f51e376a4a98a051fdf42d5331ab9f61c6bd6014da6
+  data.tar.gz: 7f38827e24bca8ea50159b4810d7eb08dec6ffd29feb488c4f9e43516b55a369
 SHA512:
-  metadata.gz: 738b20ca02d57e34ac171994f15ebbb905f93e0846297e476cfe06af13857c074f6420bbe84cb6d7840d96d7dc82adc6ab15298cb6bf35a4c29ed9ee6f594bc6
-  data.tar.gz: 4c75fd4f60273b7c3e838e7325b11cf5891970adcebe0b28b23d6777261d4c33954240ecbb5b522840c5cde2549bb452505de19f9142c5efdf77170a6f8ced3b
+  metadata.gz: '08a2f52f66816717d388be2a888979d4a55d0bb77af21c0f5e23ec5717449630ff8552fc060efb58cd7f999c5c5957de38d7fdb024f1a7e3076f8a44f6687430'
+  data.tar.gz: fb6112cec7a2e072332960b5d546b1b90ee92376dc73e348b3cf3ed459a4a9814857d19ee59799b0011bef2f08dbc7f89bc6178cd55ed268cd67c45dabd2afe1

data/CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+## 1.6.4 - 2020-05-11
+- Fixed the payload logging fix for errored messages as well.
+
 ## 1.6.3 - 2020-05-04
 ### Fixes :wrench:
 - Fixed the payload logging fix.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.6.2)
+    deimos-ruby (1.6.4)
       avro_turf (~> 0.11)
       phobos (~> 1.9)
       ruby-kafka (~> 0.7)

data/lib/deimos/base_consumer.rb

@@ -42,16 +42,12 @@ module Deimos
 
   protected
 
-    # @param payload [Hash|String]
-    # @param metadata [Hash]
-    def _with_error_span(payload, metadata)
+    def _with_span
       @span = Deimos.config.tracer&.start(
         'deimos-consumer',
         resource: self.class.name.gsub('::', '-')
       )
       yield
-    rescue StandardError => e
-      _handle_error(e, payload, metadata)
     ensure
       Deimos.config.tracer&.finish(@span)
     end

data/lib/deimos/batch_consumer.rb

@@ -24,11 +24,13 @@ module Deimos
           message.payload ? self.class.decoder.decode(message.payload) : nil
         end
         _received_batch(payloads, metadata)
-        _with_error_span(payloads, metadata) do
+        _with_span do
           yield payloads, metadata
         end
       end
       _handle_success(benchmark.real, payloads, metadata)
+    rescue StandardError => e
+      _handle_error(e, payloads, metadata)
     end
 
     # Consume a batch of incoming messages.

data/lib/deimos/consumer.rb

@@ -18,7 +18,7 @@ module Deimos
       decoded_payload = payload.dup
       new_metadata = metadata.dup
       benchmark = Benchmark.measure do
-        _with_error_span(payload, metadata) do
+        _with_span do
           new_metadata[:key] = decode_key(metadata[:key]) if self.class.config[:key_configured]
           decoded_payload = payload ? self.class.decoder.decode(payload) : nil
           _received_message(decoded_payload, new_metadata)
@@ -26,6 +26,8 @@ module Deimos
         end
       end
       _handle_success(benchmark.real, decoded_payload, new_metadata)
+    rescue StandardError => e
+      _handle_error(e, decoded_payload, new_metadata)
     end
 
     # Consume incoming messages.

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf