sidekiq-logstash 2.0.0 → 2.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +6 -8
- data/Gemfile +3 -2
- data/lib/sidekiq/logging/argument_filter.rb +9 -9
- data/lib/sidekiq/logging/shared.rb +3 -1
- data/lib/sidekiq/logstash/version.rb +1 -1
- data/lib/sidekiq/logstash.rb +12 -3
- data/sidekiq-logstash.gemspec +1 -2
- metadata +7 -8
- data/.ruby-gemset +0 -1
- data/.ruby-version +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d03d5f447dd18e3fc0989f94b3b79f74cd73a7ec671bafa8655660e90b8ad11b
|
4
|
+
data.tar.gz: c413e9d405d115d5731190e96dc35eaa853f32a19bf28f32c6556c301333d5d6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2e793efdad13027f544ca878392232c26db9f599f32f1d2aaf7c59ba60e94db318923bd6b754d35b0ff098ab748bba9a0a33a8e28c02895d849a76804bed047c
|
7
|
+
data.tar.gz: 93a5f3dc665067f09615d3958dfd69c192ca743d07fe444aec389859f72eae6229f60f60ced92799962bfdbabba917d8c2c63d5c8f8bec5dcbc9ce583d40b172
|
data/.github/workflows/ci.yml
CHANGED
@@ -16,11 +16,10 @@ jobs:
|
|
16
16
|
|
17
17
|
steps:
|
18
18
|
- uses: actions/checkout@v2
|
19
|
-
- uses:
|
19
|
+
- uses: ruby/setup-ruby@v1
|
20
20
|
with:
|
21
|
-
ruby-version: 2.7
|
22
|
-
|
23
|
-
run: bundle install
|
21
|
+
ruby-version: 2.7
|
22
|
+
bundler-cache: true
|
24
23
|
- name: Run rubocop
|
25
24
|
run: bundle exec rubocop --format progress
|
26
25
|
build:
|
@@ -28,14 +27,13 @@ jobs:
|
|
28
27
|
runs-on: ubuntu-latest
|
29
28
|
strategy:
|
30
29
|
matrix:
|
31
|
-
ruby: ['2.
|
30
|
+
ruby: ['2.6', '2.7', '3.0', '3.1']
|
32
31
|
|
33
32
|
steps:
|
34
33
|
- uses: actions/checkout@v2
|
35
|
-
- uses:
|
34
|
+
- uses: ruby/setup-ruby@v1
|
36
35
|
with:
|
37
36
|
ruby-version: ${{ matrix.ruby }}
|
38
|
-
|
39
|
-
run: bundle install
|
37
|
+
bundler-cache: true
|
40
38
|
- name: Run tests
|
41
39
|
run: bundle exec rake
|
data/Gemfile
CHANGED
@@ -63,7 +63,7 @@ module Sidekiq
|
|
63
63
|
parents.push(key) if deep_regexps
|
64
64
|
if regexps.any? { |r| key =~ r }
|
65
65
|
value = FILTERED
|
66
|
-
elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r }
|
66
|
+
elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r } # rubocop:disable Lint/DuplicateBranch
|
67
67
|
value = FILTERED
|
68
68
|
elsif value.is_a?(Hash)
|
69
69
|
value = call(value, parents)
|
@@ -71,15 +71,15 @@ module Sidekiq
|
|
71
71
|
value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
|
72
72
|
elsif blocks.any?
|
73
73
|
key = begin
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
74
|
+
key.dup
|
75
|
+
rescue StandardError
|
76
|
+
key
|
77
|
+
end
|
78
78
|
value = begin
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
79
|
+
value.dup
|
80
|
+
rescue StandardError
|
81
|
+
value
|
82
|
+
end
|
83
83
|
blocks.each { |b| b.call(key, value) }
|
84
84
|
end
|
85
85
|
parents.pop if deep_regexps
|
@@ -49,6 +49,8 @@ module Sidekiq
|
|
49
49
|
|
50
50
|
payload['message'] += ": fail: #{payload['duration']} sec"
|
51
51
|
payload['job_status'] = 'fail'
|
52
|
+
|
53
|
+
exc = exc.cause || exc if exc.is_a? Sidekiq::JobRetry::Handled
|
52
54
|
payload['error_message'] = exc.message
|
53
55
|
payload['error'] = exc.class
|
54
56
|
payload['error_backtrace'] = %('#{exc.backtrace.join("\n")}')
|
@@ -128,7 +130,7 @@ module Sidekiq
|
|
128
130
|
def deep_stringify!(args)
|
129
131
|
case args
|
130
132
|
when Hash
|
131
|
-
|
133
|
+
args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }.to_h
|
132
134
|
when Array
|
133
135
|
args.map! { |val| deep_stringify!(val) }
|
134
136
|
else
|
data/lib/sidekiq/logstash.rb
CHANGED
@@ -22,11 +22,20 @@ module Sidekiq
|
|
22
22
|
def self.setup(_opts = {})
|
23
23
|
# Calls Sidekiq.configure_server to inject logics
|
24
24
|
Sidekiq.configure_server do |config|
|
25
|
-
|
26
|
-
|
25
|
+
if defined?(Sidekiq::ExceptionHandler::Logger)
|
26
|
+
# Remove default Sidekiq error_handler that logs errors
|
27
|
+
# NOTE: this only exists up until Sidekiq 6.4.x
|
28
|
+
config.error_handlers.delete_if { |h| h.is_a?(Sidekiq::ExceptionHandler::Logger) }
|
29
|
+
end
|
27
30
|
|
28
31
|
# Add logstash support
|
29
|
-
config.
|
32
|
+
if config.respond_to?(:[]=)
|
33
|
+
# Only available from Sidekiq 6.5
|
34
|
+
config[:job_logger] = Sidekiq::LogstashJobLogger
|
35
|
+
else
|
36
|
+
# This is deprecated and will be removed in Sidekiq 7.0
|
37
|
+
config.options[:job_logger] = Sidekiq::LogstashJobLogger
|
38
|
+
end
|
30
39
|
|
31
40
|
# Set custom formatter for Sidekiq logger
|
32
41
|
config.logger.formatter = Sidekiq::Logging::LogstashFormatter.new
|
data/sidekiq-logstash.gemspec
CHANGED
@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.license = 'MIT'
|
19
19
|
|
20
20
|
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
|
21
|
-
spec.bindir = 'exe'
|
22
|
-
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
23
21
|
spec.require_paths = ['lib']
|
24
22
|
spec.required_ruby_version = '>= 2.5.0'
|
25
23
|
|
@@ -31,4 +29,5 @@ Gem::Specification.new do |spec|
|
|
31
29
|
spec.add_development_dependency 'rspec', '~> 3.0'
|
32
30
|
spec.add_development_dependency 'rspec-json_expectations', '~> 2.1.0'
|
33
31
|
spec.add_development_dependency 'rubocop-performance', '~> 1.5'
|
32
|
+
spec.metadata['rubygems_mfa_required'] = 'true'
|
34
33
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq-logstash
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mattia Giuffrida
|
8
8
|
autorequire:
|
9
|
-
bindir:
|
9
|
+
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-08-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: logstash-event
|
@@ -117,7 +117,7 @@ dependencies:
|
|
117
117
|
description: 'Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated,
|
118
118
|
JSON-syntax log ready to be sent to a logstash server.
|
119
119
|
|
120
|
-
'
|
120
|
+
'
|
121
121
|
email:
|
122
122
|
- giuffrida.mattia@gmail.com
|
123
123
|
executables: []
|
@@ -130,8 +130,6 @@ files:
|
|
130
130
|
- ".rspec"
|
131
131
|
- ".rubocop.yml"
|
132
132
|
- ".rubocop_todo.yml"
|
133
|
-
- ".ruby-gemset"
|
134
|
-
- ".ruby-version"
|
135
133
|
- Gemfile
|
136
134
|
- README.md
|
137
135
|
- Rakefile
|
@@ -149,7 +147,8 @@ files:
|
|
149
147
|
homepage: https://github.com/iMacTia/sidekiq-logstash
|
150
148
|
licenses:
|
151
149
|
- MIT
|
152
|
-
metadata:
|
150
|
+
metadata:
|
151
|
+
rubygems_mfa_required: 'true'
|
153
152
|
post_install_message:
|
154
153
|
rdoc_options: []
|
155
154
|
require_paths:
|
@@ -165,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
165
164
|
- !ruby/object:Gem::Version
|
166
165
|
version: '0'
|
167
166
|
requirements: []
|
168
|
-
rubygems_version: 3.1.
|
167
|
+
rubygems_version: 3.1.6
|
169
168
|
signing_key:
|
170
169
|
specification_version: 4
|
171
170
|
summary: Logstash plugin for Sidekiq
|
data/.ruby-gemset
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
sidekiq-logstash
|
data/.ruby-version
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
2.7.1
|