opentracing-instrumentation 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106a9dbe45448a23d7f3ae81c6088e48eeb3e5758b9092315d1c2e81ed3e27de
-  data.tar.gz: '0268cc6d0f0db99d52b447bda20115ea1fd04820ec14e2a59d8e941d29782797'
+  metadata.gz: def13b56ba7d8cba9c3796428982ff8016c3fffbb7610f997fc60c1c631847e8
+  data.tar.gz: ea37c8d5f8642e3734b74657e465d90fe64d8461712910ed171ef81fcf595edb
 SHA512:
-  metadata.gz: 9292a2dd9483d8c34138eb68d5d4a8cd94cedc5d666d1df55a06af4acf7b1d4508deab4dc83436db798cd879cab1f6f9f014be0611b2efddf7a0990896a7ffaf
-  data.tar.gz: deb16198328e487a0d3200e6f5083c5c78ede07e3aaa75be1b25828ae2b817904cc39c268d39559f9518adc2c02108eb371a481bfc31ca7c48d0c357ac2be4ae
+  metadata.gz: a9112898127b2d8e20c91b23a911a69895904e5de524f531e3f6a3db8bf251981f9cffdb5544f2138a1ce9395fa32dcaa6109f5a82b0d4830c783d8c2af4093f
+  data.tar.gz: cb4009e3b9d372456311fc7211e0460a152f127c174b64e30c4822deee47f0f7c713ecb70e1a2f16c6fb68e97b603c9fd4495060b4764e67d594c94f0bdec8de

data/GEM_VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/Gemfile.lock

@@ -18,7 +18,7 @@ GIT
 PATH
   remote: .
   specs:
-    opentracing-instrumentation (0.1.3)
+    opentracing-instrumentation (0.1.4)
       json
       opentracing (~> 0.5.0)
 

data/lib/opentracing/instrumentation/rack.rb

@@ -5,6 +5,8 @@ module OpenTracing
     # Rack tracing middlewares
     module Rack
       autoload :HttpTagger, 'opentracing/instrumentation/rack/http_tagger'
+      autoload :RegexpHostSanitazer,
+               'opentracing/instrumentation/rack/regexp_host_sanitazer'
       autoload :RegexpPathSanitazer,
                'opentracing/instrumentation/rack/regexp_path_sanitazer'
       autoload :StaticCommandNameBuilder,

data/lib/opentracing/instrumentation/rack/regexp_host_sanitazer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+module OpenTracing
+  module Instrumentation
+    module Rack
+      # RegexpHostSanitazer sanitaze host
+      class RegexpHostSanitazer
+        DEFAULT_REPLACE_MAP = {
+          '\1.0.0.0' => /^(\d+)\.\d+\.\d+\.\d+:\d+$/,
+        }.freeze
+
+        def initialize(replace_map: DEFAULT_REPLACE_MAP)
+          @replace_map = replace_map
+        end
+
+        def sanitaze_host(host)
+          @replace_map.each do |pattern, regexp|
+            host = host.gsub(regexp, pattern)
+          end
+          host
+        end
+      end
+    end
+  end
+end

data/lib/opentracing/instrumentation/rack/regexp_path_sanitazer.rb

@@ -10,6 +10,7 @@ module OpenTracing
         DEFAULT_REPLACE_MAP = {
           '/:object_id\1' => %r{/[0-9a-f]{24}(/|$)},
           '/:sequence_id\1' => %r{/\d+(/|$)},
+          '/:phone\1' => %r{/\+\d+(/|$)},
         }.freeze
 
         def initialize(

data/lib/opentracing/instrumentation/rack/url_command_name_builder.rb

@@ -8,14 +8,15 @@ module OpenTracing
       # UrlCommandNameBuilder build command name with request url
       class UrlCommandNameBuilder
         DEFAULT_COMMAND_PATTERN = \
-          'rack(%<method>s %<schema>s://%<host>s:%<port>d%<path>s)'
-        DEFAULT_PORT = 80
+          'rack(%<method>s %<schema>s://%<host>s%<path>s)'
 
         def initialize(
           command_pattern: DEFAULT_COMMAND_PATTERN,
+          host_sanitazer: RegexpHostSanitazer.new,
           path_sanitazer: RegexpPathSanitazer.new
         )
           @command_pattern = command_pattern
+          @host_sanitazer = host_sanitazer
           @path_sanitazer = path_sanitazer
         end
 
@@ -31,11 +32,17 @@ module OpenTracing
           {
             schema: env[::Rack::RACK_URL_SCHEME],
             method: env[::Rack::REQUEST_METHOD],
-            host: env[::Rack::HTTP_HOST],
-            port: env[::Rack::HTTP_PORT] || DEFAULT_PORT,
+            host: sanitaze_host(env[::Rack::HTTP_HOST]),
+            port: env[::Rack::HTTP_PORT],
             path: sanitazed_path,
           }
         end
+
+        def sanitaze_host(host)
+          return if host.nil?
+
+          @host_sanitazer.sanitaze_host(host)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentracing-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Fedorenko Dmitrij
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-29 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -259,6 +259,7 @@ files:
 - lib/opentracing/instrumentation/object_wrapper.rb
 - lib/opentracing/instrumentation/rack.rb
 - lib/opentracing/instrumentation/rack/http_tagger.rb
+- lib/opentracing/instrumentation/rack/regexp_host_sanitazer.rb
 - lib/opentracing/instrumentation/rack/regexp_path_sanitazer.rb
 - lib/opentracing/instrumentation/rack/static_command_name_builder.rb
 - lib/opentracing/instrumentation/rack/trace_middleware.rb