hermes-rb 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc73b9dbd7c2d1569311975037c0d5f45aac33c3eca2ba581b095dc2670662f
-  data.tar.gz: dbb3cd464fd5ac24ba0e8f9c8dcbaf904a31d49ad43088f1e01c06323862ee36
+  metadata.gz: 8f84d7c23f44dbdf7aabfa38122dd94c231c907b04d4aabe6ec444feef5ba7b2
+  data.tar.gz: 2eaf59a2dbca4952a7eaaa7fe053bcee8c9e783235fead16034b45ceb4850668
 SHA512:
-  metadata.gz: 04ebe50de83e5c3fbce03dc0c543563cdc7dd3e64f93cb65a7783c4437f56dadd31f5fcb60c8ec3332e480f8485224282728856ae9c0a1d732c7de9918b2a1b7
-  data.tar.gz: 2873fba2537bb1d8eb9b46e829fc1b312d079fd3eed7dc65bed09caa536349741c365ca2ee108617833b360e8e91d0c6814c01c23c13874b68ca725f84b11ae0
+  metadata.gz: 31728fa8f53e90d0317e964c92f3b3a8bc1e879821b12f46ec0441b5027f60c6983a4afe8d473a51954894ed8221941c7d8ceed78f45650aa9a791fa70964af7
+  data.tar.gz: 5950b3d5121580f9948c818ecdbf3d66f102ea118e74382f8e4d1943deb8fe226d492df55b9535c938ac1b1a7f06f74c73e848a0e03c27d5b0db1d4b9f4514e9

data/.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+on: [pull_request]
+jobs:
+  rspec:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { ruby: '2.7', rails: '5.2' }
+          - { ruby: '3.0', rails: '6.1' }
+          - { ruby: '3.1', rails: '7.0' }
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails.${{ matrix.rails }}.gemfile
+      DATABASE_URL: "postgresql://postgres:postgres@127.0.0.1:5432/hermes-rb-test"
+      DISTRIBUTED_TRACING_DATABASE_URI: "postgresql://postgres:postgres@127.0.0.1:5432/hermes-rb-test"
+      HUTCH_URI: "amqp://guest:guest@127.0.0.1:5672"
+      HUTCH_ENABLE_HTTP_API_USE: false
+    services:
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: hermes-rb-test
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      rabbitmq:
+        image: rabbitmq
+        env:
+          RABBITMQ_DEFAULT_USER: guest
+          RABBITMQ_DEFAULT_PASS: guest
+        ports:
+          - 5672:5672
+        options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+.ruby-gemset

data/.ruby-version

@@ -0,0 +1 @@
+2.7

data/Appraisals

@@ -0,0 +1,12 @@
+%w[5.2 6.1 7.0].each do |version|
+  appraise "rails.#{version}" do
+    gem "activesupport", "~> #{version}.0"
+    gem "activerecord", "~> #{version}.0"
+
+    if version == "5.2"
+      gem "ddtrace", "< 1.0"
+    else
+      gem "ddtrace", "> 1.0"
+    end
+  end
+end

data/Changelog.md

@@ -2,6 +2,15 @@
 
 ## Master
 
+## 0.7.1
+- Fix Hermes::DistributedTraceRepository so that it properly applies mapper that modifies event body
+
+## 0.7.0
+- Add support for DDTrace v1
+
+## 0.6.1
+- Extend the list of sensitive keywords for Hermes::Logger::ParamsFilter
+
 ## 0.6.0
 - Add Health check
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hermes-rb (0.6.0)
+    hermes-rb (0.7.1)
       activerecord (>= 5)
       activesupport (>= 5)
       dry-container (~> 0)
@@ -12,36 +12,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     amq-protocol (2.3.2)
-    bunny (2.15.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
+      sorted_set (~> 1, >= 1.0.2)
     carrot-top (0.0.7)
       json
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     ddtrace (0.45.0)
       msgpack
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dry-container (0.10.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+    dry-core (0.8.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+    dry-inflector (0.3.0)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-struct (1.4.0)
@@ -54,23 +54,24 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    hutch (1.0.0)
-      activesupport (>= 4.2, < 7)
-      bunny (>= 2.15, < 2.16)
+    hutch (1.1.1)
+      activesupport (>= 4.2, < 8)
+      bunny (>= 2.19, < 3.0)
       carrot-top (~> 0.0.7)
-      multi_json (~> 1.14)
-    i18n (1.8.9)
+      multi_json (~> 1.15)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.5.1)
-    minitest (5.14.4)
+    json (2.6.2)
+    minitest (5.16.2)
     msgpack (1.4.2)
     multi_json (1.15.0)
     newrelic_rpm (6.15.0)
     pg (1.2.3)
-    rack (2.2.3)
+    rack (2.2.4)
     rake (13.0.1)
-    request_store (1.5.0)
+    rbtree (0.4.5)
+    request_store (1.5.1)
       rack (>= 1.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -85,16 +86,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
+    set (1.0.2)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    thor (1.2.1)
     timecop (0.9.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     vcr (5.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   bundler
   ddtrace
   hermes-rb!
@@ -106,4 +112,4 @@ DEPENDENCIES
   vcr
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/README.md

@@ -37,8 +37,8 @@ Rails.application.config.to_prepare do
     config.configure_hutch do |hutch|
       hutch.uri = ENV.fetch("HUTCH_URI")
       hutch.force_publisher_confirms = true
-      hutch.enable_http_api_use = false 
-      hutch.tracer = MyOwnCustomTracerIfIWantToDoSomethingCrazy 
+      hutch.enable_http_api_use = false
+      hutch.tracer = MyOwnCustomTracerIfIWantToDoSomethingCrazy
     end
     config.distributed_tracing_database_uri = ENV.fetch("DISTRIBUTED_TRACING_DATABASE_URI", nil)
     config.error_notification_service = Raven
@@ -47,7 +47,7 @@ Rails.application.config.to_prepare do
   event_handler.handle_events do
     handle Events::Example::Happened, with: Example::HappenedHandler
     handle Events::Example::SyncCallHappened, with: Example::SyncCallHappenedHandler, async: false
-    
+
     extra_consumer_config = -> do
       classic_queue
       quorum_queue initial_group_size: 3
@@ -148,7 +148,7 @@ If you don't care about it, you can leave it empty.
 
 12. `distributed_tracing_database_table` - Table name for storing traces, by default it's `hermes_distributed_traces`. Optional.
 
-13. `distributes_tracing_mapper` - an object responding to `call` method taking one argument (a hash of attributes) which must return a hash as well. This hash will be used for assigning attributes when creating `Hermes::DistributedTrace`. It defaults to `Hermes::DistributedTrace::Mapper`, which uses `logger_params_filter` to remove sensitive info (this config option is covered below). You can either provide a custom mapper or pass a custom params filter, for example: `Hermes::DistributedTrace::Mapper.new(params_filter: custom_params_filter)` 
+13. `distributes_tracing_mapper` - an object responding to `call` method taking one argument (a hash of attributes) which must return a hash as well. This hash will be used for assigning attributes when creating `Hermes::DistributedTrace`. It defaults to `Hermes::DistributedTrace::Mapper`, which uses `logger_params_filter` to remove sensitive info (this config option is covered below). You can either provide a custom mapper or pass a custom params filter, for example: `Hermes::DistributedTrace::Mapper.new(params_filter: custom_params_filter)`
 
 14. `error_notification_service` - an object responding to `capture_exception` method taking one argument (error). Its interface is based on `Raven` from [Sentry Raven](https://github.com/getsentry/sentry-ruby/tree/master/sentry-raven). By default `Hermes::NullErrorNotificationService` is used, which does nothing. Optional.
 
@@ -160,7 +160,7 @@ If you don't care about it, you can leave it empty.
 
 18. `logger_params_filter` - a service used as params filter for logger, to make sure no sensitive data will be logged. It defaults to `Hermes::Logger::ParamsFilter` which already performs some filtering but it might not be enough in your case. If you are not satisfied with the defaults, you have 2 options, which are especially simple in Rails apps:
    - provide custom array of sensitive attributes and still use a default filter: `Hermes::Logger::ParamsFilter.new(sensitive_keywords: Rails.application.config.filter_parameters)`.
-   - provide custom filter object, which responds to `call` method and takes 2 arguments: attribute name and its value and performs mutation by using `gsub!` (don't worry, the entire body is cloned before passing it to the filter, so nothing unexpected will happen). This is compatible with the interface of `Rails.application.config.filter_parameters` when you use a custom filter there. In such case, you can do something like this: `Rails.application.config.filter_parameters = [Proc.new { |k, v| do_something_custom_here(k, v) }]` and then just assign `Rails.application.config.filter_parameters.first` in the Hermes config.  
+   - provide custom filter object, which responds to `call` method and takes 2 arguments: attribute name and its value and performs mutation by using `gsub!` (don't worry, the entire body is cloned before passing it to the filter, so nothing unexpected will happen). This is compatible with the interface of `Rails.application.config.filter_parameters` when you use a custom filter there. In such case, you can do something like this: `Rails.application.config.filter_parameters = [Proc.new { |k, v| do_something_custom_here(k, v) }]` and then just assign `Rails.application.config.filter_parameters.first` in the Hermes config.
 ## RPC
 
 If you want to handle RPC call, you need to add `rpc: true` flag. Keep in mind that RPC requires a synchronous processing and response, so you also need to set `async: false`. The routing key and correlation ID will be resolved based on the message that is published by the client. The payload that is sent back will be what event handler reutrns, so it might be a good idea to just return a hash so that you can operate on JSON easily.
@@ -483,7 +483,7 @@ curl -v localhost:3000/health_check/hermes.json
 2. Via binary:
 
 ```
-bin/hermes_health_check
+bundle exec hermes_health_check
 ```
 
 ## CircleCI config for installing RabbitMQ

data/gemfiles/rails.5.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.0"
+gem "activerecord", "~> 5.2.0"
+gem "ddtrace", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/rails.6.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.1.0"
+gem "activerecord", "~> 6.1.0"
+gem "ddtrace", "> 1.0"
+
+gemspec path: "../"

data/gemfiles/rails.7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "activerecord", "~> 7.0.0"
+gem "ddtrace", "> 1.0"
+
+gemspec path: "../"

data/hermes-rb.gemspec

@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg"
   spec.add_development_dependency "newrelic_rpm"
   spec.add_development_dependency "ddtrace"
+  spec.add_development_dependency "appraisal"
 end

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/logger/params_filter.rb

@@ -2,7 +2,7 @@ module Hermes
   class Logger
     class ParamsFilter
       SENSITIVE_ATTRIBUTES_KEYWORDS = %w(token password credit_card card_number security_code verification_value
-        private_key signature api_key secret_key publishable_key).freeze
+        private_key signature api_key secret_key publishable_key client_key client_secret secret).freeze
       STRIPPED_VALUE = "[STRIPPED]".freeze
 
       private_constant :SENSITIVE_ATTRIBUTES_KEYWORDS, :STRIPPED_VALUE

data/lib/hermes/rb/version.rb

@@ -1,5 +1,5 @@
 module Hermes
   module Rb
-    VERSION = "0.6.0"
+    VERSION = "0.7.1"
   end
 end

data/lib/hermes/tracers/datadog.rb

@@ -11,7 +11,13 @@ module Hermes
       end
 
       def handle(message)
-        ::Datadog.tracer.trace(klass.class.name, service: "hermes", span_type: "rabbitmq") do
+        tracer = ::Datadog.respond_to?(:tracer) ? ::Datadog.tracer : "Datadog::Tracing".safe_constantize
+
+        tracer.trace(
+          klass.class.name || klass.class.to_s,
+          service: "hermes",
+          span_type: "rabbitmq"
+        ) do
           klass.process(message)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermes-rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A messenger of gods, delivering them via RabbitMQ with a little help
   from Hutch
 email:
@@ -215,9 +229,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
+- Appraisals
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -227,6 +243,9 @@ files:
 - bin/console
 - bin/hermes_health_check
 - bin/setup
+- gemfiles/rails.5.2.gemfile
+- gemfiles/rails.6.1.gemfile
+- gemfiles/rails.7.0.gemfile
 - hermes-rb.gemspec
 - lib/hermes-rb.rb
 - lib/hermes.rb
@@ -288,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A messenger of gods, delivering them via RabbitMQ with a little help from

data/.travis.yml

@@ -1,17 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-env:
-  - HUTCH_URI="amqp://guest:guest@localhost:5672"
-  - HUTCH_ENABLE_HTTP_API_USE=false
-dist: xenial
-addons:
-  apt:
-    packages:
-      - rabbitmq-server
-services:
-  - rabbitmq
-  - postgresql
-before_install: gem install bundler -v 2.1.4