sidekiq-logstash 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808f360cfd63cff59fc4bd8a80635a2dc8968dd0fdda23c29b6f67091f940a88
-  data.tar.gz: c01964667f42fc39b3e16e3a4d387e9ba5409b03b31dd568ba4b9d3c59e3605b
+  metadata.gz: 2a99b4b463ed0d2801d2a32447a29767572a979675d6fca72781fbf0c1971fd9
+  data.tar.gz: dfbfffd67d75c8e0aff617ff8da1a219b264e72e84431632131ec346d4d0dcbb
 SHA512:
-  metadata.gz: 256a245e0b055e617a5dc715dad09d2f02c82aeb817465cfed9fb5a5556dc9a2f56e43a454ab54e28fcf179d1d2886099dd55a0c0238985b86bb3a4c24622162
-  data.tar.gz: f9dd368e75160a3422b9068a195f187241a71cb683d3bedb272c0dbfc7e7d16e11e3938f29b9fa1e139ba86ac7e043dc2421c76ac722028271222d31a7889d52
+  metadata.gz: 38a2a810c8af2eb4afda4f2a340ee39680c4c768d6a9714d897950d23630c189063bf84001f60c97a57ca94c5f0ab03a2464fd9ea8d50803321ac3cfdae86d8d
+  data.tar.gz: 7c4338444e79978f20322d8491e8f4b1b04ff95c643f89fd8d51b92b8379e5b39265190f0b0b0c201ccc6081e89317eec8cedbc9f9fdbe72f505a23e8d705433

data/.github/workflows/ci.yaml

@@ -0,0 +1,42 @@
+name: CI
+
+on:
+  pull_request:
+
+  push:
+    branches: [master]
+
+env:
+  GIT_COMMIT_SHA: ${{ github.sha }}
+  GIT_BRANCH: ${{ github.ref }}
+
+jobs:
+  linting:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Install dependencies
+        run: bundle install
+      - name: Run rubocop
+        run: bundle exec rubocop --format progress
+  build:
+    needs: [linting]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.github/workflows/publish.yml

@@ -0,0 +1,29 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Publish to Rubygems
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build sidekiq-logstash.gemspec
+          gem push sidekiq-logstash-*.gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.6.6

data/lib/sidekiq/logging/shared.rb

@@ -88,11 +88,11 @@ module Sidekiq
         payload['args'][-1] = ENCRYPTED if payload['encrypt']
 
         # Needs to map all args to strings for ElasticSearch compatibility
-        payload['args'].map!(&:to_s)
+        deep_stringify!(payload['args'])
 
         # Needs to map all unique_args to strings for ElasticSearch
         # compatibility in case sidekiq-unique-jobs is used
-        payload['unique_args']&.map!(&:to_s)
+        deep_stringify!(payload['unique_args'])
 
         if payload['retry'].is_a?(Integer)
           payload['max_retries'] = payload['retry']
@@ -124,6 +124,17 @@ module Sidekiq
       def filter_args
         Sidekiq::Logstash.configuration.filter_args
       end
+
+      def deep_stringify!(args)
+        case args
+        when Hash
+          Hash[args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }]
+        when Array
+          args.map! { |val| deep_stringify!(val) }
+        else
+          args.to_s
+        end
+      end
     end
   end
 end

data/lib/sidekiq/logstash/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Logstash
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/sidekiq-logstash.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'logstash-event', '~> 1.2'
   spec.add_runtime_dependency 'sidekiq', '>= 3.0', '<6'
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_development_dependency 'bundler', '< 2'
   spec.add_development_dependency 'factory_girl', '~> 4.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logstash
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -145,20 +131,21 @@ dependencies:
 description: 'Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated,
   JSON-syntax log ready to be sent to a logstash server.
 
-'
+  '
 email:
 - giuffrida.mattia@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -189,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Logstash plugin for Sidekiq

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-- 2.3
-- 2.4
-- 2.5
-- 2.6
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '~> 1.17'
-gemfile:
-- gemfiles/sidekiq3.gemfile
-- gemfiles/sidekiq4.gemfile
-- gemfiles/sidekiq5.gemfile
-deploy:
-  provider: rubygems
-  api_key:
-    secure: HQ8O6JFLXqs91LFfAkwQyk3NGJ6EAvTrlS1IHGZrU8qHz+4or7VQJEAtwhimy7Za2Kylhr5t1oIK/D+9Ko8YmSZzVKtFoMwQLEQizNjt1zmkcrVsGVBewm8Dp6e9eEceYap0zm/LSMRog7ePicDUbkfg3eoZxuWPSd3L5AuQ73VydDL9WFTiv1ilCdx+DQAZ5D7NjfP6//FlP3QHHAu+SLj1vz3ejB6FgJndrKB45FEYnKH0J0jcnuTHjcrHxURmzot1+MSi322bLdQLY/I1t7GAdyGEvv+5GdCZn8PyCbK9Z3YktBXMGG/oILxhoUvTrWbrJzce6TlijywekXUU3uljJOW7gvLAYDaHSKO249YyvvjZrFwbqaBS+SFFRfeNnYOkiZjQAN+3t4QHLd4OOTPMiUagIAJqjrMwS56HQxoPUz+4gJ0mTvMG9VO1WZgbDyFqYyoiQZbtOoc8p4uDdhq3pbDR2cA4PfVOLGDDrkaKb5rqzrjuDfWNleTgIst2ON+xfMJy/uvvBLvcWAkYLwNNvhJn2tn01Zuaj+DMzk5+KU6tSmtSgfvAh/DmTHZDrMKuyGDgSUomicAbUVR9U6/+r4EHMuwvXs2UpSH+0oIxxJIdjb2T55yAid2XrI3fbzvnoReT21UkPWAnrjlUXZ/XFfjCrhS+NxNjZOUMuns=
-  gem: sidekiq-logstash
-  on:
-    tags: true
-    repo: iMacTia/sidekiq-logstash
-    rvm: 2.6
-