instana 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 359eb9e6f94b0a6ea70072310f8eb59c4b964766
-  data.tar.gz: 06daf1c2ef5af35a81216572131b5d0dca9212f9
+  metadata.gz: 46ca5cff704edd13d94cd98eff05943e16d54132
+  data.tar.gz: da416ea68943aee4b223683c8a0a1a7e33d5fbe8
 SHA512:
-  metadata.gz: b8ccc331cc71b9b8d63f9fcd88f4aa83e89a346bd4072a30f140ef64252785bb3ac852fc5184bfc26781323281ccad46da8d2fc4a6167beb1940c36a7d97eeec
-  data.tar.gz: f0cdf9f600f5cffefe78bb5809fc16601a56bf57ddc69a3e57e7b1ed7a472215ba49e9ca143907bbd0e8af14839ab384051f5341cb5b07b16e04f27103b3d626
+  metadata.gz: 1a109723a6d7285203e57d93163c7be999dd3ed7f90b3aff053d40b625a0631dc814773db35d8abed7dbdf62cf08b615649e1f0d8597841ed963354061bdd556
+  data.tar.gz: ca5605829d78d18841516c6af59a70d552479affd0d353169d86e245fe5e2ec0b3d5e6d1708baa92c57f1ab3f680cb4332bf6246b1e565af83cff93060215c43

data/lib/instana/tracer.rb

@@ -393,7 +393,7 @@ module Instana
     # Indicates if the name of the current span matches <candidate>
     #
     def current_span_name?(candidate)
-      self.current_trace &&  self.current_trace.current_span.name == candidate
+      self.current_trace &&  self.current_trace.current_span.name == candidate.to_sym
     end
 
     # Used in the test suite, this resets the tracer to non-tracing state.

data/lib/instana/util.rb

@@ -191,7 +191,7 @@ module Instana
           Instana.logger.debug "id_to_header received a #{id.class}: returning empty string"
           return String.new
         end
-        [id.to_i].pack('q>').unpack('H*')[0]
+        [id.to_i].pack('q>').unpack('H*')[0].gsub(/^0+/, '')
       rescue => e
         Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug e.backtrace.join("\r\n")
@@ -208,6 +208,12 @@ module Instana
           Instana.logger.debug "header_to_id received a #{header_id.class}: returning 0"
           return 0
         end
+        if header_id.length < 16
+          # The header is less than 16 chars.  Prepend
+          # zeros so we can convert correctly
+          missing = 16 - header_id.length
+          header_id = ("0" * missing) + header_id
+        end
         [header_id].pack("H*").unpack("q>")[0]
       rescue => e
         Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"

data/lib/instana/version.rb

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

data/test/tracing/id_management_test.rb

@@ -26,7 +26,7 @@ class TracerIDMgmtTest < Minitest::Test
 
     # Assert that it is a string and there are no non-hex characters
     assert converted_id.is_a?(String)
-    assert converted_id == "0000000000000000"
+    assert converted_id == ''
 
     # Test passing a nil
     converted_id = Instana::Util.id_to_header(nil)
@@ -78,6 +78,23 @@ class TracerIDMgmtTest < Minitest::Test
     id = Instana::Util.header_to_id(original_header_id)
     converted_back_header_id = Instana::Util.id_to_header(id)
     assert_equal original_header_id, converted_back_header_id
+
+    # Test a random value
+    id = -7815363404733516491
+    header = "938a406416457535"
+
+    result = Instana::Util.header_to_id(header)
+    assert_equal id, result
+
+    result = Instana::Util.id_to_header(id)
+    assert_equal header, result
+
+    10000.times do
+      original_id = ::Instana::Util.generate_id
+      header_id = Instana::Util.id_to_header(original_id)
+      converted_back_id = Instana::Util.header_to_id(header_id)
+      assert original_id == converted_back_id
+    end
   end
 
   def test_id_max_value_and_conversion
@@ -93,4 +110,21 @@ class TracerIDMgmtTest < Minitest::Test
     assert_equal min_id, Instana::Util.header_to_id(min_hex)
   end
 
+  def test_that_leading_zeros_handled_correctly
+
+    header = ::Instana::Util.id_to_header(16)
+    assert_equal "10", header
+
+    id = ::Instana::Util.header_to_id("10")
+    assert_equal 16, id
+
+    id = ::Instana::Util.header_to_id("0000000000000010")
+    assert_equal 16, id
+
+    id = ::Instana::Util.header_to_id("88b6c735206ca42")
+    assert_equal 615705016619420226, id
+
+    id = ::Instana::Util.header_to_id("088b6c735206ca42")
+    assert_equal 615705016619420226, id
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler