jcw 0.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7621b3db92b4172f29ae46a914d6f5a33611f276dfaa17d1effeff36f16c68b
-  data.tar.gz: c9ac2ea12ee2862fcb762673dd5285e7422b86fe91c38a39f9fa66bd890fa83c
+  metadata.gz: 2b1e12954a296bbc3e7413110a7b151fe38c0d422e156cebbd5ae7157bbe111b
+  data.tar.gz: '00488dffa129ca3c4a2b45fb3f8f947f1dec9b4310b8a900813426afa397fc92'
 SHA512:
-  metadata.gz: e6558c6b64a50a283c6e9a97024ee8191fd595bb73b071ae84259ec7a61d51ab4046b6f70e33f335bedf7888f791f170375e2b7f3ab428a373259716c9acfe19
-  data.tar.gz: c5d6da1d532632920fdce571c254737654d0e37c7aca2d89bf8852126ae15882c3f4965461b341ecfcbf04add3a366010b103d5cd83cf2fe1df8b9c71860e15d
+  metadata.gz: 61b7221435873848d3bb19e0e9ca30157c127601633fb4ca129fbc150fe5da98f2013bdc334139c455801fcb7fe90db8fb47809a4b1bba86f4e58d8ab1034162
+  data.tar.gz: 1140c437317341c6836f196711496f9dedb0e0959571d7f882c9750f6c690ca3026dd807916fd958c7a7628587cea5e985da1b55631f9b4fcbc15691a8cf7e49

data/.github/workflows/test.yml

@@ -41,11 +41,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, 2.7.4, 3.0.0, 3.0.1, 3.0.2]
+        ruby: [2.6, 2.7, 2.7.4, 3.0.0, 3.0.1, 3.0.2]
         experimental: [false]
-        include:
-          - ruby: head
-            experimental: true
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    jcw (0.1.3)
-      activesupport (>= 5.0)
+    jcw (0.2.3)
+      activesupport (>= 5.0, < 7.0.0)
+      gruf (~> 2.10)
       httprb-opentracing (~> 0.4.0)
       jaeger-client (~> 1.1.0)
-      rack-tracer (~> 0.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       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.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -33,7 +33,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     builder (3.2.4)
-    bundler-audit (0.8.0)
+    bundler-audit (0.9.0.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     coderay (1.1.3)
@@ -43,16 +43,33 @@ GEM
     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.3)
+    ffi (1.15.4)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    http (5.0.1)
-      addressable (~> 2.3)
+    google-protobuf (3.19.2)
+    googleapis-common-protos-types (1.3.0)
+      google-protobuf (~> 3.14)
+    grpc (1.41.0)
+      google-protobuf (~> 3.17)
+      googleapis-common-protos-types (~> 1.0)
+    grpc-tools (1.41.0)
+    gruf (2.12.0)
+      activesupport (> 4)
+      concurrent-ruby (> 1)
+      e2mmap (>= 0.1)
+      grpc (~> 1.10, <= 1.41.0)
+      grpc-tools (~> 1.10, <= 1.41.0)
+      json (>= 2.3)
+      slop (>= 4.6)
+      thwait (>= 0.1)
+    http (5.0.4)
+      addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.3.0)
+      llhttp-ffi (~> 0.4.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
@@ -60,20 +77,21 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     httprb-opentracing (0.4.0)
       opentracing (~> 0.5.0)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
-    llhttp-ffi (0.3.1)
+    json (2.6.1)
+    llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
@@ -82,33 +100,33 @@ GEM
     nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     opentracing (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    opentracing_test_tracer (0.1.1)
+      opentracing
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rack-tracer (0.9.0)
-      opentracing (~> 0.4)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -122,7 +140,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -132,7 +150,7 @@ GEM
       rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
+    rubocop-ast (1.15.0)
       parser (>= 3.0.1.1)
     rubocop-config-umbrellio (1.17.0.53)
       rubocop (= 1.17.0)
@@ -163,15 +181,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)
+    thwait (0.2.0)
+      e2mmap
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -184,6 +205,7 @@ DEPENDENCIES
   http
   http-parser
   jcw!
+  opentracing_test_tracer
   pry
   railties
   rake

data/README.md

@@ -1,4 +1,4 @@
-# JCW · [![Supporting](https://github.com/Cado-Labs/cado-labs-logos/blob/main/cado_labs_badge.png)](https://github.com/Cado-Labs/) · [![Coverage Status](https://coveralls.io/repos/github/Cado-Labs/jcw/badge.svg?branch=gem-without-zeitwerk)](https://coveralls.io/github/Cado-Labs/jcw?branch=gem-without-zeitwerk) · [![Gem Version](https://badge.fury.io/rb/jcw.svg)](https://badge.fury.io/rb/jcw)
+# JCW &middot; <a target="_blank" href="https://github.com/Cado-Labs"><img src="https://github.com/Cado-Labs/cado-labs-logos/raw/main/cado_labs_badge.svg" alt="Supported by Cado Labs" style="max-width: 100%; height: 20px"></a> &middot; [![Coverage Status](https://coveralls.io/repos/github/Cado-Labs/jcw/badge.svg?branch=gem-without-zeitwerk)](https://coveralls.io/github/Cado-Labs/jcw?branch=gem-without-zeitwerk) &middot; [![Gem Version](https://badge.fury.io/rb/jcw.svg)](https://badge.fury.io/rb/jcw)
 
 Simple wrapper for the gem "jaeger-client" with simpler customization.
 
@@ -6,7 +6,7 @@ Simple wrapper for the gem "jaeger-client" with simpler customization.
 
 <p>
   <a href="https://github.com/Cado-Labs">
-    <img src="https://github.com/Cado-Labs/cado-labs-logos/blob/main/cado_labs_supporting.svg" alt="Supported by Cado Labs" />
+    <img src="https://github.com/Cado-Labs/cado-labs-resources/blob/main/cado_labs_supporting_rounded.svg" alt="Supported by Cado Labs" />
   </a>
 </p>
 
@@ -42,10 +42,11 @@ UDP Sender(default):
     hostname: "custom-hostname",
     custom_tag: "custom-tag-value",
   }
+  config.rack_ignore_paths = %w[/api/test]
 end
 
-# Set middleware for wrapping all requests(gem RackTracer)
-Rails.application.middleware.use(JCW::RackTracer)
+# Set middleware for wrapping all requests
+Rails.application.middleware.use(JCW::Rack::Tracer)
 ```
 
 TCP Sender:
@@ -59,16 +60,17 @@ TCP Sender:
     hostname: "custom-hostname",
     custom_tag: "custom-tag-value",
   }
+  config.rack_ignore_paths = %w[/api/test]
 end
 
 # Set middleware for wrapping all requests
-Rails.application.middleware.use(JCW::RackTracer)
+Rails.application.middleware.use(JCW::Rack::Tracer)
 
 # If you need send all logs with spans set on_finish_span and extend JaegerLoggerExtension
 # Not recommended for UDP sender, because default max packet size is 65,000 bytes.
 Rails.application.config.tap do |config|
   config.middleware.use(
-    JCW::RackTracer,
+    JCW::Rack::Tracer,
     on_finish_span: lambda do |span|
       JCW::Logger.current.logs.each { |log| span.log_kv(**log) }
       JCW::Logger.current.clear # Do not forget to avoid memory leaks
@@ -80,6 +82,43 @@ end
 ```
 - `config.subscribe_to` - not recommended for UDP sender, because default max packet size is 65,000 bytes.
 
+#### GRPC Integration
+
+Client side
+
+```ruby
+# Add JCW::Interceptors::Gruf::Client Interceptor to Gruf Client Initializer
+options = {}
+client_options = { timeout: 10, interceptors: [JCW::Interceptors::Gruf::Client.new] }
+
+client = Gruf::Client.new(
+  service: Test::Service, options: options, client_options: client_options
+)
+
+request_method = "some_method"
+client.call(request_method)
+```
+
+Server side
+
+```ruby
+# Add Server Interceptor
+Rails.configuration.to_prepare do
+  Gruf.configure do |config|
+    config.interceptors.use(JCW::Interceptors::Gruf::Server)
+  end
+end  
+
+# Configure
+::JCW::Wrapper.configure do |config|
+  config.service_name = "Service Name"
+  config.connection = { protocol: :udp, host: "127.0.0.1", port: 6831 }
+  config.enabled = true
+  config.subscribe_to = [/.*/]
+  config.grpc_ignore_methods = %w[grpc.ignore.method]
+end
+```
+
 ### Contributing
 
  - Fork it ( https://github.com/Cado-Labs/jcw )
@@ -95,7 +134,7 @@ Released under MIT License.
 ## Supporting
 
 <a href="https://github.com/Cado-Labs">
-  <img src="https://github.com/Cado-Labs/cado-labs-logos/blob/main/cado_labs_logo.png" alt="Supported by Cado Labs" />
+  <img src="https://github.com/Cado-Labs/cado-labs-resources/blob/main/cado_labs_supporting_rounded.svg" alt="Supported by Cado Labs" />
 </a>
 
 ## Authors

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.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.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,15 +22,16 @@ 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"
+  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 "rack-tracer", "~> 0.9.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "bundler-audit"
   spec.add_development_dependency "http"
   spec.add_development_dependency "http-parser"
+  spec.add_development_dependency "opentracing_test_tracer"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "railties"
   spec.add_development_dependency "rake"
@@ -38,4 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-config-umbrellio"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-lcov"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true",
+  }
 end

data/lib/jcw/config.rb

@@ -7,7 +7,9 @@ module JCW
                 :subscribe_to,
                 :connection,
                 :flush_interval,
-                :tags
+                :tags,
+                :grpc_ignore_methods,
+                :rack_ignore_paths
 
     def enabled
       @enabled ||= false
@@ -34,5 +36,13 @@ module JCW
     def tags
       @tags ||= {}
     end
+
+    def grpc_ignore_methods
+      @grpc_ignore_methods ||= []
+    end
+
+    def rack_ignore_paths
+      @rack_ignore_paths ||= []
+    end
   end
 end

data/lib/jcw/http_tracer.rb

@@ -17,6 +17,7 @@ module JCW
               host = request.uri.host if request.uri.respond_to?(:host)
               port = request.uri.port if request.uri.respond_to?(:port)
               verb = request.verb.to_s.upcase if request.respond_to?(:verb)
+              full_path = request.uri.to_s
 
               tags = {
                 "component" => "ruby-httprb",
@@ -25,13 +26,15 @@ module JCW
                 "http.url" => path,
                 "peer.host" => host,
                 "peer.port" => port,
+                "full_path" => full_path,
               }.compact
 
               tracer = ::HTTP::Tracer.tracer
 
-              tracer.start_active_span("http.request", tags: tags) do |scope|
+              request_name = "http.request #{verb} #{path}"
+              tracer.start_active_span(request_name, tags: tags) do |scope|
                 request.headers.merge!(options.headers)
-                OpenTracing.inject(scope.span.context, OpenTracing::FORMAT_RACK,
+                OpenTracing.inject(scope.span.context, OpenTracing::FORMAT_TEXT_MAP,
                                    request.headers)
 
                 res = perform_without_tracing(request, options)

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "gruf"
+
+module JCW
+  module Interceptors
+    module Gruf
+      class Client < ::Gruf::Interceptors::ClientInterceptor
+        def call(request_context:)
+          tracer = OpenTracing.global_tracer
+          metadata = request_context.metadata
+
+          tags = {
+            "component" => "gRPC",
+            "span.kind" => "client",
+            "grpc.method_type" => "request_response",
+            "grpc.headers" => metadata,
+          }
+
+          tracer.start_active_span(request_context.method.to_s, tags: tags) do |current_scope|
+            current_span = current_scope.span
+            current_span.log_kv(
+              event: "request",
+              data: request_context.requests.map { |request| request.try(:to_h) },
+            )
+            hpack_carrier = Hpack.new(metadata)
+            tracer.inject(current_span.context, ::OpenTracing::FORMAT_TEXT_MAP, hpack_carrier)
+
+            yield
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module JCW
+  module Interceptors
+    module Gruf
+      class Hpack
+        def initialize(wrapped)
+          @wrapped = wrapped
+        end
+
+        def [](key)
+          @wrapped[key.downcase]
+        end
+
+        def []=(key, value)
+          return unless value
+
+          @wrapped[key.downcase] = value
+        end
+
+        def each(&block)
+          @wrapped.each(&block)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "gruf"
+
+module JCW
+  module Interceptors
+    module Gruf
+      class Server < ::Gruf::Interceptors::ServerInterceptor
+        # rubocop:disable Metrics/MethodLength
+        def call
+          method = request.method_name
+          return yield if Wrapper.config.grpc_ignore_methods.include?(method)
+
+          tracer = OpenTracing.global_tracer
+          on_finish_span = options[:on_finish_span]
+          service_class = request.service
+          method_name = request.method_key
+          name = method_name.to_s.camelize
+          route = "/#{service_class.service_name}/#{name}"
+
+          begin
+            tags = {
+              "component" => "gRPC",
+              "span.kind" => "server",
+              "grpc.method_type" => "request_response",
+            }
+            hpack_carrier = Hpack.new(request.active_call.metadata)
+            parent_span_context = tracer.extract(::OpenTracing::FORMAT_TEXT_MAP, hpack_carrier)
+            current_scope = tracer.start_active_span(
+              route,
+              child_of: parent_span_context,
+              tags: tags,
+            )
+            current_span = current_scope.span
+            current_span.log_kv(event: "request", data: request.message.to_h)
+
+            response = yield
+
+            if response.try(:error_fields)
+              current_span.set_tag("error", true)
+              current_span.log_kv(event: "error", data: response.to_h)
+            end
+          rescue => e
+            if current_span
+              current_span.set_tag("error", true)
+              current_span.log_kv(event: "error", error_object: e)
+            end
+            raise
+          ensure
+            on_finish_span&.call(current_span)
+            current_scope.close if current_span
+          end
+
+          response
+        end
+        # rubocop:enable Metrics/MethodLength
+      end
+    end
+  end
+end

data/lib/jcw/rack_tracer.rb

@@ -1,5 +1,139 @@
 # frozen_string_literal: true
 
+# inspired https://github.com/opentracing-contrib/ruby-rack-tracer/blob/master/lib/rack/tracer.rb
 module JCW
-  RackTracer = Class.new(Rack::Tracer)
+  module Rack
+    class Tracer
+      REQUEST_URI = "REQUEST_URI"
+      REQUEST_PATH = "REQUEST_PATH"
+      REQUEST_METHOD = "REQUEST_METHOD"
+
+      # Create a new Rack Tracer middleware.
+      #
+      # @param app The Rack application/middlewares stack.
+      # @param tracer [OpenTracing::Tracer] A tracer to be used when start_span, and extract
+      #        is called.
+      # @param on_start_span [Proc, nil] A callback evaluated after a new span is created.
+      # @param on_finish_span [Proc, nil] A callback evaluated after a span is finished.
+      # @param ignore_paths [Array<Class>] An array of paths to be skiped by the tracer.
+      # @param errors [Array<Class>] An array of error classes to be captured by the tracer
+      #        as errors. Errors are **not** muted by the middleware, they're re-raised afterwards.
+      def initialize(app, # rubocop:disable Metrics/ParameterLists
+                     tracer: OpenTracing.global_tracer,
+                     on_start_span: nil,
+                     on_finish_span: nil,
+                     trust_incoming_span: true,
+                     ignore_paths: Wrapper.config.rack_ignore_paths,
+                     errors: [StandardError])
+        @app = app
+        @tracer = tracer
+        @on_start_span = on_start_span
+        @on_finish_span = on_finish_span
+        @trust_incoming_span = trust_incoming_span
+        @errors = errors
+        @ignore_paths = ignore_paths
+      end
+
+      def call(env)
+        method = env[REQUEST_METHOD]
+        path = env[REQUEST_PATH]
+        url = env[REQUEST_URI]
+        return @app.call(env) if @ignore_paths.include?(path)
+
+        set_extract_env(env)
+        context = @tracer.extract(OpenTracing::FORMAT_TEXT_MAP, env) if @trust_incoming_span
+        scope = build_scope(method, url, context)
+        span = scope.span
+        perform_on_start_span(env, span, @on_start_span)
+        call_request(env, span)
+      rescue *@errors => error
+        build_error_log(span, error)
+        raise
+      ensure
+        begin
+          close_scope(scope)
+        ensure
+          perform_on_finish_span(span)
+        end
+      end
+
+      private
+
+      def set_extract_env(env)
+        env["uber-trace-id"] = env["HTTP_UBER_TRACE_ID"]
+      end
+
+      def build_scope(method, url, context)
+        @tracer.start_active_span(
+          method,
+          child_of: context,
+          tags: {
+            "component" => "rack",
+            "span.kind" => "server",
+            "http.method" => method,
+            "http.url" => url,
+          },
+        )
+      end
+
+      def perform_on_start_span(env, span, on_start_span)
+        on_start_span&.call(span)
+        env["rack.span"] = span
+      end
+
+      def call_request(env, span)
+        @app.call(env).tap do |status_code, _headers, _body|
+          set_tag(span, status_code, env)
+        end
+      end
+
+      def set_tag(span, status_code, env)
+        span.set_tag("http.status_code", status_code)
+        route = route_from_env(env)
+        span.operation_name = route
+      end
+
+      def route_from_env(env)
+        method = env[REQUEST_METHOD]
+        if (sinatra_route = env["sinatra.route"])
+          sinatra_route
+        elsif (rails_controller = env["action_controller.instance"])
+          "#{method} #{rails_controller.controller_name}/#{rails_controller.action_name}"
+        elsif (grape_route_args = env["grape.routing_args"] || env["rack.routing_args"])
+          "#{method} #{grape_route_from_args(grape_route_args)}"
+        else
+          "#{method} #{env[REQUEST_PATH] || env["SCRIPT_NAME"] || env["PATH_INFO"]}".strip
+        end
+      end
+
+      def grape_route_from_args(route_args)
+        route_info = route_args[:route_info]
+        if route_info.respond_to?(:path)
+          route_info.path
+        elsif (rack_route_options = route_info.instance_variable_get(:@options))
+          rack_route_options[:path]
+        end
+      end
+
+      def build_error_log(span, error)
+        span.set_tag("error", true)
+        span.log_kv(
+          event: "error",
+          "error.kind": error.class.to_s,
+          "error.object": error,
+          message: error.message,
+          stack: error.backtrace.join("\n"),
+        )
+      end
+
+      def perform_on_finish_span(span)
+        return unless @on_finish_span
+        @on_finish_span.call(span)
+      end
+
+      def close_scope(scope)
+        scope&.close
+      end
+    end
+  end
 end

data/lib/jcw/version.rb

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

data/lib/jcw/wrapper.rb

@@ -21,5 +21,8 @@ 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"

data/lib/jcw.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rack/tracer"
+require "opentracing"
 require "jaeger/client"
 require "active_support"
 require "httprb-opentracing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jcw
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - Alexander Starovojtov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ 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
@@ -24,48 +27,51 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: httprb-opentracing
+  name: gruf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: jaeger-client
+  name: httprb-opentracing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: rack-tracer
+  name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opentracing_test_tracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +264,9 @@ files:
 - lib/jcw/config.rb
 - lib/jcw/http_tracer.rb
 - lib/jcw/init.rb
+- lib/jcw/interceptors/gruf/client.rb
+- lib/jcw/interceptors/gruf/hpack.rb
+- lib/jcw/interceptors/gruf/server.rb
 - lib/jcw/logger.rb
 - lib/jcw/logger_extension.rb
 - lib/jcw/rack_tracer.rb
@@ -253,7 +276,8 @@ files:
 homepage: https://github.com/Cado-Labs/jcw
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -262,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="