instana 1.11.4 → 1.12.0

data/test/frameworks/sinatra_test.rb

@@ -1,4 +1,4 @@
-
+require 'sinatra'
 if defined?(::Sinatra)
   require 'test_helper'
   require File.expand_path(File.dirname(__FILE__) + '/../apps/sinatra')
@@ -17,28 +17,50 @@ if defined?(::Sinatra)
       r = get '/'
       assert last_response.ok?
 
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers.key?("X-Instana-S")
 
       spans = ::Instana.processor.queued_spans
       assert_equal 1, spans.count
 
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert first_span.key?(:data)
-      assert first_span[:data].key?(:http)
+      rack_span = spans.first
+      assert_equal :rack, rack_span[:n]
+      # ::Instana::Util.pry!
 
-      assert first_span[:data][:http].key?(:method)
-      assert_equal "GET", first_span[:data][:http][:method]
+      assert r.headers.key?("X-Instana-T")
+      assert r.headers["X-Instana-T"] == ::Instana::Util.id_to_header(rack_span[:t])
+      assert r.headers.key?("X-Instana-S")
+      assert r.headers["X-Instana-S"] == ::Instana::Util.id_to_header(rack_span[:s])
+      assert r.headers.key?("X-Instana-L")
+      assert r.headers["X-Instana-L"] == '1'
+      assert r.headers.key?("Server-Timing")
+      assert r.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
+      
+      assert rack_span.key?(:data)
+      assert rack_span[:data].key?(:http)
+      assert rack_span[:data][:http].key?(:method)
+      assert_equal "GET", rack_span[:data][:http][:method]
 
-      assert first_span[:data][:http].key?(:url)
-      assert_equal "/", first_span[:data][:http][:url]
+      assert rack_span[:data][:http].key?(:url)
+      assert_equal "/", rack_span[:data][:http][:url]
 
-      assert first_span[:data][:http].key?(:status)
-      assert_equal 200, first_span[:data][:http][:status]
+      assert rack_span[:data][:http].key?(:status)
+      assert_equal 200, rack_span[:data][:http][:status]
 
-      assert first_span[:data][:http].key?(:host)
-      assert_equal "example.org", first_span[:data][:http][:host]
+      assert rack_span[:data][:http].key?(:host)
+      assert_equal "example.org", rack_span[:data][:http][:host]
+    end
+    
+    def test_path_template
+      clear_all!
+
+      r = get '/greet/instana'
+      assert last_response.ok?
+
+      spans = ::Instana.processor.queued_spans
+      assert_equal 1, spans.count
+
+      first_span = spans.first
+      assert_equal :rack, first_span[:n]
+      assert_equal '/greet/:name', first_span[:data][:http][:path_tpl]
     end
   end
 end

data/test/instrumentation/grpc_test.rb

@@ -14,7 +14,7 @@ class GrpcTest < Minitest::Test
 
     if error
       assert_equal true, data[:rpc][:error]
-      assert_equal "2:RuntimeError: #{error}", data[:log][:message]
+      assert data[:log][:message].include?("2:RuntimeError: #{error}")
     end
   end
 

data/test/instrumentation/redis_test.rb

@@ -1,40 +1,44 @@
 require 'test_helper'
 
 class RedisTest < Minitest::Test
+  def setup
+    if ENV.key?('REDIS_URL')
+      @redis_url = ENV['REDIS_URL']
+    else
+      @redis_url = "redis://localhost:6379"
+    end
+    @redis_client = Redis.new(url: @redis_url)
+  end
+
   def test_normal_call
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
-      redis_client.set('hello', 'world')
+      @redis_client.set('hello', 'world')
     end
-    redis_client.disconnect!
 
     assert_redis_trace('SET')
   end
 
   def test_normal_call_with_error
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        redis_client.zadd('hello', 'invalid', 'value')
+        @redis_client.zadd('hello', 'invalid', 'value')
       rescue; end
     end
-    redis_client.disconnect!
 
     assert_redis_trace('ZADD', with_error: 'ERR value is not a valid float')
   end
 
   def test_pipeline_call
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
-      redis_client.pipelined do
-        redis_client.set('hello', 'world')
-        redis_client.set('other', 'world')
+      @redis_client.pipelined do
+        @redis_client.set('hello', 'world')
+        @redis_client.set('other', 'world')
       end
     end
 
@@ -43,13 +47,12 @@ class RedisTest < Minitest::Test
 
   def test_pipeline_call_with_error
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        redis_client.pipelined do
-          redis_client.set('other', 'world')
-          redis_client.call('invalid')
+        @redis_client.pipelined do
+          @redis_client.set('other', 'world')
+          @redis_client.call('invalid')
         end
       rescue; end
     end
@@ -59,12 +62,11 @@ class RedisTest < Minitest::Test
 
   def test_multi_call
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
-      redis_client.multi do
-        redis_client.set('hello', 'world')
-        redis_client.set('other', 'world')
+      @redis_client.multi do
+        @redis_client.set('hello', 'world')
+        @redis_client.set('other', 'world')
       end
     end
 
@@ -73,13 +75,12 @@ class RedisTest < Minitest::Test
 
   def test_multi_call_with_error
     clear_all!
-    redis_client = create_redis_client
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        redis_client.multi do
-          redis_client.set('other', 'world')
-          redis_client.call('invalid')
+        @redis_client.multi do
+          @redis_client.set('other', 'world')
+          @redis_client.call('invalid')
         end
       rescue; end
     end
@@ -89,10 +90,6 @@ class RedisTest < Minitest::Test
 
   private
 
-  def create_redis_client
-    Redis.new(url: ENV['I_REDIS_URL'])
-  end
-
   def assert_redis_trace(command, with_error: nil)
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
@@ -105,10 +102,10 @@ class RedisTest < Minitest::Test
 
     data = second_span[:data]
 
-    uri = URI.parse(ENV['I_REDIS_URL'])
+    uri = URI.parse(@redis_url)
     assert_equal "#{uri.host}:#{uri.port}", data[:redis][:connection]
 
-    assert_equal 0, data[:redis][:db]
+    assert_equal "0", data[:redis][:db]
     assert_equal command, data[:redis][:command]
 
     if with_error

data/test/instrumentation/resque_test.rb

@@ -5,8 +5,8 @@ require 'resque'
 
 if ENV.key?('REDIS_URL')
   ::Resque.redis = ENV['REDIS_URL']
-elsif ENV.key?('I_REDIS_URL')
-  ::Resque.redis = ENV['I_REDIS_URL']
+elsif ENV.key?('REDIS_URL')
+  ::Resque.redis = ENV['REDIS_URL']
 else
   ::Resque.redis = 'localhost:6379'
 end
@@ -23,16 +23,15 @@ class ResqueClientTest < Minitest::Test
   end
 
   def test_enqueue
-    ::Instana.tracer.start_or_continue_trace('resque-client_test') do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
       ::Resque.enqueue(FastJob)
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
 
@@ -40,48 +39,42 @@ class ResqueClientTest < Minitest::Test
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_enqueue_to
-    ::Instana.tracer.start_or_continue_trace('resque-client_test') do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
       ::Resque.enqueue_to(:critical, FastJob)
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
     assert_equal :"resque-client", resque_span[:n]
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_dequeue
-    ::Instana.tracer.start_or_continue_trace('resque-client_test', '', {}) do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test', '', {}) do
       ::Resque.dequeue(FastJob, { :generate => :farfalla })
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
-    assert_equal :"resque-client", spans[1][:n]
+    assert_equal :"resque-client", resque_span[:n]
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_worker_job

data/test/instrumentation/sidekiq-client_test.rb

@@ -1,6 +1,13 @@
 require 'test_helper'
 
 class SidekiqClientTest < Minitest::Test
+  def setup
+    Sidekiq.configure_client do |config|
+      config.redis = { url: ENV["REDIS_URL"] }
+    end
+    ::Sidekiq::Queue.new('some_random_queue').clear
+  end
+
   def test_config_defaults
     assert ::Instana.config[:'sidekiq-client'].is_a?(Hash)
     assert ::Instana.config[:'sidekiq-client'].key?(:enabled)

data/test/instrumentation/sidekiq-worker_test.rb

@@ -1,6 +1,12 @@
 require 'test_helper'
 
 class SidekiqServerTest < Minitest::Test
+  def setup
+    Sidekiq.configure_client do |config|
+      config.redis = { url: ENV["REDIS_URL"] }
+    end
+  end
+
   def test_config_defaults
     assert ::Instana.config[:'sidekiq-worker'].is_a?(Hash)
     assert ::Instana.config[:'sidekiq-worker'].key?(:enabled)

data/test/jobs/resque_error_job.rb

@@ -7,8 +7,8 @@ class ErrorJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('I_REDIS_URL')
-      redis = Redis.new(:url => ENV['I_REDIS_URL'])
+    elsif ENV.key?('REDIS_URL')
+      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'localhost:6379')
     end

data/test/jobs/resque_fast_job.rb

@@ -7,8 +7,8 @@ class FastJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('I_REDIS_URL')
-      redis = Redis.new(:url => ENV['I_REDIS_URL'])
+    elsif ENV.key?('REDIS_URL')
+      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'redis://localhost:6379')
     end

data/test/test_helper.rb

@@ -39,27 +39,23 @@ when /libraries/
     end
   end
 
-  ENV['I_REDIS_URL'] ||= 'redis://127.0.0.1:6379'
+  ENV['REDIS_URL'] ||= 'redis://127.0.0.1:6379'
 
   # Configure redis for sidekiq client
   Sidekiq.configure_client do |config|
-    config.redis = { url: ENV['I_REDIS_URL'] }
+    config.redis = { url: ENV['REDIS_URL'] }
   end
 
   # Configure redis for sidekiq worker
   $sidekiq_mode = :server
   ::Sidekiq.configure_server do |config|
-    config.redis = { url: ENV['I_REDIS_URL'] }
+    config.redis = { url: ENV['REDIS_URL'] }
   end
   $sidekiq_mode = :client
 
   require './test/servers/sidekiq/worker'
 end
 
-if defined?(::Redis)
-  $redis = Redis.new(url: ENV['I_REDIS_URL'])
-end
-
 Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 
 # Used to reset the gem to boot state.  It clears out any queued and/or staged
@@ -68,7 +64,6 @@ Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 def clear_all!
   ::Instana.processor.clear!
   ::Instana.tracer.clear!
-  $redis.flushall if $redis
   nil
 end
 

data/test/tracing/opentracing_test.rb

@@ -332,4 +332,25 @@ class OpenTracerTest < Minitest::Test
     assert_equal({:my_bag=>1}, ac_span.context.baggage)
     assert_equal(nil, av_span.context.baggage)
   end
+
+  def test_start_active_span
+    clear_all!
+
+    span = OpenTracing.start_active_span(:rack)
+    assert_equal ::Instana::Tracer.current_span, span
+
+    sleep 0.1
+
+    span.finish
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+  end
+
+  def test_active_span
+    clear_all!
+
+    span = OpenTracing.start_active_span(:rack)
+    assert_equal OpenTracing.active_span, span
+  end
 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