instana 1.12.0 → 1.193.3.pre1

data/test/test_helper.rb

@@ -1,159 +1,39 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 ENV['INSTANA_TEST'] = 'true'
-require "rubygems"
-require "bundler/setup"
-Bundler.require(:default, :test)
 
-require "minitest/spec"
-require "minitest/autorun"
-require "minitest/reporters"
-require "minitest/debugger" if ENV['DEBUG']
-require "minitest/benchmark"
-require 'webmock/minitest'
-
-require "instana/test"
-::Instana::Test.setup_environment
+begin
+  require 'simplecov'
+  require 'simplecov_json_formatter'
 
-# Webmock: Whitelist local IPs
-whitelist = ['127.0.0.1', 'localhost', '172.17.0.1', '172.0.12.100']
-allowed_sites = lambda{|uri|
-  whitelist.include?(uri.host)
-}
-::WebMock.disable_net_connect!(allow: allowed_sites)
+  SimpleCov.start do
+    enable_coverage :branch
 
-# Boot background webservers to test against.
-require "./test/servers/rackapp_6511"
+    add_group 'Frameworks', 'lib/instana/frameworks'
+    add_group 'Instrumentation', 'lib/instana/instrumentation'
 
-case File.basename(ENV['BUNDLE_GEMFILE'])
-when /rails/
-  require './test/servers/rails_3205'
-when /libraries/
-  # Configure gRPC
-  require './test/servers/grpc_50051.rb'
+    add_filter %r{^/test/}
 
-  # Hook into sidekiq to control the current mode
-  $sidekiq_mode = :client
-  class << Sidekiq
-    def server?
-      $sidekiq_mode == :server
+    if ENV['CI']
+      formatter SimpleCov::Formatter::JSONFormatter
     end
   end
-
-  ENV['REDIS_URL'] ||= 'redis://127.0.0.1:6379'
-
-  # Configure redis for sidekiq client
-  Sidekiq.configure_client do |config|
-    config.redis = { url: ENV['REDIS_URL'] }
-  end
-
-  # Configure redis for sidekiq worker
-  $sidekiq_mode = :server
-  ::Sidekiq.configure_server do |config|
-    config.redis = { url: ENV['REDIS_URL'] }
-  end
-  $sidekiq_mode = :client
-
-  require './test/servers/sidekiq/worker'
-end
-
-Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
-
-# Used to reset the gem to boot state.  It clears out any queued and/or staged
-# traces and resets the tracer to no active trace.
-#
-def clear_all!
-  ::Instana.processor.clear!
-  ::Instana.tracer.clear!
+rescue LoadError => _e
   nil
 end
 
-def disable_redis_instrumentation
-  ::Redis::Client.class_eval do
-    alias call call_without_instana
-    alias call_pipeline call_pipeline_without_instana
-  end
-end
+require 'bundler/setup'
+Bundler.require
 
-def enable_redis_instrumentation
-  ::Redis::Client.class_eval do
-    alias call call_with_instana
-    alias call_pipeline call_pipeline_with_instana
-  end
-end
-
-def validate_sdk_span(json_span, sdk_hash = {}, errored = false, ec = 1)
-  assert_equal :sdk, json_span[:n]
-  assert json_span.key?(:k)
-  assert json_span.key?(:d)
-  assert json_span.key?(:ts)
-
-  for k,v in sdk_hash
-    assert_equal v, json_span[:data][:sdk][k]
-  end
-
-  if errored
-    assert_equal true, json_span[:error]
-    assert_equal 1, json_span[:ec]
-  end
-end
-
-def find_spans_by_name(spans, name)
-  result = []
-  for span in spans
-    if span[:n] == :sdk
-      if span[:data][:sdk][:name] == name
-        result << span
-      end
-    elsif span[:n] == name
-      result << span
-    end
-  end
-  if result.empty?
-    raise Exception.new("No SDK spans (#{name}) could be found")
-  else
-    return result
-  end
-end
+require "minitest/spec"
+require "minitest/autorun"
+require "minitest/reporters"
 
-def find_first_span_by_name(spans, name)
-  for span in spans
-    if span[:n] == :sdk
-      if span[:data][:sdk][:name] == name
-        return span
-      end
-    else
-      if span[:n] == name
-        return span
-      end
-    end
-  end
-  raise Exception.new("Span (#{name}) not found")
-end
+require 'webmock/minitest'
+# Webmock: Whitelist local IPs
+WebMock.disable_net_connect!(
+  allow: ->(uri) { %w[localhost 127.0.0.1 172.17.0.1 172.0.12.100].include?(uri.host) }
+)
 
-def find_span_by_id(spans, id)
-  for span in spans
-    if span[:s] == id
-      return span
-    end
-  end
-  raise Exception.new("Span with id (#{id}) not found")
-end
+Dir['test/support/*.rb'].each { |f| load(f) }
 
-# Finds the first span in +spans+ for which +block+ returns true
-#
-#     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-#       span[:data][:activerecord][:sql] == sql
-#     end
-#
-# This helper will raise an exception if no span evaluates to true against he provided block.
-#
-# +spans+: +Array+ of spans to search
-# +block+: The Ruby block to evaluate against each span
-def find_first_span_by_qualifier(spans, &block)
-  spans.each do |span|
-    if block.call(span)
-      return span
-    end
-  end
-  raise Exception.new("Span with qualifier not found")
-end
+Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
+Minitest::Test.include(Instana::TestHelpers)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.193.3.pre1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,47 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +147,12 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".codeclimate.yml"
+- ".editorconfig"
 - ".fasterer.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
+- Appraisals
 - Dockerfile
 - Gemfile
 - LICENSE
@@ -196,14 +171,48 @@ files:
 - examples/opentracing.rb
 - examples/tracing.rb
 - gemfiles/.bundle/config
-- gemfiles/libraries.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails52.gemfile
-- gemfiles/rails60.gemfile
+- gemfiles/cuba_30.gemfile
+- gemfiles/dalli_20.gemfile
+- gemfiles/excon_02.gemfile
+- gemfiles/graphql_10.gemfile
+- gemfiles/grpc_10.gemfile
+- gemfiles/net_http_01.gemfile
+- gemfiles/rack_16.gemfile
+- gemfiles/rack_20.gemfile
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
+- gemfiles/redis_40.gemfile
+- gemfiles/resque_122.gemfile
+- gemfiles/resque_20.gemfile
+- gemfiles/rest_client_16.gemfile
+- gemfiles/rest_client_20.gemfile
+- gemfiles/roda_20.gemfile
+- gemfiles/roda_30.gemfile
+- gemfiles/sidekiq_42.gemfile
+- gemfiles/sidekiq_50.gemfile
+- gemfiles/sinatra_14.gemfile
 - instana.gemspec
 - lib/instana.rb
+- lib/instana/activator.rb
+- lib/instana/activators/cuba.rb
+- lib/instana/activators/dalli.rb
+- lib/instana/activators/excon.rb
+- lib/instana/activators/graphql.rb
+- lib/instana/activators/grpc_client.rb
+- lib/instana/activators/grpc_server.rb
+- lib/instana/activators/net_http.rb
+- lib/instana/activators/rack.rb
+- lib/instana/activators/rails.rb
+- lib/instana/activators/redis.rb
+- lib/instana/activators/resque_client.rb
+- lib/instana/activators/resque_worker.rb
+- lib/instana/activators/rest_client.rb
+- lib/instana/activators/roda.rb
+- lib/instana/activators/sidekiq_client.rb
+- lib/instana/activators/sidekiq_worker.rb
+- lib/instana/activators/sinatra.rb
 - lib/instana/agent.rb
 - lib/instana/agent/helpers.rb
 - lib/instana/agent/hooks.rb
@@ -228,10 +237,11 @@ files:
 - lib/instana/frameworks/roda.rb
 - lib/instana/frameworks/sinatra.rb
 - lib/instana/helpers.rb
-- 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,8 +252,8 @@ 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
 - lib/instana/tracer.rb
 - lib/instana/tracing/processor.rb
@@ -254,44 +264,48 @@ files:
 - lib/oj_check.rb
 - lib/opentracing.rb
 - log/.keep
+- test/activator_test.rb
 - test/agent/agent_test.rb
-- test/apps/cuba.rb
-- test/apps/grpc_server.rb
-- test/apps/roda.rb
-- test/apps/sinatra.rb
 - test/benchmarks/bench_id_generation.rb
 - test/benchmarks/bench_opentracing.rb
 - test/config_test.rb
 - test/frameworks/cuba_test.rb
-- test/frameworks/rack_test.rb
 - test/frameworks/rails/actioncontroller_test.rb
 - test/frameworks/rails/actionview3_test.rb
 - test/frameworks/rails/actionview4_test.rb
 - test/frameworks/rails/actionview5_test.rb
 - test/frameworks/rails/activerecord_test.rb
+- test/frameworks/rails_test.rb
 - test/frameworks/roda_test.rb
 - test/frameworks/sinatra_test.rb
 - 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/net-http_test.rb
+- test/instrumentation/net_http_test.rb
+- test/instrumentation/rack_instrumented_request_test.rb
+- test/instrumentation/rack_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
-- test/instrumentation/rest-client_test.rb
+- test/instrumentation/rest_client_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
-- test/jobs/resque_error_job.rb
-- test/jobs/resque_fast_job.rb
-- 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
-- test/servers/rails_3205.rb
-- test/servers/sidekiq/worker.rb
+- test/secrets_test.rb
+- test/support/apps/grpc/boot.rb
+- test/support/apps/grpc/grpc_server.rb
+- test/support/apps/http_endpoint/boot.rb
+- test/support/apps/rails/boot.rb
+- test/support/apps/rails/models/block.rb
+- test/support/apps/rails/models/block6.rb
+- test/support/apps/resque/boot.rb
+- test/support/apps/resque/jobs/resque_error_job.rb
+- test/support/apps/resque/jobs/resque_fast_job.rb
+- test/support/apps/sidekiq/boot.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
+- test/support/apps/sidekiq/worker.rb
+- test/support/helpers.rb
 - test/test_helper.rb
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
@@ -317,56 +331,60 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
 - test/config_test.rb
+- test/activator_test.rb
 - test/tracing/id_management_test.rb
 - test/tracing/tracer_test.rb
 - test/tracing/custom_test.rb
 - test/tracing/opentracing_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/rest_client_test.rb
+- test/instrumentation/net_http_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/rack_instrumented_request_test.rb
 - test/instrumentation/redis_test.rb
-- test/instrumentation/rest-client_test.rb
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/grpc_test.rb
-- test/instrumentation/net-http_test.rb
+- test/support/helpers.rb
+- test/support/apps/sidekiq/boot.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
+- test/support/apps/sidekiq/worker.rb
+- test/support/apps/grpc/boot.rb
+- test/support/apps/grpc/grpc_server.rb
+- test/support/apps/resque/boot.rb
+- test/support/apps/resque/jobs/resque_error_job.rb
+- test/support/apps/resque/jobs/resque_fast_job.rb
+- test/support/apps/http_endpoint/boot.rb
+- test/support/apps/rails/models/block.rb
+- test/support/apps/rails/models/block6.rb
+- test/support/apps/rails/boot.rb
 - test/benchmarks/bench_opentracing.rb
 - test/benchmarks/bench_id_generation.rb
 - test/test_helper.rb
-- test/jobs/sidekiq_job_2.rb
-- test/jobs/resque_error_job.rb
-- test/jobs/sidekiq_job_1.rb
-- test/jobs/resque_fast_job.rb
 - test/frameworks/cuba_test.rb
-- test/frameworks/rack_test.rb
 - test/frameworks/roda_test.rb
+- test/frameworks/rails_test.rb
 - test/frameworks/sinatra_test.rb
 - test/frameworks/rails/actionview4_test.rb
 - test/frameworks/rails/activerecord_test.rb
 - test/frameworks/rails/actioncontroller_test.rb
 - test/frameworks/rails/actionview5_test.rb
 - test/frameworks/rails/actionview3_test.rb
-- test/apps/sinatra.rb
-- test/apps/roda.rb
-- test/apps/cuba.rb
-- test/apps/grpc_server.rb
-- test/servers/rackapp_6511.rb
-- test/servers/sidekiq/worker.rb
-- test/servers/grpc_50051.rb
-- test/servers/rails_3205.rb
-- test/servers/helpers/sidekiq_worker_initializer.rb
 - test/instana_test.rb