instana 1.11.5 → 1.13.0

data/test/frameworks/rails/actioncontroller_test.rb

@@ -153,4 +153,16 @@ class ActionControllerTest < Minitest::Test
     assert ac_span.key?(:stack)
     assert 1, ac_span[:ec]
   end
+  
+  def test_path_template
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/world'))
+    
+    spans = ::Instana.processor.queued_spans
+    rack_span = find_first_span_by_name(spans, :rack)
+
+    assert_equal false, rack_span.key?(:error)
+    assert_equal '/test/world(.:format)', rack_span[:data][:http][:path_tpl]
+  end
 end

data/test/frameworks/roda_test.rb

@@ -40,5 +40,19 @@ if defined?(::Roda)
       assert first_span[:data][:http].key?(:host)
       assert_equal "example.org", first_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/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/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/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/secrets_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+class SecretsTest < Minitest::Test
+  def setup
+    @subject = Instana::Secrets.new
+  end
+  
+  def test_equals_ignore_case
+    sample_config = {
+      "matcher"=>"equals-ignore-case", 
+      "list"=>["key"]
+    }
+    
+    url = url_for(%w(key Str kEy KEY))
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy KEY)
+  end
+  
+  def test_equals
+    sample_config = {
+      "matcher"=>"equals", 
+      "list"=>["key", "kEy"]
+    }
+    
+    url = url_for(%w(key Str kEy KEY))
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy)
+  end
+  
+  def test_contains_ignore_case
+    sample_config = {
+      "matcher"=>"contains-ignore-case", 
+      "list"=>["stan"]
+    }
+    
+    url = url_for(%w(instantiate conTESTant sample))
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate conTESTant)
+  end
+  
+  def test_contains
+    sample_config = {
+      "matcher"=>"contains", 
+      "list"=>["stan"]
+    }
+    
+    url = url_for(%w(instantiate conTESTant sample))
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
+  
+  end
+  
+  def test_regexp
+    sample_config = {
+      "matcher"=>"regex", 
+      "list"=>["l{2}"]
+    }
+    
+    url = url_for(%w(ball foot move))
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(ball) 
+  end
+  
+  private
+  
+  def url_for(keys)
+    url = URI('http://example.com')
+    url.query = URI.encode_www_form(keys.map { |k| [k, rand(1..100)]})
+    url.to_s
+  end
+  
+  def assert_redacted(str, keys)
+    url = URI(str)
+    params = CGI.parse(url.query)
+    
+    assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
+  end
+end

data/test/test_helper.rb

@@ -39,17 +39,17 @@ 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
 

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.5
+  version: 1.13.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2021-01-08 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
@@ -242,6 +242,7 @@ files:
 - lib/instana/opentracing/carrier.rb
 - lib/instana/opentracing/tracer.rb
 - lib/instana/rack.rb
+- lib/instana/secrets.rb
 - lib/instana/setup.rb
 - lib/instana/test.rb
 - lib/instana/thread_local.rb
@@ -287,6 +288,7 @@ files:
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
 - test/models/block6.rb
+- test/secrets_test.rb
 - test/servers/grpc_50051.rb
 - test/servers/helpers/sidekiq_worker_initializer.rb
 - test/servers/rackapp_6511.rb
@@ -296,7 +298,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/
@@ -322,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
@@ -332,11 +333,11 @@ 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/secrets_test.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.6
-  - 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
-  - gemfiles/rails60.gemfile
-
-matrix:
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails60.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=