jcw 0.2.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f97935444bb8d0285e96565c731f99e65df848573cc0257eb041dc90d3bf8b
-  data.tar.gz: a119efdd207f9ebf9965cb8a62fab5c8e3541db7535e5649a14808f02a0683f9
+  metadata.gz: 893fa1af1110a98f454f922f84ea13c229403b33341990a28874368f87f3c1ea
+  data.tar.gz: 1a474d1c6e323b54187d024766255bd957f2953259d593eed2d056105f7b5537
 SHA512:
-  metadata.gz: b70cfaecfca2e89dda7c95eb471d0169afc9deb286fb42481f36663db89c07850ef8c7d5185b7cb47658313e812d01328f95d8f68a88a8e4db6b0b37007f5a2f
-  data.tar.gz: 14ca08c194b0c3c710670f7b9e77f6584a269366167a3ec4bfadaf042c7fa0e60776981af46b2dff7af69ed0a96fafd116585fbfa1a2721624225d9aeec399c1
+  metadata.gz: 640c14c81d9c8250f77a6474b51ec5520f4038cd71ffd4e913bdadb2c25dbec61b2cf27740fbbeafddba4f04b428e9576a0d853d0bfddaf4ec4e1e114d198e92
+  data.tar.gz: 651ff795bf933b9c66d37bf4893b2bf8b81c9c7fa6c8b25cc507f54fd068b54976db2e092fa0f64dd93b9512847c3129c941dfe3cf36f3139c969085429060e3

data/.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 2.7.4, 3.0.0, 3.0.1, 3.0.2]
+        ruby: [2.7, 2.7.6, 3.0, 3.0.2, 3.1, 3.1.2]
         experimental: [false]
 
     steps:

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 RSpec/EmptyLineAfterHook:
   Enabled: false

data/Gemfile.lock

@@ -1,29 +1,28 @@
 PATH
   remote: .
   specs:
-    jcw (0.2.4)
+    jcw (0.5.0)
       activesupport (>= 5.0, < 7.0.0)
-      gruf (~> 2.10)
       httprb-opentracing (~> 0.4.0)
-      jaeger-client (~> 1.1.0)
+      jaeger-client (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.4)
-      actionview (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.4)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -37,7 +36,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.4.4)
     docile (1.4.0)
@@ -49,22 +48,31 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    google-protobuf (3.19.3)
-    googleapis-common-protos-types (1.3.0)
+    google-protobuf (3.21.3)
+    google-protobuf (3.21.3-x86_64-darwin)
+    google-protobuf (3.21.3-x86_64-linux)
+    googleapis-common-protos-types (1.3.2)
       google-protobuf (~> 3.14)
-    grpc (1.41.0)
-      google-protobuf (~> 3.17)
+    grpc (1.48.0)
+      google-protobuf (~> 3.19)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.41.0)
-    gruf (2.12.0)
+    grpc (1.48.0-x86_64-darwin)
+      google-protobuf (~> 3.19)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.48.0-x86_64-linux)
+      google-protobuf (~> 3.19)
+      googleapis-common-protos-types (~> 1.0)
+    grpc-tools (1.48.0)
+    gruf (2.15.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
       e2mmap (>= 0.1)
-      grpc (~> 1.10, <= 1.41.0)
-      grpc-tools (~> 1.10, <= 1.41.0)
+      grpc (~> 1.10)
+      grpc-tools (~> 1.10)
       json (>= 2.3)
       slop (>= 4.6)
       thwait (>= 0.1)
+      zeitwerk (>= 2)
     http (5.0.4)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
@@ -77,56 +85,56 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     httprb-opentracing (0.4.0)
       opentracing (~> 0.5.0)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jaeger-client (1.1.0)
+    jaeger-client (1.3.0)
       opentracing (~> 0.3)
       thrift
-    json (2.6.1)
+    json (2.6.2)
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.13.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.15.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mini_portile2 (2.8.0)
+    minitest (5.16.2)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
     opentracing (0.5.0)
     opentracing_test_tracer (0.1.1)
       opentracing
-    parallel (1.21.0)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -141,37 +149,36 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.17.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
-    rubocop-config-umbrellio (1.17.0.53)
-      rubocop (= 1.17.0)
-      rubocop-performance (= 1.10.0)
-      rubocop-rails (= 2.9.1)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (= 2.2.0)
-      rubocop-sequel (= 0.2.0)
-    rubocop-performance (1.10.0)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    rubocop-config-umbrellio (1.30.0.65)
+      rubocop (~> 1.30.0)
+      rubocop-performance (~> 1.14.0)
+      rubocop-rails (~> 2.14.2)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.11.1)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-sequel (0.2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -181,18 +188,18 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
-    slop (4.9.1)
-    thor (1.1.0)
-    thrift (0.15.0)
+    slop (4.9.2)
+    thor (1.2.1)
+    thrift (0.16.0)
     thwait (0.2.0)
       e2mmap
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.1)
+    unicode-display_width (2.2.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -202,6 +209,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   bundler-audit
+  gruf
   http
   http-parser
   jcw!
@@ -215,4 +223,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.27
+   2.3.18

data/README.md

@@ -43,6 +43,7 @@ UDP Sender(default):
     custom_tag: "custom-tag-value",
   }
   config.rack_ignore_path_patterns = ["/api/test", %r{/sidekiq}]
+  config.logger = Logger.new($stdout)
 end
 
 # Set middleware for wrapping all requests
@@ -61,6 +62,7 @@ TCP Sender:
     custom_tag: "custom-tag-value",
   }
   config.rack_ignore_path_patterns = ["/api/test", %r{/sidekiq}]
+  config.logger = Logger.new($stdout)
 end
 
 # Set middleware for wrapping all requests

data/jcw.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Wrapper for the gem 'jaeger-client' with simpler customization."
   spec.homepage      = "https://github.com/Cado-Labs/jcw"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.0", "< 7.0.0"
-  spec.add_dependency "gruf", "~> 2.10"
   spec.add_dependency "httprb-opentracing", "~> 0.4.0"
-  spec.add_dependency "jaeger-client", "~> 1.1.0"
+  spec.add_dependency "jaeger-client", "~> 1.3.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "bundler-audit"
+  spec.add_development_dependency "gruf"
   spec.add_development_dependency "http"
   spec.add_development_dependency "http-parser"
   spec.add_development_dependency "opentracing_test_tracer"

data/lib/jcw/config.rb

@@ -9,7 +9,8 @@ module JCW
                 :flush_interval,
                 :tags,
                 :grpc_ignore_methods,
-                :rack_ignore_path_patterns
+                :rack_ignore_path_patterns,
+                :logger
 
     def enabled
       @enabled ||= false
@@ -44,5 +45,9 @@ module JCW
     def rack_ignore_path_patterns
       @rack_ignore_path_patterns ||= []
     end
+
+    def logger
+      @logger ||= ::Logger.new($stdout)
+    end
   end
 end

data/lib/jcw/init.rb

@@ -34,6 +34,7 @@ module JCW
             encoder: Jaeger::Encoders::ThriftEncoder.new(
               service_name: config.service_name,
               tags: config.tags,
+              logger: config.logger,
             ),
           ),
           flush_interval: config.flush_interval,

data/lib/jcw/interceptors/gruf/client.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "gruf"
-
 module JCW
   module Interceptors
     module Gruf

data/lib/jcw/interceptors/gruf/server.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "gruf"
-
 module JCW
   module Interceptors
     module Gruf

data/lib/jcw/subscriber.rb

@@ -7,12 +7,12 @@ module JCW
     IGNORED_PAYLOAD_KEYS = %i[request response headers exception exception_object].freeze
 
     def subscribe_to_event!(event)
-      ActiveSupport::Notifications.subscribe(event) do |name, _start, _finish, _uid, payload|
-        add(name, payload)
+      ActiveSupport::Notifications.subscribe(event) do |name, start, finish, _uid, payload|
+        add(name, payload, finish - start)
       end
     end
 
-    def add(name, payload)
+    def add(name, payload, duration)
       # skip Rails internal events
       return if name.start_with?("!")
 
@@ -25,7 +25,8 @@ module JCW
         IGNORED_PAYLOAD_KEYS.each { |key| payload.delete(key) if payload.key?(key) }
       end
 
-      span.log_kv(message: name, context: JSON.dump(payload))
+      duration = format("%0.3fms", duration * 1000)
+      span.log_kv(message: name, context: JSON.dump(payload), duration: duration)
     end
   end
 end

data/lib/jcw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JCW
-  VERSION = "0.2.4"
+  VERSION = "0.5.0"
 end

data/lib/jcw/wrapper.rb

@@ -21,8 +21,14 @@ require_relative "init"
 require_relative "subscriber"
 require_relative "http_tracer"
 require_relative "rack_tracer"
-require_relative "interceptors/gruf/client"
-require_relative "interceptors/gruf/server"
-require_relative "interceptors/gruf/hpack"
 require_relative "logger"
 require_relative "logger_extension"
+
+begin
+  require "gruf"
+
+  require_relative "interceptors/gruf/client"
+  require_relative "interceptors/gruf/server"
+  require_relative "interceptors/gruf/hpack"
+rescue LoadError
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jcw
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Starovojtov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,49 +31,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: gruf
+  name: httprb-opentracing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: httprb-opentracing
+  name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: jaeger-client
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: gruf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,14 +286,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Wrapper for jaeger-client