opentracing-instrumentation 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21c6dd0e5e3405a61c7f1f9dc35b96f2816b22f2aefbc1d3e8a0af7e6649a9c7
-  data.tar.gz: 4edc2ce12c3f2fbe4888bb3f11140378662f0997947ede005e7d7e2182b490f6
+  metadata.gz: b58db3616510f2c097cf2586f113a23c28c0ca8232c828f3577f64e09aecdcce
+  data.tar.gz: 3a32e28eae0e9d698ac5f229453d981ac4ed01c3fc78533c89090615759030fc
 SHA512:
-  metadata.gz: 8d1cde83839d1dc7f8f4147bcfb0a1f09f1e0face18bad0aea6c72ecd2eafa5222beb32628c74944f90c2d3a70336e4c28949517d899515f9bc49e08887213bc
-  data.tar.gz: 3f085c1e904b497eeea53c9da4ee10cd00527731d224dba8166b2c63df5869710d9120dd9568303153bd0b6fc8421cad61eef2d00f18aa1f9aa889f23e3d5c82
+  metadata.gz: e46ac60a7008279377c14229b7dc7e61cdd14afb63f340e45de25005f1c5259a122c90d35c7493ef5daed703e113dcdbba45ec1604bcb9129999904df7258d6f
+  data.tar.gz: 442f72513f70e1323ed0a04b1a0e1c35e6d903593aadc11a9997b4da1bd395aedf9378065ce102ba703aa9cfdf8ece29a8ec13bf5703849367543a2ebdf5773b

data/GEM_VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/Gemfile.lock

@@ -18,7 +18,7 @@ GIT
 PATH
   remote: .
   specs:
-    opentracing-instrumentation (0.1.7)
+    opentracing-instrumentation (0.1.8)
       json
       opentracing (~> 0.5.0)
 
@@ -41,7 +41,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    faraday (0.9.2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     hutch (0.26.0)
       activesupport (>= 4.2, < 6)
@@ -68,7 +68,7 @@ GEM
       pry (~> 0.10)
     rack (2.2.2)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     redis (3.3.5)
     rexml (3.2.4)
     rspec (3.9.0)
@@ -105,15 +105,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 5.2)
   bson (~> 4.0)
   bundler (= 2.1.4)
   bunny (~> 2.0)
-  faraday (~> 0.9.2)
+  faraday (~> 1.0.1)
   hutch (~> 0.26.0)
   opentracing-instrumentation!
   pry-byebug (~> 3.8)
   rack (~> 2.2.2)
-  rake (~> 10.0)
+  rake (~> 13.0)
   redis (~> 3.3.5)
   rspec (~> 3.0)
   rubocop (~> 0.80.0)

data/README.md

@@ -1,38 +1,97 @@
 # Opentracing::Instrumentation
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/opentracing/instrumentation`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This gem provides instrumentation for some popular gems. Its gem not use
+monkey patching, instrumentation provided only as middleware or wrappers.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'opentracing-instrumentation'
+gem 'opentracing-instrumentation', require: 'opentracing/instrumentation'
 ```
 
 And then execute:
 
-    $ bundle
+```bash
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install opentracing-instrumentation
+```bash
+gem install opentracing-instrumentation
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+[Documentation](https://rubydoc.info/gems/opentracing-instrumentation/)
+
+### Gems
+
+#### [bunny](https://github.com/ruby-amqp/bunny)
+
+Documentation [OpenTracing::Instrumentation::Bunny](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Bunny)
+
+Tested versions: `2.14.3`
+
+#### [faraday](https://github.com/lostisland/faraday)
+
+Documentation: [OpenTracing::Instrumentation::Faraday](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Faraday)
+
+Tested versions: `0.9.2`, `1.0.1`
+
+#### [hutch](https://github.com/gocardless/hutch)
+
+Documentation: [OpenTracing::Instrumentation::Hutch](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Hutch)
+
+Tested versions: `0.21`, `0.26`
+
+#### [mongo](https://github.com/mongodb/mongo-ruby-driver)
+
+Documentation: [OpenTracing::Instrumentation::Mongo](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Mongo)
+
+Tested versions: `2.8`
+
+#### [rack](https://github.com/rack/rack)
+
+Documentation: [OpenTracing::Instrumentation::Rack](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Rack)
+
+Tested versions: `2.0`, `2.2`
+
+#### [redis](https://github.com/redis/redis-rb)
+
+Documentation: [OpenTracing::Instrumentation::Redis](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Redis)
+
+Tested versions: `3.3.5`
+
+#### [sidekiq](https://github.com/mperham/sidekiq)
+
+Documentation: [OpenTracing::Instrumentation::Sidekiq](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Sidekiq)
+
+Tested versions `4.2`
+
+#### [sinatra](https://github.com/sinatra/sinatra)
+
+Documentation: [OpenTracing::Instrumentation::Sinatra](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Sinatra)
+
+Tested version: `2.0.8`
+
+#### [thrift](https://github.com/apache/thrift/tree/master/lib/rb)
+
+Documentation: [OpenTracing::Instrumentation::Thrift](https://rubydoc.info/gems/opentracing-instrumentation/OpenTracing/Instrumentation/Thrift)
+
+Tested versions: `0.11.0` 
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to run the tests and lints. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `GEM_VERSION`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/opentracing-instrumentation.
+Bug reports and pull requests are welcome on [GitLab](https://gitlab.com/c0va23/opentracing-instrumentation).
 
 ## License
 

data/lib/opentracing/instrumentation.rb

@@ -7,19 +7,31 @@ module OpenTracing
   # popular Ruby gems.
   #
   # All instrumentations modules is lazy loaded (via autoload).
+  #
+  # {file:README.md}
+  #
+  # @see Bunny
+  # @see Faraday
+  # @see Hutch
+  # @see Mongo
+  # @see Rack
+  # @see Redis
+  # @see Sidekiq
+  # @see Sinatra
+  # @see Thrift
   module Instrumentation
     class Error < StandardError; end
 
-    autoload :ObjectWrapper, 'opentracing/instrumentation/object_wrapper'
+    autoload :Bunny, 'opentracing/instrumentation/bunny'
     autoload :Common, 'opentracing/instrumentation/common'
-    autoload :Rack, 'opentracing/instrumentation/rack'
-    autoload :Mongo, 'opentracing/instrumentation/mongo'
     autoload :Faraday, 'opentracing/instrumentation/faraday'
-    autoload :Sinatra, 'opentracing/instrumentation/sinatra'
-    autoload :Thrift, 'opentracing/instrumentation/thrift'
+    autoload :Hutch, 'opentracing/instrumentation/hutch'
+    autoload :Mongo, 'opentracing/instrumentation/mongo'
+    autoload :ObjectWrapper, 'opentracing/instrumentation/object_wrapper'
+    autoload :Rack, 'opentracing/instrumentation/rack'
     autoload :Redis, 'opentracing/instrumentation/redis'
     autoload :Sidekiq, 'opentracing/instrumentation/sidekiq'
-    autoload :Hutch, 'opentracing/instrumentation/hutch'
-    autoload :Bunny, 'opentracing/instrumentation/bunny'
+    autoload :Sinatra, 'opentracing/instrumentation/sinatra'
+    autoload :Thrift, 'opentracing/instrumentation/thrift'
   end
 end

data/lib/opentracing/instrumentation/bunny/regexp_routing_key_sanitazer.rb

@@ -42,7 +42,7 @@ module OpenTracing
 
         def filter_part(routing_key_part)
           replace_regexp_map.each do |placeholder, regexp|
-            return placeholder if regexp =~ routing_key_part
+            return placeholder if regexp.match?(routing_key_part)
           end
           routing_key_part
         end

data/lib/opentracing/instrumentation/thrift.rb

@@ -1,15 +1,30 @@
 # frozen_string_literal: true
 
+require 'thrift'
+
 module OpenTracing
   module Instrumentation
     # OpenTracing instrumentation for Thrift client and server
     module Thrift
-      autoload :Config,
-               'opentracing/instrumentation/thrift/config'
+      module_path = 'opentracing/instrumentation/thrift'
+
+      MESSAGE_TYPES = {
+        ::Thrift::MessageTypes::CALL => 'CALL',
+        ::Thrift::MessageTypes::REPLY => 'REPLY',
+        ::Thrift::MessageTypes::EXCEPTION => 'EXCEPTION',
+        ::Thrift::MessageTypes::ONEWAY => 'ONEWAY',
+      }.freeze
+
       autoload :TracedProtocol,
-               'opentracing/instrumentation/thrift/traced_protocol'
+               module_path + '/traced_protocol'
+      autoload :TracedProtocolConfig,
+               module_path + '/traced_protocol_config'
       autoload :TracedProtocolFactory,
-               'opentracing/instrumentation/thrift/traced_protocol_factory'
+               module_path + '/traced_protocol_factory'
+      autoload :TracedProtocolOperationNameBuilder,
+               module_path + '/traced_protocol_operation_name_builder'
+      autoload :TracedProtocolTagsBuilder,
+               module_path + '/traced_protocol_tags_builder'
     end
   end
 end

data/lib/opentracing/instrumentation/thrift/traced_protocol.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'thrift'
-
 module OpenTracing
   module Instrumentation
     module Thrift
@@ -28,116 +26,114 @@ module OpenTracing
 
         include ::Thrift::ProtocolDecorator
 
-        attr_reader :protocol
+        WRITE_DIRECTION = 'write'
+        READ_DIRECTION = 'read'
 
-        def initialize(protocol, config: Config.new)
-          @protocol = protocol
-          @config = config
+        def initialize(protocol, config: TracedProtocolConfig.new)
+          super(protocol)
+          @config = config.dup
+          yield @config if block_given?
+          @static_tags = config.tags_builder.build_static_tags(protocol)
         end
 
         def write_message_begin(name, type, seqid)
-          request_tags = build_request_tags(name, type)
-          self.write_scope = tracer.start_active_span(
-            write_operation_name,
-            tags: request_tags,
-          )
-          handler_error(write_scope.span, type)
+          self.write_scope = \
+            safe_start_active_span(WRITE_DIRECTION, name, type)
 
+          # Call protocol instaed super, beacaus ProtocolDecorator do not
+          # pass arguments to protocol.write_message_begin
           protocol.write_message_begin(name, type, seqid)
+        rescue StandardError => e
+          write_error(write_scope&.span, e)
+          safe_close_span(write_scope)
+          raise e
         end
 
         def write_message_end
           super
-          write_scope.close
+        ensure
+          safe_close_span(write_scope)
         end
 
         def read_message_begin
-          self.read_scope = tracer.start_active_span(read_operation_name)
+          start_time = Time.now.utc
 
           name, type, rseqid = super
 
-          tags = build_request_tags(name, type)
-          write_span_tags(read_scope.span, tags)
-          handler_error(read_scope.span, type)
+          self.read_scope = \
+            safe_start_active_span(READ_DIRECTION, name, type,
+                                   start_time: start_time)
 
           [name, type, rseqid]
         end
 
         def read_message_end
           super
-          read_scope.close
+        ensure
+          safe_close_span(read_scope)
         end
 
         private
 
+        attr_reader :static_tags
+        attr_reader :protocol
+
         def_delegators :@config,
                        :tracer,
-                       :write_operation_name,
-                       :read_operation_name
+                       :tags_builder,
+                       :operation_name_builder,
+                       :error_writer,
+                       :logger
 
         attr_accessor :write_scope,
                       :read_scope
 
-        METHOD_PART = 'method'
-        SERVICE_NAME_PART = 'service_name'
-        NAME_PATTER = /((?<service_name>\w+):)?(?<method>\w+)/.freeze
-        MESSAGE_TYPES = {
-          ::Thrift::MessageTypes::CALL => 'CALL',
-          ::Thrift::MessageTypes::REPLY => 'REPLY',
-          ::Thrift::MessageTypes::EXCEPTION => 'EXCEPTION',
-          ::Thrift::MessageTypes::ONEWAY => 'ONEWAY',
-        }.freeze
-
-        def parse_name(name)
-          name_matches = NAME_PATTER.match(name)
-          method = name_matches[METHOD_PART]
-          service_name = name_matches[SERVICE_NAME_PART]
-          [service_name, method]
-        end
-
-        def write_span_tags(span, tags)
-          tags.each do |tag, value|
-            span.set_tag(tag, value)
-          end
+        def safe_start_active_span(
+          direction,
+          name,
+          type,
+          start_time: Time.now.utc
+        )
+          operation_name = build_operation_name(direction, name, type)
+          request_tags = build_tags(name, type)
+
+          tracer.start_active_span(
+            operation_name,
+            tags: request_tags,
+            start_time: start_time,
+          )
+        rescue StandardError => e
+          logger&.error(e)
         end
 
-        def build_request_tags(name, type)
-          service_name, method = parse_name(name)
-          {
-            'thrift.method' => method,
-            'thrift.service_name' => service_name,
-            'thrift.type' => MESSAGE_TYPES[type],
-            'thrift.multiplexed' => !service_name.nil?,
-            'thrift.protocol' => protocol_name,
-            'thrift.transport' => transport_name,
-          }.compact
-        end
+        def safe_close_span(scope)
+          return if scope.nil?
 
-        def protocol_name
-          protocol.class.to_s
+          scope.close
+        rescue StandardError => e
+          logger&.error(e)
         end
 
-        def build_transport_name(transport)
-          inner_transport = transport.instance_variable_get(:@transport)
+        def write_error(span, exception)
+          return if span.nil?
 
-          if inner_transport
-            inner_transport_name = build_transport_name(inner_transport)
-            "#{transport.class}(#{inner_transport_name})"
-          else
-            transport.class.to_s
-          end
+          error_writer.write_error(span, exception)
+        rescue StandardError => e
+          logger&.error(e)
         end
 
-        def transport_name
-          return @transport_name if defined?(@transport_name)
-
-          @transport_name = build_transport_name(@protocol.trans)
+        def build_operation_name(direction, name, type)
+          operation_name_builder.build_operation_name(
+            direction,
+            name,
+            type,
+          )
         end
 
-        def handler_error(span, type)
-          return if type != ::Thrift::MessageTypes::EXCEPTION
-
-          span.set_tag('error', true)
+        def build_tags(name, type)
+          static_tags
+            .merge(tags_builder.build_message_tags(name, type))
+            .compact
         end
       end
     end

data/lib/opentracing/instrumentation/thrift/traced_protocol_config.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OpenTracing
+  module Instrumentation
+    module Thrift
+      # Config for TracedProtocol
+      class TracedProtocolConfig
+        attr_accessor :tracer,
+                      :tags_builder,
+                      :operation_name_builder,
+                      :error_writer,
+                      :logger
+
+        def initialize(
+          tracer: OpenTracing.global_tracer,
+          tags_builder: TracedProtocolTagsBuilder.new,
+          operation_name_builder: TracedProtocolOperationNameBuilder.new,
+          error_writer: Common::ErrorWriter.new,
+          logger: nil
+        )
+          @tracer = tracer
+          @tags_builder = tags_builder
+          @operation_name_builder = operation_name_builder
+          @error_writer = error_writer
+          @logger = logger
+        end
+      end
+    end
+  end
+end

data/lib/opentracing/instrumentation/thrift/traced_protocol_factory.rb

@@ -28,7 +28,7 @@ module OpenTracing
       #     )
       #   run thrift_app
       class TracedProtocolFactory < ::Thrift::BaseProtocolFactory
-        def initialize(protocol_factory, config: Config.new)
+        def initialize(protocol_factory, config: TracedProtocolConfig.new)
           @protocol_factory = protocol_factory
           @config = config
         end

data/lib/opentracing/instrumentation/thrift/traced_protocol_operation_name_builder.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'thrift'
+
+module OpenTracing
+  module Instrumentation
+    module Thrift
+      # Build operation name for TracedProtocol
+      class TracedProtocolOperationNameBuilder
+        DEFAULT_OPERATION_NAME_PATTERN = \
+          'thrift(direction=%<direction>s, name=%<name>s, type=%<type>s)'
+
+        attr_reader :operation_name_pattern
+
+        # @param operation_name_pattern [String]
+        def initialize(
+          operation_name_pattern: DEFAULT_OPERATION_NAME_PATTERN
+        )
+          @operation_name_pattern = operation_name_pattern
+        end
+
+        # @param direction [String] should be 'write' or 'read'
+        # @param name [String] method name. Example: 'Service:method'
+        # @param type [Integer] message type, See ::Thrift::MessageTypes
+        # @return [String] formated operation name
+        def build_operation_name(direction, name, type)
+          format_args = build_format_args(direction, name, type)
+          format(operation_name_pattern, **format_args)
+        end
+
+        private
+
+        def build_format_args(direction, name, type)
+          {
+            direction: direction,
+            name: name,
+            type: MESSAGE_TYPES[type],
+          }
+        end
+      end
+    end
+  end
+end

data/lib/opentracing/instrumentation/thrift/traced_protocol_tags_builder.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'thrift'
+
+module OpenTracing
+  module Instrumentation
+    module Thrift
+      # TagsBuilder for TracedProtocol
+      class TracedProtocolTagsBuilder
+        def build_message_tags(name, type)
+          service_name, method = parse_message_name(name)
+          {
+            'thrift.method' => method,
+            'thrift.service_name' => service_name,
+            'thrift.multiplexed' => !service_name.nil?,
+            'thrift.type' => MESSAGE_TYPES[type],
+          }.merge(error_tags(type))
+        end
+
+        def build_static_tags(protocol)
+          transport = protocol.trans
+          {
+            'thrift.protocol' => build_protocol_name(protocol),
+            'thrift.transport' => build_transport_name(transport),
+          }
+        end
+
+        private
+
+        NAME_PATTER = /((?<service_name>\w+):)?(?<method>\w+)/.freeze
+        SERVICE_NAME_PART = 'service_name'
+        METHOD_PART = 'method'
+
+        def parse_message_name(name)
+          name_matches = NAME_PATTER.match(name)
+          method = name_matches[METHOD_PART]
+          service_name = name_matches[SERVICE_NAME_PART]
+          [service_name, method]
+        end
+
+        def build_protocol_name(protocol)
+          protocol.class.to_s
+        end
+
+        def build_transport_name(transport)
+          inner_transport = transport.instance_variable_get(:@transport)
+
+          if inner_transport
+            inner_transport_name = build_transport_name(inner_transport)
+            "#{transport.class}(#{inner_transport_name})"
+          else
+            transport.class.to_s
+          end
+        end
+
+        def error_tags(type)
+          return {} if type != ::Thrift::MessageTypes::EXCEPTION
+
+          {
+            'error' => true,
+          }
+        end
+      end
+    end
+  end
+end

data/opentracing-instrumentation.gemspec

@@ -27,13 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'opentracing', '~> 0.5.0'
 
+  spec.add_development_dependency 'activesupport', '~> 5.2'
   spec.add_development_dependency 'bson', '~> 4.0'
   spec.add_development_dependency 'bundler', File.read('.BUNDLER_VERSION').strip
   spec.add_development_dependency 'bunny', '~> 2.0'
-  spec.add_development_dependency 'faraday', '~> 0.9.2'
+  spec.add_development_dependency 'faraday', '~> 1.0.1'
   spec.add_development_dependency 'hutch', '~> 0.26.0'
   spec.add_development_dependency 'rack', '~> 2.2.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'redis', '~> 3.3.5'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.80.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentracing-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Fedorenko Dmitrij
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: hutch
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -276,9 +290,11 @@ files:
 - lib/opentracing/instrumentation/sinatra.rb
 - lib/opentracing/instrumentation/sinatra/trace_middleware.rb
 - lib/opentracing/instrumentation/thrift.rb
-- lib/opentracing/instrumentation/thrift/config.rb
 - lib/opentracing/instrumentation/thrift/traced_protocol.rb
+- lib/opentracing/instrumentation/thrift/traced_protocol_config.rb
 - lib/opentracing/instrumentation/thrift/traced_protocol_factory.rb
+- lib/opentracing/instrumentation/thrift/traced_protocol_operation_name_builder.rb
+- lib/opentracing/instrumentation/thrift/traced_protocol_tags_builder.rb
 - lib/opentracing/instrumentation/version.rb
 - opentracing-instrumentation.gemspec
 homepage: https://gitlab.com/c0va23/ruby-opentracing-instrumentation.

data/lib/opentracing/instrumentation/thrift/config.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module OpenTracing
-  module Instrumentation
-    module Thrift
-      # Config for TracedProtocol
-      class Config
-        attr_accessor :tracer,
-                      :write_operation_name,
-                      :read_operation_name
-
-        def initialize(
-          tracer: OpenTracing.global_tracer,
-          write_operation_name: 'thrift_write',
-          read_operation_name: 'thrift_read'
-        )
-          @tracer = tracer
-          @write_operation_name = write_operation_name
-          @read_operation_name = read_operation_name
-        end
-      end
-    end
-  end
-end