hermes-rb 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9a8e1af4d989ab98014db38015a8a00f24c2c7a4ab0d7724c849e092812855
-  data.tar.gz: 7038b16132b50567e00ebd2398054907f8e17dccc6e15652a7367f1dbd76299e
+  metadata.gz: 01e56f5cf846518bbedba098f5d3129cea50b81390e948eb8b3640cd98b4ee58
+  data.tar.gz: d672a90b3b7ddec2b8c7fcf3a57307c208297362dd16191c11792f4d8ddc4d4f
 SHA512:
-  metadata.gz: 432bfa0092f9dbeaad563aadea388c542a8daf06c4708dca3df620806b8c678350c88b27838d2c6fd06eda9ce84398c5eb3d770efca21eff63a528161e46a3d9
-  data.tar.gz: ba182e98338361a3024829c2e7872bf935d28769a3c69f373ecbd4a3f6676040f6a2ecd3b2753f7683e0e799484dbbd178d695679a36fb0440a25575015f12f3
+  metadata.gz: 9440e207aaddc314e99d66e87c9d0296b80df0280c2d4112e4d1b6530fcf3bf9da17fcdb44f398ae8f607cf6c4dbf4eed66ba44b6836d748781ce997100777d6
+  data.tar.gz: 55886c1f907cf1031bdf2fb8528bfa5e4efeb062161aef0e64c6b6bf601481eb411736b93e24b0b21b5a11636d0a308f5c73bce4508e2071698c7b670e5eceff

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,9 @@
 
 ## Master
 
+## 0.7.0
+- Add support for DDTrace v1
+
 ## 0.6.1
 - Extend the list of sensitive keywords for Hermes::Logger::ParamsFilter
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hermes-rb (0.6.1)
+    hermes-rb (0.7.0)
       activerecord (>= 5)
       activesupport (>= 5)
       dry-container (~> 0)
@@ -12,35 +12,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       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.9)
+    concurrent-ruby (1.1.10)
     ddtrace (0.45.0)
       msgpack
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
+    dry-inflector (0.2.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -54,23 +58,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.10)
+      multi_json (~> 1.15)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.5.1)
-    minitest (5.14.4)
+    json (2.6.2)
+    minitest (5.15.0)
     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.3.1)
     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 +90,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 +116,4 @@ DEPENDENCIES
   vcr
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

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/rb/version.rb

@@ -1,5 +1,5 @@
 module Hermes
   module Rb
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   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.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2022-05-30 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.2.22
 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