jcw 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test.yml +1 -1
  3. data/Gemfile.lock +5 -5
  4. data/README.md +2 -0
  5. data/jcw.gemspec +2 -2
  6. data/lib/jcw/config.rb +6 -1
  7. data/lib/jcw/init.rb +1 -0
  8. data/lib/jcw/interceptors/gruf/client.rb +0 -2
  9. data/lib/jcw/interceptors/gruf/server.rb +0 -2
  10. data/lib/jcw/version.rb +1 -1
  11. data/lib/jcw/wrapper.rb +9 -3
  12. metadata +15 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b28827609084bf816de36fb6707419d9da55dd83856a669992933e44412614ef
4
- data.tar.gz: 63063414a4a39e7b1a89705c3135ae9feb1fefc998f6de642225ea881b2e8ea4
3
+ metadata.gz: 893fa1af1110a98f454f922f84ea13c229403b33341990a28874368f87f3c1ea
4
+ data.tar.gz: 1a474d1c6e323b54187d024766255bd957f2953259d593eed2d056105f7b5537
5
5
  SHA512:
6
- metadata.gz: 84baaa8e3d2acd65376ffa606009c1b6ce08490b0631fff47fc76b9a2215655a0c8fd06ab00697f1fa9026b6acd55e2a6da5302c07db0b6368dee48421a68e81
7
- data.tar.gz: 95e34bfcd7c274dc049eef0f7763945cb8ee55911679ef5dc7fb5360ea54ccc2aad361ccd6bfb4f09a3cf656ccb70895f9e34ab5bb7b015b5062ad1bba77f860
6
+ metadata.gz: 640c14c81d9c8250f77a6474b51ec5520f4038cd71ffd4e913bdadb2c25dbec61b2cf27740fbbeafddba4f04b428e9576a0d853d0bfddaf4ec4e1e114d198e92
7
+ data.tar.gz: 651ff795bf933b9c66d37bf4893b2bf8b81c9c7fa6c8b25cc507f54fd068b54976db2e092fa0f64dd93b9512847c3129c941dfe3cf36f3139c969085429060e3
data/.github/workflows/test.yml CHANGED
@@ -41,7 +41,7 @@ jobs:
41
41
  strategy:
42
42
  fail-fast: false
43
43
  matrix:
44
- ruby: [2.7, 2.7.4, 3.0.0, 3.0.1, 3.0.2, 3.1.0]
44
+ ruby: [2.7, 2.7.6, 3.0, 3.0.2, 3.1, 3.1.2]
45
45
  experimental: [false]
46
46
 
47
47
  steps:
data/Gemfile.lock CHANGED
@@ -1,11 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- jcw (0.4.0)
4
+ jcw (0.5.0)
5
5
  activesupport (>= 5.0, < 7.0.0)
6
- gruf (~> 2.10)
7
6
  httprb-opentracing (~> 0.4.0)
8
- jaeger-client (~> 1.1.0)
7
+ jaeger-client (~> 1.3.0)
9
8
 
10
9
  GEM
11
10
  remote: https://rubygems.org/
@@ -88,7 +87,7 @@ GEM
88
87
  opentracing (~> 0.5.0)
89
88
  i18n (1.12.0)
90
89
  concurrent-ruby (~> 1.0)
91
- jaeger-client (1.1.0)
90
+ jaeger-client (1.3.0)
92
91
  opentracing (~> 0.3)
93
92
  thrift
94
93
  json (2.6.2)
@@ -210,6 +209,7 @@ PLATFORMS
210
209
  DEPENDENCIES
211
210
  bundler
212
211
  bundler-audit
212
+ gruf
213
213
  http
214
214
  http-parser
215
215
  jcw!
@@ -223,4 +223,4 @@ DEPENDENCIES
223
223
  simplecov-lcov
224
224
 
225
225
  BUNDLED WITH
226
- 2.2.31
226
+ 2.3.18
data/README.md CHANGED
@@ -43,6 +43,7 @@ UDP Sender(default):
43
43
  custom_tag: "custom-tag-value",
44
44
  }
45
45
  config.rack_ignore_path_patterns = ["/api/test", %r{/sidekiq}]
46
+ config.logger = Logger.new($stdout)
46
47
  end
47
48
 
48
49
  # Set middleware for wrapping all requests
@@ -61,6 +62,7 @@ TCP Sender:
61
62
  custom_tag: "custom-tag-value",
62
63
  }
63
64
  config.rack_ignore_path_patterns = ["/api/test", %r{/sidekiq}]
65
+ config.logger = Logger.new($stdout)
64
66
  end
65
67
 
66
68
  # Set middleware for wrapping all requests
data/jcw.gemspec CHANGED
@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
23
23
  spec.require_paths = ["lib"]
24
24
 
25
25
  spec.add_dependency "activesupport", ">= 5.0", "< 7.0.0"
26
- spec.add_dependency "gruf", "~> 2.10"
27
26
  spec.add_dependency "httprb-opentracing", "~> 0.4.0"
28
- spec.add_dependency "jaeger-client", "~> 1.1.0"
27
+ spec.add_dependency "jaeger-client", "~> 1.3.0"
29
28
 
30
29
  spec.add_development_dependency "bundler"
31
30
  spec.add_development_dependency "bundler-audit"
31
+ spec.add_development_dependency "gruf"
32
32
  spec.add_development_dependency "http"
33
33
  spec.add_development_dependency "http-parser"
34
34
  spec.add_development_dependency "opentracing_test_tracer"
data/lib/jcw/config.rb CHANGED
@@ -9,7 +9,8 @@ module JCW
9
9
  :flush_interval,
10
10
  :tags,
11
11
  :grpc_ignore_methods,
12
- :rack_ignore_path_patterns
12
+ :rack_ignore_path_patterns,
13
+ :logger
13
14
 
14
15
  def enabled
15
16
  @enabled ||= false
@@ -44,5 +45,9 @@ module JCW
44
45
  def rack_ignore_path_patterns
45
46
  @rack_ignore_path_patterns ||= []
46
47
  end
48
+
49
+ def logger
50
+ @logger ||= ::Logger.new($stdout)
51
+ end
47
52
  end
48
53
  end
data/lib/jcw/init.rb CHANGED
@@ -34,6 +34,7 @@ module JCW
34
34
  encoder: Jaeger::Encoders::ThriftEncoder.new(
35
35
  service_name: config.service_name,
36
36
  tags: config.tags,
37
+ logger: config.logger,
37
38
  ),
38
39
  ),
39
40
  flush_interval: config.flush_interval,
data/lib/jcw/interceptors/gruf/client.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "gruf"
4
-
5
3
  module JCW
6
4
  module Interceptors
7
5
  module Gruf
data/lib/jcw/interceptors/gruf/server.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "gruf"
4
-
5
3
  module JCW
6
4
  module Interceptors
7
5
  module Gruf
data/lib/jcw/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module JCW
4
- VERSION = "0.4.0"
4
+ VERSION = "0.5.0"
5
5
  end
data/lib/jcw/wrapper.rb CHANGED
@@ -21,8 +21,14 @@ require_relative "init"
21
21
  require_relative "subscriber"
22
22
  require_relative "http_tracer"
23
23
  require_relative "rack_tracer"
24
- require_relative "interceptors/gruf/client"
25
- require_relative "interceptors/gruf/server"
26
- require_relative "interceptors/gruf/hpack"
27
24
  require_relative "logger"
28
25
  require_relative "logger_extension"
26
+
27
+ begin
28
+ require "gruf"
29
+
30
+ require_relative "interceptors/gruf/client"
31
+ require_relative "interceptors/gruf/server"
32
+ require_relative "interceptors/gruf/hpack"
33
+ rescue LoadError
34
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jcw
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Starovojtov
@@ -31,49 +31,49 @@ dependencies:
31
31
  - !ruby/object:Gem::Version
32
32
  version: 7.0.0
33
33
  - !ruby/object:Gem::Dependency
34
- name: gruf
34
+ name: httprb-opentracing
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: '2.10'
39
+ version: 0.4.0
40
40
  type: :runtime
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: '2.10'
46
+ version: 0.4.0
47
47
  - !ruby/object:Gem::Dependency
48
- name: httprb-opentracing
48
+ name: jaeger-client
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: 0.4.0
53
+ version: 1.3.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: 0.4.0
60
+ version: 1.3.0
61
61
  - !ruby/object:Gem::Dependency
62
- name: jaeger-client
62
+ name: bundler
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - "~>"
65
+ - - ">="
66
66
  - !ruby/object:Gem::Version
67
- version: 1.1.0
68
- type: :runtime
67
+ version: '0'
68
+ type: :development
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - "~>"
72
+ - - ">="
73
73
  - !ruby/object:Gem::Version
74
- version: 1.1.0
74
+ version: '0'
75
75
  - !ruby/object:Gem::Dependency
76
- name: bundler
76
+ name: bundler-audit
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
79
  - - ">="
@@ -87,7 +87,7 @@ dependencies:
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
89
  - !ruby/object:Gem::Dependency
90
- name: bundler-audit
90
+ name: gruf
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - ">="