instana 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4988b08659f80e1f76d21135af688030ee190a0
-  data.tar.gz: c773f6f64f7559da3e10dbfef73d1ca8012bd289
+  metadata.gz: 83702cf490019361b99d4c0096e4e12297a915e4
+  data.tar.gz: a7d1b3d505cc1466d1bf5bf784641bf07228f91c
 SHA512:
-  metadata.gz: 2b6c215de5684fffe16f8338958b47b8b09cc8b17e6a15b4e2e8a6361f9eb14ba8ca343d8b7ca6a08c7b8d92d95a6ea5a368cd21d4211194c1175ef0a2f796bd
-  data.tar.gz: 9e22ce676e64dd9eb0adab68ea0a9933e1343f83356f88a0796ac6aa3f89582d76fe01d3dc4636afe62b2f6e77cdeca38d7e3a61861dd328e24aa00828cb2dbc
+  metadata.gz: a3950247007e4aa9b70d08257e7b9fbb5ccf99e211f454415edd1a9140840745b11e81e045b3596c22383c3d3405a0d4594a2858419b44bed49d3114af7c0c11
+  data.tar.gz: cf9910fa2bfa9bfd5e80b24f64539fadb9d235b523f7f9bf4f6d81ba0daf10627b117d62d6c2502af8ee45e0b4d9064c2cd53af22335c9ceb9d2b0e9359259e5

data/.travis.yml

@@ -19,6 +19,9 @@ before_install:
 
 script: "bundle exec rake test"
 
+services:
+  - memcached
+
 notifications:
   slack:
     rooms:

data/Gemfile

@@ -22,6 +22,9 @@ group :development, :test do
   # HTTP Clients
   gem 'excon'
 
+  # Memcache
+  gem 'dalli'
+
   # Rack v2 dropped support for Ruby 2.2 and higher.
   if RUBY_VERSION < '2.2'
     gem 'rack', '< 2.0'

data/Rakefile

@@ -17,6 +17,8 @@ task :environment do
 end
 
 task :console => :environment do
+  # Possible debug levels: :agent, :agent_comm, :trace, :agent_response, :tracing
+  # ::Instana.logger.debug_level = [ :agent, :agent_comm ]
   ARGV.clear
   Pry.start
 end

data/lib/instana/config.rb

@@ -21,6 +21,7 @@ module Instana
       @config[:eum_baggage] = {}
 
       # HTTP Clients
+      @config[:dalli]         = { :enabled => true }
       @config[:excon]         = { :enabled => true }
       @config[:nethttp]       = { :enabled => true }
       @config[:'rest-client'] = { :enabled => true }

data/lib/instana/instrumentation/dalli.rb

@@ -0,0 +1,78 @@
+module Instana
+  module Instrumentation
+    module Dalli
+      def self.included(klass)
+        ::Instana::Util.method_alias(klass, :perform)
+        ::Instana::Util.method_alias(klass, :get_multi)
+      end
+
+      def perform_with_instana(*args, &blk)
+        if !::Instana.tracer.tracing? || ::Instana.tracer.tracing_span?(:memcache)
+          do_skip = true
+          return perform_without_instana(*args, &blk)
+        end
+
+        op, key, *_opts = args
+
+        entry_payload = { :memcache => {} }
+        entry_payload[:memcache][:namespace] = @options[:namespace] if @options.key?(:namespace)
+        entry_payload[:memcache][:command] = op
+        entry_payload[:memcache][:key] = key
+
+        ::Instana.tracer.log_entry(:memcache, entry_payload)
+        result = perform_without_instana(*args, &blk)
+
+        kv_payload = { :memcache => {}}
+        if op == :get
+          kv_payload[:memcache][:hit] = result ? 1 : 0
+        end
+        result
+      rescue => e
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:memcache, kv_payload) unless do_skip
+      end
+
+      def get_multi_with_instana(*keys)
+        entry_payload = { :memcache => {} }
+        entry_payload[:memcache][:namespace] = @options[:namespace] if @options.key?(:namespace)
+        entry_payload[:memcache][:command] = :get_multi
+        entry_payload[:memcache][:keys] = keys.flatten.join(", ")
+
+        ::Instana.tracer.log_entry(:memcache, entry_payload)
+        result = get_multi_without_instana(*keys)
+
+        exit_payload = { :memcache => {} }
+        exit_payload[:memcache][:hits] = result.length
+        result
+      rescue => e
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:memcache, exit_payload)
+      end
+    end
+
+    module DalliServer
+      def self.included(klass)
+        ::Instana::Util.method_alias(klass, :request)
+      end
+
+      def request_with_instana(op, *args)
+        if ::Instana.tracer.tracing? || ::Instana.tracer.tracing_span?(:memcache)
+          info_payload = { :memcache => {} }
+          info_payload[:memcache][:server] = "#{@hostname}:#{@port}"
+          ::Instana.tracer.log_info(info_payload)
+        end
+        request_without_instana(op, *args)
+      end
+    end
+  end
+end
+
+if defined?(::Dalli) && ::Instana.config[:dalli][:enabled]
+  ::Instana.logger.warn "Instrumenting Dalli"
+  ::Dalli::Client.send(:include, ::Instana::Instrumentation::Dalli)
+  ::Dalli::Server.send(:include, ::Instana::Instrumentation::DalliServer)
+end

data/lib/instana/tracer.rb

@@ -73,6 +73,7 @@ module Instana
     #
     def log_start_or_continue(name, kvs = {}, incoming_context = {})
       return unless ::Instana.agent.ready?
+      ::Instana.logger.debug "#{__method__} passed a block.  Use `start_or_continue` instead!" if block_given?
       self.current_trace = ::Instana::Trace.new(name, kvs, incoming_context)
     end
 
@@ -307,6 +308,20 @@ module Instana
       self.current_trace ? true : false
     end
 
+    # Indicates if we're tracing and the current span name matches
+    # <name>
+    #
+    # @param name [Symbol] the name to check against the current span
+    #
+    # @return [Boolean]
+    #
+    def tracing_span?(name)
+      if self.current_trace
+        return self.current_trace.current_span.name == name
+      end
+      false
+    end
+
     # Retrieve the current context of the tracer.
     #
     # @return [SpanContext] or nil if not tracing

data/lib/instana/tracing/span.rb

@@ -1,6 +1,6 @@
 module Instana
   class Span
-    REGISTERED_SPANS = [ :rack, :'net-http', :excon ].freeze
+    REGISTERED_SPANS = [ :rack, :'net-http', :excon, :memcache ].freeze
     ENTRY_SPANS = [ :rack ].freeze
     EXIT_SPANS = [ :'net-http', :excon ].freeze
     HTTP_SPANS = ENTRY_SPANS + EXIT_SPANS

data/lib/instana/util.rb

@@ -7,7 +7,8 @@ module Instana
       # @param method [Symbol] The name of the method to be aliased.
       #
       def method_alias(klass, method)
-        if klass.method_defined?(method.to_sym)
+        if klass.method_defined?(method.to_sym) ||
+            klass.private_method_defined?(method.to_sym)
 
           with = "#{method}_with_instana"
           without = "#{method}_without_instana"

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - lib/instana/frameworks/sinatra.rb
 - lib/instana/helpers.rb
 - lib/instana/instrumentation.rb
+- lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/net-http.rb
 - lib/instana/instrumentation/rack.rb