instana 1.10.7 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd31764e86ed22f6624818810c189437f08475585c58d89e0c3023cdb9f5bc6d
-  data.tar.gz: 3f0082903dc66df03dd6ac6adcfa096361dd9d008a3a4b065478736a72af61d0
+  metadata.gz: 684dee7f05eb5f97c5a798ecbcbc2f3dc64a55399111684416c9c0322f064e7a
+  data.tar.gz: 6112a16e4bcc2e25806472b5d92dfeaa03927af40a0a163a51d4ec8a387cef7e
 SHA512:
-  metadata.gz: 1b9b114d95b76a39c7c9a59e4286a6afafd69d26f0be88151914d820eca7490675def3126766b5e0e819843559143bbde93f3c7df586b619d5332c5312fc3eff
-  data.tar.gz: fb29d11d14083efccf91f021398d19b60f04de06788444ecfa77ca5857861416a1015514f4d87e1c6084fb04aa8a94b5ed3e243583be602dd2660792920c86e3
+  metadata.gz: 37bc36f94b938bf57384191c673d952ad8b9a7d2ed7cefe89b07ac4d23dd5d8e0d364365f1d1021c35a1f81a85ee7588df6239c509cba41f2f6ffb3070e003a0
+  data.tar.gz: 31e1dc82d98ea8aee566044803c629e03a3a293b508c5a70ebd69b561d7d4cd87b0c79546767500d77a66fb61b7703b199072a20713d6fab1f4f985b9df59e64

data/lib/instana/instrumentation/dalli.rb

@@ -20,18 +20,20 @@ module Instana
         entry_payload[:memcache][:key] = key
 
         ::Instana.tracer.log_entry(:memcache, entry_payload)
+        exit_payload = { :memcache => {} }
+
         result = perform_without_instana(*args, &blk)
 
-        kv_payload = { :memcache => {}}
         if op == :get
-          kv_payload[:memcache][:hit] = result ? 1 : 0
+          exit_payload[:memcache][:hit] = result ? 1 : 0
         end
         result
       rescue => e
+        exit_payload[:memcache][:error] = e.message rescue nil
         ::Instana.tracer.log_error(e)
         raise
       ensure
-        ::Instana.tracer.log_exit(:memcache, kv_payload) unless do_skip
+        ::Instana.tracer.log_exit(:memcache, exit_payload) unless do_skip
       end
 
       def get_multi_with_instana(*keys)
@@ -41,12 +43,14 @@ module Instana
         entry_payload[:memcache][:keys] = keys.flatten.join(", ")
 
         ::Instana.tracer.log_entry(:memcache, entry_payload)
+        exit_payload = { :memcache => {} }
+
         result = get_multi_without_instana(*keys)
 
-        exit_payload = { :memcache => {} }
         exit_payload[:memcache][:hits] = result.length
         result
       rescue => e
+        exit_payload[:memcache][:error] = e.message rescue nil
         ::Instana.tracer.log_error(e)
         raise
       ensure

data/lib/instana/version.rb

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

data/test/instrumentation/dalli_test.rb

@@ -250,4 +250,40 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:hits)
     assert_equal 2, second_span[:data][:memcache][:hits]
   end
+
+  def test_get_error_logging
+    clear_all!
+
+    # Invalid/broken client not connected to a server
+    broken_dc = Dalli::Client.new('128.0.0.100:11222', :namespace => "instana_test", :expires_in => 1)
+
+    result = nil
+    begin
+      ::Instana.tracer.start_or_continue_trace(:dalli_test) do
+        result = broken_dc.get(:instana)
+      end
+    rescue
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    first_span = spans[1]
+    second_span = spans[0]
+
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
+
+    assert_equal :memcache, second_span[:n]
+    assert_equal true, second_span.key?(:error)
+    assert second_span[:p] == first_span[:s]
+    assert first_span[:t] == first_span[:s]
+    assert second_span[:data].key?(:memcache)
+    assert second_span[:data][:memcache].key?(:command)
+    assert_equal :get, second_span[:data][:memcache][:command]
+    assert second_span[:data][:memcache].key?(:key)
+    assert_equal :instana, second_span[:data][:memcache][:key]
+    assert second_span[:data][:memcache].key?(:namespace)
+    assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
+    assert second_span[:data][:memcache].key?(:error)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.10.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana