instana 1.10.7-java → 1.10.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9ae0af0a3e6a372b7fe53e21eb34613994be152ec5941fe9192e238fc83ca92
-  data.tar.gz: 405cea0367043d3389a7de25c0637801fb6376a42f45d043b22852982ae66809
+  metadata.gz: 8bace4b861697b0193cc8dff1fad928ab75e27f68933192c6270dc7d07887f7c
+  data.tar.gz: 8e7cb89f0e1ba9cb11eb57564578d996b01323549928debe639c548a5917a455
 SHA512:
-  metadata.gz: 9e699fb09a39844e295787394efe28479d9d1979540a91072bb8e747fd1c424303e15ce3eeec001cf69cfc39ded6d6a488683cf0605be253219309f8fc8435c7
-  data.tar.gz: a59016b9739d46366c1960f49b4fb197e2e593a34af898ddf82fc088c47fa3d780fd4ccdd80992fda8b78565245ca9690d03cf36c4b5ded187abf520b5f3e110
+  metadata.gz: 0c95d0e8a34f10ee3daac3f7cb658ce3409fe34f98683350493a12aacc03abf983c718e389bfc9aaca1ac74f98272251675ab6a2581acb7d142a60f619606860
+  data.tar.gz: 3c52fc61d3d8b1d2616b3cb1e6ff29b99c00fbc7a2ead65144de12c60de50920abd19e2b429718f766c1b978619945bcae1a89e78e650a8aa48c93e6aeecdc96

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: java
 authors:
 - Peter Giacomo Lombardo