hermes-rb 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e56f5cf846518bbedba098f5d3129cea50b81390e948eb8b3640cd98b4ee58
-  data.tar.gz: d672a90b3b7ddec2b8c7fcf3a57307c208297362dd16191c11792f4d8ddc4d4f
+  metadata.gz: 04cd997573681cd37e8efc8061173c6aeb7eaf4a9f7310ba74db397b0e80ce2a
+  data.tar.gz: b5c13fc6d2cd31cfb509f150788db4d6b7104211241ca623e0e378ed90875d1f
 SHA512:
-  metadata.gz: 9440e207aaddc314e99d66e87c9d0296b80df0280c2d4112e4d1b6530fcf3bf9da17fcdb44f398ae8f607cf6c4dbf4eed66ba44b6836d748781ce997100777d6
-  data.tar.gz: 55886c1f907cf1031bdf2fb8528bfa5e4efeb062161aef0e64c6b6bf601481eb411736b93e24b0b21b5a11636d0a308f5c73bce4508e2071698c7b670e5eceff
+  metadata.gz: 43733dc22a8ae84ef2a83d45c31ab32dd5ce747e695864e9d1d4b982a05c9dd67ed266aabb70113585a120526ae5526913c69dcbe88477816a456b23c017be1f
+  data.tar.gz: 975dfaafd7ed1050e51b032f7c76153c1c50832fae47852360e1e81984b842eef461f37f000f2ad80fdf44f5763313516ae5951a0f7cf203051c722a2e4d8498

data/Changelog.md

@@ -2,6 +2,12 @@
 
 ## Master
 
+## 0.7.2
+- Clear Hermes.origin_headers after calling event handlers
+
+## 0.7.1
+- Fix Hermes::DistributedTraceRepository so that it properly applies mapper that modifies event body
+
 ## 0.7.0
 - Add support for DDTrace v1
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hermes-rb (0.7.0)
+    hermes-rb (0.7.2)
       activerecord (>= 5)
       activesupport (>= 5)
       dry-container (~> 0)
@@ -12,12 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activerecord (7.0.3)
-      activemodel (= 7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -36,15 +36,11 @@ GEM
     ddtrace (0.45.0)
       msgpack
     diff-lcs (1.4.4)
-    dry-configurable (0.15.0)
+    dry-container (0.10.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+    dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
+    dry-inflector (0.3.0)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -63,16 +59,16 @@ GEM
       bunny (>= 2.19, < 3.0)
       carrot-top (~> 0.0.7)
       multi_json (~> 1.15)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.2)
-    minitest (5.15.0)
+    minitest (5.16.3)
     msgpack (1.4.2)
     multi_json (1.15.0)
     newrelic_rpm (6.15.0)
     pg (1.2.3)
-    rack (2.2.3.1)
+    rack (3.0.0)
     rake (13.0.1)
     rbtree (0.4.5)
     request_store (1.5.1)
@@ -90,13 +86,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    set (1.0.2)
+    set (1.0.3)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
     thor (1.2.1)
     timecop (0.9.2)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     vcr (5.0.0)
 

data/lib/hermes/distributed_trace_repository.rb

@@ -20,16 +20,16 @@ module Hermes
     private
 
     def attributes_for_trace_context(event, trace_context)
-      distributes_tracing_mapper.call(
+      {
         trace: trace_context.trace,
         span: trace_context.span,
         parent_span: trace_context.parent_span,
         service: trace_context.service,
         event_class: event.class.to_s,
         routing_key: event.routing_key,
-        event_body: event.as_json,
+        event_body: distributes_tracing_mapper.call(event.as_json),
         event_headers: event.to_headers
-      )
+      }
     end
 
     def store_trace(attributes)

data/lib/hermes/event_processor.rb

@@ -19,12 +19,13 @@ module Hermes
 
     def call(event_class, body, headers)
       event = Object.const_get(event_class).from_body_and_headers(body, headers)
-      Hermes.origin_headers = headers
 
-      instrumenter.instrument("Hermes.EventProcessor.#{event_class}") do
-        response = infer_handler(event_class).call(event)
-        distributed_trace_repository.create(event)
-        ProcessingResult.new(event, response)
+      Hermes.with_origin_headers(headers) do
+        instrumenter.instrument("Hermes.EventProcessor.#{event_class}") do
+          response = infer_handler(event_class).call(event)
+          distributed_trace_repository.create(event)
+          ProcessingResult.new(event, response)
+        end
       end
     end
 

data/lib/hermes/rb/version.rb

@@ -1,5 +1,5 @@
 module Hermes
   module Rb
-    VERSION = "0.7.0"
+    VERSION = "0.7.2"
   end
 end

data/lib/hermes.rb

@@ -50,6 +50,16 @@ module Hermes
   def self.origin_headers=(headers)
     DependenciesContainer["global_store"][ORIGIN_HEADERS_KEY] = headers.to_h
   end
+
+  def self.clear_origin_headers
+    DependenciesContainer["global_store"].delete(ORIGIN_HEADERS_KEY)
+  end
+
+  def self.with_origin_headers(headers)
+    self.origin_headers = headers
+
+    yield.tap { clear_origin_headers }
+  end
 end
 
 require "hermes/distributed_trace"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermes-rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A messenger of gods, delivering them via RabbitMQ with a little help from