instana 1.193.2 → 1.193.3.pre1

data/lib/instana/activators/rest_client.rb

@@ -0,0 +1,17 @@
+module Instana
+  module Activators
+    class RestClient < Activator
+      def can_instrument?
+        defined?(::RestClient::Request) && ::Instana.config[:'rest-client'][:enabled]
+      end
+
+      def instrument
+        require 'instana/instrumentation/rest-client'
+
+        ::RestClient::Request.prepend ::Instana::Instrumentation::RestClientRequest
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/roda.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class Roda < Activator
+      def can_instrument?
+        defined?(::Instana::Rack) && defined?(::Roda)
+      end
+
+      def instrument
+        require 'instana/frameworks/roda'
+
+        ::Roda.use ::Instana::Rack
+        ::Roda.plugin ::Instana::RodaPathTemplateExtractor
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/sidekiq_client.rb

@@ -0,0 +1,21 @@
+module Instana
+  module Activators
+    class SidekiqClient < Activator
+      def can_instrument?
+        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-client'][:enabled]
+      end
+
+      def instrument
+        require 'instana/instrumentation/sidekiq-client'
+
+        ::Sidekiq.configure_client do |cfg|
+          cfg.client_middleware do |chain|
+            chain.add ::Instana::Instrumentation::SidekiqClient
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/sidekiq_worker.rb

@@ -0,0 +1,21 @@
+module Instana
+  module Activators
+    class SidekiqWorker < Activator
+      def can_instrument?
+        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-worker'][:enabled]
+      end
+
+      def instrument
+        require 'instana/instrumentation/sidekiq-worker'
+
+        ::Sidekiq.configure_server do |cfg|
+          cfg.server_middleware do |chain|
+            chain.add ::Instana::Instrumentation::SidekiqWorker
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/sinatra.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class Sinatra < Activator
+      def can_instrument?
+        defined?(::Instana::Rack) && defined?(::Sinatra)
+      end
+
+      def instrument
+        require 'instana/frameworks/sinatra'
+
+        ::Sinatra::Base.use ::Instana::Rack
+        ::Sinatra::Base.register ::Instana::SinatraPathTemplateExtractor
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/frameworks/cuba.rb

@@ -3,23 +3,23 @@ require "instana/rack"
 module Instana
   module CubaPathTemplateExtractor
     REPLACE_TARGET = /:(?<term>[^\/]+)/i
-    
+
     def self.prepended(base)
       ::Instana.logger.debug "#{base} prepended #{self}"
     end
-    
-    def on(*args, &blk) 
+
+    def on(*args, &blk)
       wrapper = lambda do |*caputres|
         env['INSTANA_PATH_TEMPLATE_FRAGMENTS'] << args
           .select { |a| a.is_a?(String) }
           .join('/')
-      
+
         blk.call(*captures)
       end
-      
+
       super(*args, &wrapper)
     end
-    
+
     def call!(env)
       env['INSTANA_PATH_TEMPLATE_FRAGMENTS'] = []
       response = super(env)
@@ -30,10 +30,3 @@ module Instana
     end
   end
 end
-
-
-if defined?(::Cuba)
-  ::Instana.logger.debug "Instrumenting Cuba"
-  Cuba.use ::Instana::Rack
-  Cuba.prepend ::Instana::CubaPathTemplateExtractor
-end

data/lib/instana/frameworks/rails.rb

@@ -1,7 +1,6 @@
 require "instana/rack"
 
 if defined?(::Rails)
-
   if ::Rails::VERSION::MAJOR < 3
     ::Rails.configuration.after_initialize do
       # In Rails, let's use the Rails logger

data/lib/instana/frameworks/roda.rb

@@ -4,11 +4,11 @@ module Instana
   module RodaPathTemplateExtractor
     module RequestMethods
       TERM = defined?(::Roda) ? ::Roda::RodaPlugins::Base::RequestMethods::TERM : Object
-      
+
       def if_match(args, &blk)
         path = @remaining_path
         captures = @captures.clear
-  
+
         if match_all(args)
           (env['INSTANA_PATH_TEMPLATE_FRAGMENTS'] ||= []).concat(named_args(args, blk))
           block_result(blk.(*captures))
@@ -21,10 +21,10 @@ module Instana
           false
         end
       end
-      
-      def named_args(args, blk)  
-        parameters = blk.parameters      
-        args.map do |a| 
+
+      def named_args(args, blk)
+        parameters = blk.parameters
+        args.map do |a|
           case a
           when String
             a
@@ -35,13 +35,7 @@ module Instana
             "{#{name}}"
           end
         end.compact
-      end  
+      end
     end
   end
 end
-
-if defined?(::Roda)
-  ::Instana.logger.debug "Instrumenting Roda"
-  Roda.use ::Instana::Rack
-  Roda.plugin ::Instana::RodaPathTemplateExtractor
-end

data/lib/instana/frameworks/sinatra.rb

@@ -6,10 +6,9 @@ require "instana/rack"
 module Instana
   module SinatraPathTemplateExtractor
     def self.extended(base)
-      ::Instana.logger.debug "#{base} extended #{self}"
       base.store_path_template
     end
-    
+
     def store_path_template
       after do
         @env["INSTANA_HTTP_PATH_TEMPLATE"] = @env["sinatra.route"]
@@ -18,9 +17,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Sinatra)
-  ::Instana.logger.debug "Instrumenting Sinatra"
-  ::Sinatra::Base.use ::Instana::Rack
-  ::Sinatra::Base.register ::Instana::SinatraPathTemplateExtractor
-end

data/lib/instana/instrumentation/dalli.rb

@@ -69,9 +69,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Dalli) && ::Instana.config[:dalli][:enabled]
-  ::Instana.logger.debug "Instrumenting Dalli"
-  ::Dalli::Client.send(:prepend, ::Instana::Instrumentation::Dalli)
-  ::Dalli::Server.send(:prepend, ::Instana::Instrumentation::DalliServer)
-end

data/lib/instana/instrumentation/excon.rb

@@ -1,74 +1,68 @@
-if defined?(::Excon) && ::Instana.config[:excon][:enabled]
-  module Instana
-    module Instrumentation
-      class Excon < ::Excon::Middleware::Base
-        def request_call(datum)
-          return @stack.request_call(datum) unless ::Instana.tracer.tracing?
+module Instana
+  module Instrumentation
+    class Excon < ::Excon::Middleware::Base
+      def request_call(datum)
+        return @stack.request_call(datum) unless ::Instana.tracer.tracing?
 
-          payload = { :http => {} }
-          path = datum[:path].split('?').first
-          payload[:http][:url] = ::Instana.secrets.remove_from_query("#{datum[:connection].instance_variable_get(:@socket_key)}#{path}")
-          payload[:http][:method] = datum[:method] if datum.key?(:method)
+        payload = { :http => {} }
+        path = datum[:path].split('?').first
+        payload[:http][:url] = ::Instana.secrets.remove_from_query("#{datum[:connection].instance_variable_get(:@socket_key)}#{path}")
+        payload[:http][:method] = datum[:method] if datum.key?(:method)
 
-          if datum[:pipeline] == true
-            # Pass the context along in the datum so we get back on response
-            # and can close out the async span
-            datum[:instana_span] = ::Instana.tracer.log_async_entry(:excon, payload)
-            t_context = datum[:instana_span].context
-          else
-            ::Instana.tracer.log_entry(:excon, payload)
-            t_context = ::Instana.tracer.context
-          end
+        if datum[:pipeline] == true
+          # Pass the context along in the datum so we get back on response
+          # and can close out the async span
+          datum[:instana_span] = ::Instana.tracer.log_async_entry(:excon, payload)
+          t_context = datum[:instana_span].context
+        else
+          ::Instana.tracer.log_entry(:excon, payload)
+          t_context = ::Instana.tracer.context
+        end
 
-          # Set request headers; encode IDs as hexadecimal strings
-          datum[:headers]['X-Instana-T'] = t_context.trace_id_header
-          datum[:headers]['X-Instana-S'] = t_context.span_id_header
+        # Set request headers; encode IDs as hexadecimal strings
+        datum[:headers]['X-Instana-T'] = t_context.trace_id_header
+        datum[:headers]['X-Instana-S'] = t_context.span_id_header
 
-          @stack.request_call(datum)
-        end
+        @stack.request_call(datum)
+      end
 
-        def error_call(datum)
-          return @stack.error_call(datum) unless ::Instana.tracer.tracing?
+      def error_call(datum)
+        return @stack.error_call(datum) unless ::Instana.tracer.tracing?
 
-          if datum[:pipeline] == true
-            ::Instana.tracer.log_async_error(datum[:error], datum[:instana_span])
-          else
-            ::Instana.tracer.log_error(datum[:error])
-          end
-          @stack.error_call(datum)
+        if datum[:pipeline] == true
+          ::Instana.tracer.log_async_error(datum[:error], datum[:instana_span])
+        else
+          ::Instana.tracer.log_error(datum[:error])
         end
+        @stack.error_call(datum)
+      end
 
-        def response_call(datum)
-          # FIXME: Will connect exceptions call a response?
-          #
-          return @stack.response_call(datum) unless ::Instana.tracer.tracing?
+      def response_call(datum)
+        # FIXME: Will connect exceptions call a response?
+        #
+        return @stack.response_call(datum) unless ::Instana.tracer.tracing?
 
-          result =  @stack.response_call(datum)
+        result =  @stack.response_call(datum)
 
-          status = datum[:status]
-          if !status && datum.key?(:response) && datum[:response].is_a?(Hash)
-            status = datum[:response][:status]
-          end
+        status = datum[:status]
+        if !status && datum.key?(:response) && datum[:response].is_a?(Hash)
+          status = datum[:response][:status]
+        end
 
-          if status.between?(500, 511)
-            # Because of the 5xx response, we flag this span as errored but
-            # without a backtrace (no exception)
-            ::Instana.tracer.log_error(nil)
-          end
+        if status.between?(500, 511)
+          # Because of the 5xx response, we flag this span as errored but
+          # without a backtrace (no exception)
+          ::Instana.tracer.log_error(nil)
+        end
 
-          if datum[:pipeline] == true
-            # Pickup context of this async span from datum[:instana_span]
-            ::Instana.tracer.log_async_exit(:excon, { :http => {:status => status } }, datum[:instana_span])
-          else
-            ::Instana.tracer.log_exit(:excon, { :http => {:status => status } })
-          end
-          result
+        if datum[:pipeline] == true
+          # Pickup context of this async span from datum[:instana_span]
+          ::Instana.tracer.log_async_exit(:excon, { :http => {:status => status } }, datum[:instana_span])
+        else
+          ::Instana.tracer.log_exit(:excon, { :http => {:status => status } })
         end
+        result
       end
     end
   end
-
-  ::Instana.logger.debug "Instrumenting Excon"
-  ::Excon.defaults[:middlewares].unshift(::Instana::Instrumentation::Excon)
 end
-

data/lib/instana/instrumentation/graphql.rb

@@ -1,5 +1,5 @@
-if defined?(GraphQL::Schema) && defined?(GraphQL::Tracing::PlatformTracing) && ::Instana.config[:graphql][:enabled]
-  module Instana
+module Instana
+  module Instrumentation
     class GraphqlTracing < GraphQL::Tracing::PlatformTracing
       self.platform_keys = {
         'lex' => 'lex.graphql',
@@ -11,26 +11,26 @@ if defined?(GraphQL::Schema) && defined?(GraphQL::Tracing::PlatformTracing) && :
         'execute_query' => 'execute.graphql',
         'execute_query_lazy' => 'execute.graphql',
       }
-      
-      def platform_trace(platform_key, key, data) 
-        return yield unless key == 'execute_query'    
+
+      def platform_trace(platform_key, key, data)
+        return yield unless key == 'execute_query'
         operation = data[:query].selected_operation
-            
+
         arguments = []
         fields = []
-        
+
         operation.selections.each do |field|
           arguments.concat(walk_fields(field, :arguments))
-          fields.concat(walk_fields(field, :selections))    
+          fields.concat(walk_fields(field, :selections))
         end
-            
+
         payload = {
           operationName: data[:query].operation_name || 'anonymous',
           operationType: operation.operation_type,
           arguments: grouped_fields(arguments),
           fields: grouped_fields(fields),
         }
-                
+
         begin
           ::Instana.tracer.log_entry(:'graphql.server')
           yield
@@ -41,11 +41,11 @@ if defined?(GraphQL::Schema) && defined?(GraphQL::Tracing::PlatformTracing) && :
           ::Instana.tracer.log_exit(:'graphql.server', {graphql: payload})
         end
       end
-    
+
       def platform_field_key(type, field)
         "#{type.graphql_name}.#{field.graphql_name}"
       end
-      
+
       def platform_authorized_key(type)
         "#{type.graphql_name}.authorized.graphql"
       end
@@ -53,17 +53,17 @@ if defined?(GraphQL::Schema) && defined?(GraphQL::Tracing::PlatformTracing) && :
       def platform_resolve_type_key(type)
         "#{type.graphql_name}.resolve_type.graphql"
       end
-      
+
       private
-      
+
       def walk_fields(parent, method)
         return [] unless parent.respond_to?(method)
-        
+
         parent.send(method).map do |field|
           [{object: parent.name, field: field.name}] + walk_fields(field, method)
         end.flatten
       end
-      
+
       def grouped_fields(fields)
         fields
           .group_by { |p| p[:object] }
@@ -72,6 +72,4 @@ if defined?(GraphQL::Schema) && defined?(GraphQL::Tracing::PlatformTracing) && :
       end
     end
   end
-  
-  ::GraphQL::Schema.use(::Instana::GraphqlTracing)
 end

data/lib/instana/instrumentation/grpc.rb

@@ -1,7 +1,7 @@
 call_types = [:request_response, :client_streamer, :server_streamer, :bidi_streamer]
 
-if defined?(GRPC::ActiveCall) && ::Instana.config[:grpc][:enabled]
-  module Instana
+module Instana
+  module Instrumentation
     module GRPCCientInstrumentation
       CALL_TYPES = [:request_response, :client_streamer, :server_streamer, :bidi_streamer]
 
@@ -42,13 +42,10 @@ if defined?(GRPC::ActiveCall) && ::Instana.config[:grpc][:enabled]
       end
     end
   end
-
-  ::Instana.logger.debug 'Instrumenting GRPC client'
-  ::GRPC::ClientStub.prepend(::Instana::GRPCCientInstrumentation)
 end
 
-if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
-  module Instana
+module Instana
+  module Instrumentation
     module GRPCServerInstrumentation
       CALL_TYPES = [:request_response, :client_streamer, :server_streamer, :bidi_streamer]
 
@@ -88,7 +85,4 @@ if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
       end
     end
   end
-
-  ::Instana.logger.debug 'Instrumenting GRPC server'
-  ::GRPC::RpcDesc.prepend(::Instana::GRPCServerInstrumentation)
 end