instana 1.11.7 → 1.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d29c335511f3dec4cac5857ac4d1b84b1b84f70a2f5974ed9b0f20992dc2cb7
-  data.tar.gz: 9560b29a9d7902f0f013a4b586fed564c8eb854a6e700e1798e8c71463dbdf7a
+  metadata.gz: 03473a7a2f7e8a5306869674ff671f1d5b66804e41bd1f687c512a33c0b07f3c
+  data.tar.gz: aaf1ada0116589a5d33e1f74558a6c32801971e5f5f4e512be56ff6524ab447b
 SHA512:
-  metadata.gz: ccd6ac828673bf6f731b0b75d09f4009a6f02e74c80eb2258af40e5993e0dd15c710e4936c2db53691a7a8f43234adbed0bbe45e13d9fe56ce99dbd2491ddf47
-  data.tar.gz: 347b2d4e384e37e74ce51d68bbce5059e4f8de7d1ea0aa7ab6dbb82b7ddc4c67d6b97479f1de8152c9fff988994e3daf0642f34712f0a152eaa3ba80b975de3a
+  metadata.gz: 6993a2dcb47b648445c97fea1017bcc9392f889270613078fd32fb2881365d88260ae0082e23eed6f32f9d111f67021dc9f2485f5cb4777b6317b7541352d40d
+  data.tar.gz: 5c8c34a422def00edda43e613899a59b99bae6c1cf1323d79c135703b1c6ab5d565ece30f8b8f0497e0ea79a7cf1585912c17ddf5e8c363cb33f792e6f7a6903

data/lib/instana/tracing/span.rb

@@ -303,6 +303,15 @@ module Instana
     # a String, Numeric, or Boolean it will be encoded with to_s
     #
     def set_tag(key, value)
+      if ![Symbol, String].include?(key.class)
+        key = key.to_s
+      end
+
+      # If <value> is not a Symbol, String, Array, Hash or Numeric - convert to string
+      if ![Symbol, String, Array, TrueClass, FalseClass, Hash].include?(value.class) && !value.is_a?(Numeric)
+        value = value.to_s
+      end
+
       if custom?
         @data[:data][:sdk][:custom] ||= {}
         @data[:data][:sdk][:custom][:tags] ||= {}

data/lib/instana/version.rb

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

data/test/tracing/tracer_test.rb

@@ -46,6 +46,37 @@ class TracerTest < Minitest::Test
     assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
   end
 
+  def test_exotic_tag_types
+    clear_all!
+
+    assert_equal false, ::Instana.tracer.tracing?
+
+    require 'resolv'
+    r = Resolv::DNS.new
+    ipv4 = r.getaddress("www.pwpush.com")
+
+    ::Instana.tracer.start_or_continue_trace(:rack, {:ipaddr => ipv4}) do
+      assert_equal true, ::Instana.tracer.tracing?
+      sleep 0.1
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(100, 130)
+    assert first_span.key?(:data)
+    assert first_span[:data].key?(:ipaddr)
+    assert first_span[:data][:ipaddr].is_a?(String)
+    assert first_span.key?(:f)
+    assert first_span[:f].key?(:e)
+    assert first_span[:f].key?(:h)
+    assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
+  end
+
   def test_errors_are_properly_propagated
     clear_all!
     exception_raised = false
@@ -198,7 +229,6 @@ class TracerTest < Minitest::Test
     assert_equal sdk_span[:k], 3
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:sub_task_info], 1
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:sub_task_exit_info], 1
-
   end
 
   def test_block_tracing_error_capture

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.11.7
+  version: 1.11.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -296,7 +296,6 @@ files:
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
 - test/tracing/opentracing_test.rb
-- test/tracing/trace_test.rb
 - test/tracing/tracer_async_test.rb
 - test/tracing/tracer_test.rb
 homepage: https://www.instana.com/
@@ -332,7 +331,6 @@ test_files:
 - test/tracing/tracer_test.rb
 - test/tracing/custom_test.rb
 - test/tracing/opentracing_test.rb
-- test/tracing/trace_test.rb
 - test/tracing/tracer_async_test.rb
 - test/agent/agent_test.rb
 - test/models/block.rb

data/test/tracing/trace_test.rb

@@ -1,67 +0,0 @@
-# require 'test_helper'
-#
-# class TraceTest < Minitest::Test
-#   def test_trace_spans_count
-#     t = ::Instana::Trace.new(:test_trace, { :one => 1, :two => 2 })
-#     t.new_span(:sub_span, { :sub_four => 4 })
-#     t.end_span(:sub_five => 5)
-#     t.end_span(:three => 3)
-#     assert t.spans.size == 2
-#   end
-#
-#   def test_trace_with_incoming_context
-#     incoming_context = { :trace_id => "1234", :span_id => "4321" }
-#     t = ::Instana::Trace.new(:test_trace, { :one => 1, :two => 2 }, incoming_context)
-#     first_span = t.spans.first
-#     assert_equal "1234", first_span[:t]
-#     assert_equal "4321", first_span[:p]
-#     assert t.spans.size == 1
-#   end
-#
-#   def test_max_value_of_generated_id
-#     # Max is the maximum value for a Java signed long
-#     max_value = 9223372036854775807
-#     1000.times do
-#       assert ::Instana::Util.generate_id <= max_value
-#     end
-#   end
-#
-#   def test_min_value_of_generated_id
-#     # Max is the maximum value for a Java signed long
-#     max_value = -9223372036854775808
-#     1000.times do
-#       assert ::Instana::Util.generate_id >= max_value
-#     end
-#   end
-#
-#   def test_entry_span_doesnt_have_stack_by_default
-#     t = ::Instana::Trace.new(:rack)
-#     first_span = t.spans.first
-#     assert !first_span.key?(:stack)
-#   end
-#
-#   def test_entry_span_has_stack_by_config
-#     ::Instana.config[:collect_backtraces] = true
-#     t = ::Instana::Trace.new(:rack)
-#     first_span = t.spans.first
-#     assert first_span.key?(:stack)
-#     assert_equal 2, first_span[:stack].count
-#     ::Instana.config[:collect_backtraces] = false
-#   end
-#
-#   def test_exit_span_doesnt_have_stack_by_default
-#     t = ::Instana::Trace.new(:trace_test)
-#     t.new_span(:excon)
-#     second_span = t.spans.to_a[1]
-#     assert !second_span.key?(:stack)
-#   end
-#
-#   def test_exit_span_has_stack_by_config
-#     ::Instana.config[:collect_backtraces] = true
-#     t = ::Instana::Trace.new(:trace_test)
-#     t.new_span(:excon)
-#     second_span = t.spans.to_a[1]
-#     assert second_span.key?(:stack)
-#     ::Instana.config[:collect_backtraces] = false
-#   end
-# end