instana 1.11.7 → 1.192.1

data/test/instrumentation/instrumented_request_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class InstrumentedRequestTest < Minitest::Test
+  def test_skip_trace_with_header
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert req.skip_trace?
+  end
+
+  def test_skip_trace_without_header
+    req = Instana::InstrumentedRequest.new({})
+
+    refute req.skip_trace?
+  end
+
+  def test_incomming_context
+    id = Instana::Util.generate_id
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_X_INSTANA_T' => id,
+      'HTTP_X_INSTANA_S' => id
+    )
+
+    expected = {
+      trace_id: id,
+      span_id: id,
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+  end
+
+  def test_request_tags
+    ::Instana.agent.extra_headers = %w[X-Capture-This]
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_HOST' => 'example.com',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_X_CAPTURE_THIS' => 'that',
+      'PATH_INFO' => '/'
+    )
+
+    expected = {
+      method: 'GET',
+      url: '/',
+      host: 'example.com',
+      header: {
+        "X-Capture-This": 'that'
+      }
+    }
+
+    assert_equal expected, req.request_tags
+    ::Instana.agent.extra_headers = nil
+  end
+
+  def test_correlation_data_valid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1,correlationType=web ;correlationId=1234567890abcdef'
+    )
+    expected = {
+      type: 'web',
+      id: '1234567890abcdef'
+    }
+
+    assert_equal expected, req.correlation_data
+  end
+
+  def test_correlation_data_invalid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+
+  def test_correlation_data_legacy
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+end

data/test/instrumentation/redis_test.rb

@@ -20,6 +20,16 @@ class RedisTest < Minitest::Test
     assert_redis_trace('SET')
   end
 
+  def test_georadius
+    clear_all!
+
+    Instana.tracer.start_or_continue_trace(:redis_test) do
+      @redis_client.georadius('Sicily', '15', '37', '200', 'km', 'WITHCOORD', 'WITHDIST')
+    end
+
+    assert_redis_trace('GEORADIUS')
+  end
+
   def test_normal_call_with_error
     clear_all!
 

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/tracing/id_management_test.rb

@@ -49,82 +49,20 @@ class TracerIDMgmtTest < Minitest::Test
     converted_id = Instana::Util.header_to_id(header_id)
 
     # Assert that it is an Integer
-    assert converted_id.is_a?(Integer)
+    assert converted_id.is_a?(String)
   end
 
   def test_header_to_id_conversion_with_bogus_header
     # Bogus nil arg
     bogus_result = Instana::Util.header_to_id(nil)
-    assert_equal 0, bogus_result
+    assert_equal '', bogus_result
 
     # Bogus Integer arg
     bogus_result = Instana::Util.header_to_id(1234)
-    assert_equal 0, bogus_result
+    assert_equal '', bogus_result
 
     # Bogus Array arg
     bogus_result = Instana::Util.header_to_id([1234])
-    assert_equal 0, bogus_result
-  end
-
-  def test_id_conversion_back_and_forth
-    # id --> header --> id
-    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
-
-    # header --> id --> header
-    original_header_id = "c025ee93b1aeda7b"
-    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
-    max_id = 9223372036854775807
-    min_id = -9223372036854775808
-    max_hex = "7fffffffffffffff"
-    min_hex = "8000000000000000"
-
-    assert_equal max_hex, Instana::Util.id_to_header(max_id)
-    assert_equal min_hex, Instana::Util.id_to_header(min_id)
-
-    assert_equal max_id, Instana::Util.header_to_id(max_hex)
-    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
+    assert_equal '', bogus_result
   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.7
+  version: 1.192.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,6 +175,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".codeclimate.yml"
+- ".editorconfig"
 - ".fasterer.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -231,7 +232,9 @@ files:
 - lib/instana/instrumentation.rb
 - lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
+- lib/instana/instrumentation/graphql.rb
 - lib/instana/instrumentation/grpc.rb
+- lib/instana/instrumentation/instrumented_request.rb
 - lib/instana/instrumentation/net-http.rb
 - lib/instana/instrumentation/rack.rb
 - lib/instana/instrumentation/redis.rb
@@ -242,6 +245,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
@@ -274,7 +278,9 @@ files:
 - test/instana_test.rb
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/excon_test.rb
+- test/instrumentation/graphql_test.rb
 - test/instrumentation/grpc_test.rb
+- test/instrumentation/instrumented_request_test.rb
 - test/instrumentation/net-http_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
@@ -287,6 +293,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 +303,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/
@@ -307,7 +313,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
@@ -322,8 +328,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.2.6
+signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
@@ -332,11 +338,12 @@ 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/graphql_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
@@ -344,6 +351,7 @@ test_files:
 - test/instrumentation/rest-client_test.rb
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/excon_test.rb
+- test/instrumentation/instrumented_request_test.rb
 - test/instrumentation/grpc_test.rb
 - test/instrumentation/net-http_test.rb
 - test/benchmarks/bench_opentracing.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