instana 1.11.3 → 1.11.8

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/models/block6.rb

@@ -0,0 +1,18 @@
+class Block < ActiveRecord::Base
+  def do_work(*args)
+    block = Block.first
+    block.name = "Charlie"
+    block.color = "Black"
+    block.save
+  end
+end
+
+class CreateBlocks < ActiveRecord::Migration[6.0]
+  def change
+    create_table :blocks do |t|
+      t.string :name
+      t.string :color
+      t.timestamps
+    end
+  end
+end

data/test/servers/rails_3205.rb

@@ -8,7 +8,16 @@ end
 require "rails/all"
 require "action_controller/railtie" # require more if needed
 require 'rack/handler/puma'
-require File.expand_path(File.dirname(__FILE__) + '/../models/block')
+
+if Rails::VERSION::STRING >= '6.0'
+  require File.expand_path(File.dirname(__FILE__) + '/../models/block6')
+  system("mkdir -p app/assets/config && echo '{}' > app/assets/config/manifest.js")
+  # Rails 6 Issue: https://github.com/rails/rails/issues/37183
+  class ApplicationController < ActionController::Base
+  end
+else
+  require File.expand_path(File.dirname(__FILE__) + '/../models/block')
+end
 
 ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
 

data/test/test_helper.rb

@@ -25,7 +25,7 @@ allowed_sites = lambda{|uri|
 require "./test/servers/rackapp_6511"
 
 case File.basename(ENV['BUNDLE_GEMFILE'])
-when /rails50|rails42|rails32/
+when /rails/
   require './test/servers/rails_3205'
 when /libraries/
   # Configure gRPC
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.11.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,11 +173,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".fasterer.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Dockerfile
 - Gemfile
 - LICENSE
@@ -201,6 +201,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/agent.rb
@@ -285,6 +286,7 @@ files:
 - test/jobs/sidekiq_job_1.rb
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
+- test/models/block6.rb
 - test/servers/grpc_50051.rb
 - test/servers/helpers/sidekiq_worker_initializer.rb
 - test/servers/rackapp_6511.rb
@@ -294,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/
@@ -305,7 +306,7 @@ metadata:
   documentation_uri: https://docs.instana.io/ecosystem/ruby/
   homepage_uri: https://www.instana.com/
   source_code_uri: https://github.com/instana/ruby-sensor
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
@@ -330,10 +331,10 @@ 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
+- test/models/block6.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb

data/.travis.yml

@@ -1,43 +0,0 @@
-language: ruby
-
-cache:
-  bundler: true
-  directories:
-    - vendor/bundle
-
-rvm:
-  - 2.5
-  - 2.4
-
-before_install:
-  - gem update --system
-  - gem install bundler
-  - gem --version
-
-before_script:
-  - psql -c 'create database travis_ci_test;' -U postgres
-  - mysql -e 'CREATE DATABASE travis_ci_test;'
-
-script: "bundle exec rake test"
-
-services:
-  - memcached
-  - redis
-  - mysql
-  - postgresql
-
-gemfile:
-  - Gemfile
-  - gemfiles/libraries.gemfile
-  - gemfiles/rails50.gemfile
-
-matrix:
-  exclude:
-    # Rails 5.0+ requires Ruby 2.2.2 or higher
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50.gemfile
-
-notifications:
-  slack:
-    rooms:
-      secure: Ae9tJmBO9/sgYWthHRS5uufAf8s6uIMdtmQn+gBkcAXaMWJgt1IAzpIj98Qsg15/lhHS8ezwCe7WIAWC4mM1cnwl/hP195dbgLzF4D2uOjaIXj55ckIIE06jBX1yHapu0vMFSaKwgL4auEEVg4xkehBb9TzLNG/LbExadZQOIkeLdtgU04VrPfDC9pZWPplXT4kzjMZkMESzBYaCfNl6eenu0sHdoxSvngv52MImog6aZQKT+k3ccAa1yzZNhUdy4gSZi1HafXdSCn4UTPDtkNIlsWBW8yprICLxZV/NvgUTEEJYSHO6Ucx9Er22LzKtNbEYlAs1GErGWjDzpqvvXt/5UwNx0rLDrVKI/xMIELEbT047mSgJ8tpVd0ErGA/bnDfbF2oDFTAEXq4jaeAMaVR9Q1CW0ZZF2Jh5jOKc41U+AVGgaMDaBA0ukDSeXvJcnteZ9EllOO8ZAtC2FKtBNnj36W13KTR0TkjMCl+KOiVJXnOyRJIR+CUL9BdDuODBVPZHqZaZ48N+MOG9dRb+fvkdTnwh7hU+UmR08kOsd4x+dDlm4dBrFrB8v8udQ7XuBN9AOZty2CPWFUSJM1BxtetyS3We0L6lQ8o/B9STFNK4KTa/M8wNq1Fm85h3ZKHHIHDpQnXM6vD8SV1p9u91C5UI8rEyxzW5IaT2oqXsCzU=

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