jcw 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110c81162cbfa9b0c7320539340e3adc8f2ecb0dc76f3ebc398ab3ef9330db31
-  data.tar.gz: 637bfb300fc81f4e07dce12983da6e4a342dbaa2445695241c7f3bd6fdd76f69
+  metadata.gz: 2b1e12954a296bbc3e7413110a7b151fe38c0d422e156cebbd5ae7157bbe111b
+  data.tar.gz: '00488dffa129ca3c4a2b45fb3f8f947f1dec9b4310b8a900813426afa397fc92'
 SHA512:
-  metadata.gz: 1cd01757ae92d40d4e0bd2ba687fc62d612a3ce7a6b3178d1a4038c56e7c2877ff219a8415fe0f4c099b0930b341eaff81efe2345ce6361384c46dfaa16829ab
-  data.tar.gz: 696a1156f40a49295c53f638b2626e6269c445f30f73ad809bc725dc765673417de5c9869c39fe3cbbc58146a951ef14f4d11e7a00b6a36193358e3b73ec1c3c
+  metadata.gz: 61b7221435873848d3bb19e0e9ca30157c127601633fb4ca129fbc150fe5da98f2013bdc334139c455801fcb7fe90db8fb47809a4b1bba86f4e58d8ab1034162
+  data.tar.gz: 1140c437317341c6836f196711496f9dedb0e0959571d7f882c9750f6c690ca3026dd807916fd958c7a7628587cea5e985da1b55631f9b4fcbc15691a8cf7e49

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jcw (0.2.2)
+    jcw (0.2.3)
       activesupport (>= 5.0, < 7.0.0)
       gruf (~> 2.10)
       httprb-opentracing (~> 0.4.0)
@@ -49,22 +49,22 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    google-protobuf (3.19.1)
+    google-protobuf (3.19.2)
     googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
-    grpc (1.42.0)
-      google-protobuf (~> 3.18)
+    grpc (1.41.0)
+      google-protobuf (~> 3.17)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.42.0)
-    gruf (2.10.0)
+    grpc-tools (1.41.0)
+    gruf (2.12.0)
       activesupport (> 4)
       concurrent-ruby (> 1)
-      e2mmap (~> 0.1)
-      grpc (~> 1.10)
-      grpc-tools (~> 1.10)
+      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)
+      slop (>= 4.6)
+      thwait (>= 0.1)
     http (5.0.4)
       addressable (~> 2.8)
       http-cookie (~> 1.0)

data/lib/jcw/rack_tracer.rb

@@ -38,45 +38,31 @@ module JCW
         method = env[REQUEST_METHOD]
         path = env[REQUEST_PATH]
         url = env[REQUEST_URI]
-
         return @app.call(env) if @ignore_paths.include?(path)
 
-        handle_error(@errors) do
-          env["uber-trace-id"] = env["HTTP_UBER_TRACE_ID"]
-          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)
-
-          @app.call(env).tap do |status_code, _headers, _body|
-            set_tag(@span, status_code, env)
-          end
-        end
-      end
-
-      private
-
-      def handle_error(errors)
-        yield
-      rescue *errors => e
-        @span.set_tag("error", true)
-        @span.log_kv(
-          event: "error",
-          "error.kind": e.class.to_s,
-          "error.object": e,
-          message: e.message,
-          stack: e.backtrace.join("\n"),
-        )
+        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
-          @scope.close
+          close_scope(scope)
         ensure
-          perform_on_finish_span
+          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,
@@ -95,10 +81,16 @@ module JCW
         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 if route
+        span.operation_name = route
       end
 
       def route_from_env(env)
@@ -109,6 +101,8 @@ module JCW
           "#{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
 
@@ -121,9 +115,24 @@ module JCW
         end
       end
 
-      def perform_on_finish_span
+      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)
+        @on_finish_span.call(span)
+      end
+
+      def close_scope(scope)
+        scope&.close
       end
     end
   end

data/lib/jcw/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jcw
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alexander Starovojtov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport