jcw 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f8f9b595186e86f086290543b8b4ea880a174dab1e1a94d11f8afd151479b8
-  data.tar.gz: 209f2ff14d28cd1a7ca7d586c17c53e8505ce170f23d81f5b5de42a4f6544f29
+  metadata.gz: e00135bfb0c4ff7729b1bb55832330e2b8f0067c73817ff1bc1d7a3cde8eb75a
+  data.tar.gz: cb0263489ee5f323e4e5e5a42325e816cbb7d40956d44875d736067c0f540777
 SHA512:
-  metadata.gz: ad26e8445a04470d780aa4a4aed1f4aa50653b1db80b55cd24238fc95dde6c17d1e94e33924706c766885e957633f55ed47e50365f17cecff79b5ab3766299c9
-  data.tar.gz: d4b076df8cdcfdf35a0a31998ad7d248ce77c7dca6f6c3b6291e4d4b90b424b66c89678ac16188b1a3f5cca62a48428eec555bd6954f35c95ad228de68dcb980
+  metadata.gz: 7684aab1ff2bb775229815d3b2193a5c8b29ce66db3926aacebfc662e51f24de12e89362d437f8c16c0d8c02609df277c9a48b5de81f6f7138b8fbc07aa4ca2f
+  data.tar.gz: 8803e256d525bd6d63b7b74eb8bec03023dde7878d5da16e96dd1e45f17e6eff656b637baac692c17b31ea6f873987bcd42888cf7d8b7040fe1e18933ca3038f

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, 3.1.0]
+        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,51 +1,49 @@
 PATH
   remote: .
   specs:
-    jcw (0.3.0)
-      activesupport (>= 5.0, < 7.0.0)
-      gruf (~> 2.10)
+    jcw (0.5.1)
+      activesupport (>= 5.0)
       httprb-opentracing (~> 0.4.0)
-      jaeger-client (~> 1.1.0)
+      jaeger-client (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.6.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     builder (3.2.4)
-    bundler-audit (0.9.0.1)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
     erubi (1.10.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -74,12 +72,12 @@ GEM
       slop (>= 4.6)
       thwait (>= 0.1)
       zeitwerk (>= 2)
-    http (5.0.4)
+    http (5.1.0)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.4.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
@@ -88,7 +86,7 @@ GEM
       opentracing (~> 0.5.0)
     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.2)
@@ -117,7 +115,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.4)
     rack-test (2.0.2)
@@ -127,29 +125,30 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (1.30.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -188,7 +187,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     slop (4.9.2)
     thor (1.2.1)
     thrift (0.16.0)
@@ -198,7 +197,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (2.2.0)
     zeitwerk (2.6.0)
 
@@ -210,6 +209,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   bundler-audit
+  gruf
   http
   http-parser
   jcw!
@@ -223,4 +223,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.31
+   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)/}) }
@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 5.0", "< 7.0.0"
-  spec.add_dependency "gruf", "~> 2.10"
+  spec.add_dependency "activesupport", ">= 5.0"
   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

@@ -23,12 +23,10 @@ module JCW
         # we should only mutate the copy of the payload
         payload = payload.dup
         IGNORED_PAYLOAD_KEYS.each { |key| payload.delete(key) if payload.key?(key) }
-      else
-        payload = { payload: payload }
       end
-      payload[:duration] = duration
 
-      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.3.0"
+  VERSION = "0.5.1"
 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.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Alexander Starovojtov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,53 +24,50 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !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 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: gruf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,7 +280,7 @@ 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:
   - - ">="