instana 1.210.1 → 1.212.0

data/test/activator_test.rb

@@ -27,4 +27,24 @@ class ActivatorTest < Minitest::Test
     assert_equal 1, Instana::Activator.call.length
     assert subject.call
   end
+
+  def test_limited_activated_set
+    ENV['INSTANA_ACTIVATE_SET'] = 'rack,rails'
+    subject = activated_set
+    assert_instance_of Set, subject
+    assert_equal 2, subject.length
+    assert_includes subject, 'rack'
+    assert_includes subject, 'rails'
+  ensure
+    ENV.delete('INSTANA_ACTIVATE_SET')
+  end
+
+  def test_unlimited_activated_set
+    ENV.delete('INSTANA_ACTIVATE_SET')
+    subject = activated_set
+    assert_instance_of Set, subject
+    assert_equal 31, subject.length
+  ensure
+    ENV.delete('INSTANA_ACTIVATE_SET')
+  end
 end

data/test/backend/host_agent_reporting_observer_test.rb

@@ -53,9 +53,11 @@ class HostAgentReportingObserverTest < Minitest::Test
 
   def test_agent_action
     action = JSON.dump(
-      action: 'ruby.source',
-      messageId: 'test',
-      args: {file: 'test_helper.rb'}
+      {
+        action: 'ruby.source',
+        messageId: 'test',
+        args: {file: 'test_helper.rb'}
+      }
     )
 
     stub_request(:post, "http://10.10.10.10:9292/tracermetrics")

data/test/instrumentation/aws_test.rb

@@ -36,17 +36,18 @@ class AwsTest < Minitest::Test
   end
 
   def test_s3
-    dynamo = Aws::S3::Client.new(
+    s3_client = Aws::S3::Client.new(
       region: "local",
       access_key_id: "minioadmin",
       secret_access_key: "minioadmin",
+      force_path_style: "true",
       endpoint: "http://localhost:9000"
     )
 
     assert_raises Aws::S3::Errors::NoSuchBucket do
       Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
-        dynamo.get_object(
-          bucket: 'sample_bucket',
+        s3_client.get_object(
+          bucket: 'sample-bucket',
           key: 'sample_key'
         )
       end
@@ -59,7 +60,7 @@ class AwsTest < Minitest::Test
     assert_equal entry_span[:s], s3_span[:p]
     assert_equal :s3, s3_span[:n]
     assert_equal 'get', s3_span[:data][:s3][:op]
-    assert_equal 'sample_bucket', s3_span[:data][:s3][:bucket]
+    assert_equal 'sample-bucket', s3_span[:data][:s3][:bucket]
     assert_equal 'sample_key', s3_span[:data][:s3][:key]
   end
 

data/test/instrumentation/rack_test.rb

@@ -3,7 +3,13 @@
 
 require 'test_helper'
 require 'rack/test'
-require 'rack/lobster'
+
+framework_version = Gem::Specification.find_by_name('rack').version
+if framework_version < Gem::Version.new('3.0.0')
+  require 'rack/lobster'
+else
+  require 'rackup/lobster'
+end
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods
@@ -34,11 +40,16 @@ class RackTest < Minitest::Test
   end
 
   def app
+    framework_version = Gem::Specification.find_by_name('rack').version
     @app = Rack::Builder.new do
       use Rack::CommonLogger
       use Rack::ShowExceptions
       use Instana::Rack
-      map("/mrlobster") { run Rack::Lobster.new }
+      if framework_version < Gem::Version.new('3.0.0')
+        map("/mrlobster") { run Rack::Lobster.new }
+      else
+        map("/mrlobster") { run Rackup::Lobster.new }
+      end
       map("/path_tpl") { run PathTemplateApp.new }
       map("/error") { run ErrorApp.new }
       map("/five_zero_one") { run FiveZeroOneApp.new }

data/test/instrumentation/rails_action_controller_test.rb

@@ -5,7 +5,11 @@ require 'test_helper'
 
 class RailsActionControllerTest < Minitest::Test
   include Rack::Test::Methods
-  APP = Rack::Builder.parse_file('test/support/apps/action_controller/config.ru').first
+  APP = Rack::Builder.parse_file('test/support/apps/action_controller/config.ru')
+  railties_version = Gem::Specification.find_by_name('railties').version
+  if railties_version < Gem::Version.new('7.1.0')
+    APP = APP.first
+  end
 
   def app
     APP

data/test/instrumentation/rails_action_view_test.rb

@@ -5,7 +5,11 @@ require 'test_helper'
 
 class RailsActionViewTest < Minitest::Test
   include Rack::Test::Methods
-  APP = Rack::Builder.parse_file('test/support/apps/action_view/config.ru').first
+  APP = Rack::Builder.parse_file('test/support/apps/action_view/config.ru')
+  railties_version = Gem::Specification.find_by_name('railties').version
+  if railties_version < Gem::Version.new('7.1.0')
+    APP = APP.first
+  end
 
   def app
     APP

data/test/instrumentation/rails_active_record_database_missing_test.rb

@@ -13,14 +13,17 @@ class RailsActiveRecordDatabaseMissingTest < Minitest::Test
     SQLite3::Database.new('/tmp/test.db')
     ENV['DATABASE_URL'] = 'sqlite3:///tmp/test.db'
 
-    @connection = ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+    @connection_pool = ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+    c = ::ActiveRecord::Base.connection
+    c.execute 'PRAGMA journal_mode=DELETE'
+    c.execute 'PRAGMA locking_mode=NORMAL'
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.run(CreateBlocks, direction: :up)
     end
   end
 
   def teardown
-    ActiveRecord::Base.remove_connection(@connection)
+    @connection_pool.disconnect
     ENV['DATABASE_URL'] = @old_url
   end
 
@@ -34,7 +37,6 @@ class RailsActiveRecordDatabaseMissingTest < Minitest::Test
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
     span = find_first_span_by_name(spans, :activerecord)
 
     assert_equal 1, span[:ec]

data/test/instrumentation/sidekiq-client_test.rb

@@ -6,22 +6,6 @@ require 'support/apps/sidekiq/boot'
 
 class SidekiqClientTest < Minitest::Test
   def setup
-    @framework_version = Gem::Specification.find_by_name('sidekiq').version
-    @supported_framework_version = @framework_version < Gem::Version.new('5.3')
-    @execute_test_if_framework_version_is_supported = lambda {
-      unless @supported_framework_version
-        skip "Skipping this test because sidekiq version #{@framework_version} is not yet supported!"
-      end
-    }
-    @execute_test_only_if_framework_version_is_not_supported = lambda {
-      if @supported_framework_version
-        skip "Skipping this test because sidekiq version #{@framework_version} is already supported!"
-      end
-    }
-
-    Sidekiq.configure_client do |config|
-      config.redis = { url: ENV["REDIS_URL"] }
-    end
     ::Sidekiq::Queue.new('some_random_queue').clear
   end
 
@@ -32,7 +16,6 @@ class SidekiqClientTest < Minitest::Test
   end
 
   def test_enqueue
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
     Instana.tracer.start_or_continue_trace(:sidekiqtests) do
       disable_redis_instrumentation
@@ -53,7 +36,6 @@ class SidekiqClientTest < Minitest::Test
   end
 
   def test_enqueue_failure
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
 
     Instana.tracer.start_or_continue_trace(:sidekiqtests) do
@@ -104,6 +86,7 @@ class SidekiqClientTest < Minitest::Test
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobOne', second_span[:data][:'sidekiq-client'][:job]
     assert_equal "false", second_span[:data][:'sidekiq-client'][:retry]
+    assert       second_span[:data][:'sidekiq-client'][:'redis-url']
     assert_equal job['jid'], second_span[:data][:'sidekiq-client'][:job_id]
   end
 
@@ -124,6 +107,7 @@ class SidekiqClientTest < Minitest::Test
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobTwo', second_span[:data][:'sidekiq-client'][:job]
     assert_equal "false", second_span[:data][:'sidekiq-client'][:retry]
+    assert       second_span[:data][:'sidekiq-client'][:'redis-url']
     assert_equal 'Fail to enqueue job', second_span[:data][:log][:message]
   end
 

data/test/instrumentation/sidekiq-worker_test.rb

@@ -5,55 +5,13 @@ require 'test_helper'
 require 'support/apps/sidekiq/boot'
 
 class SidekiqServerTest < Minitest::Test
-  def setup
-    @framework_version = Gem::Specification.find_by_name('sidekiq').version
-    @supported_framework_version = @framework_version < Gem::Version.new('5.3')
-    @execute_test_if_framework_version_is_supported = lambda {
-      unless @supported_framework_version
-        skip "Skipping this test because sidekiq version #{@framework_version} is not yet supported!"
-      end
-    }
-    @execute_test_only_if_framework_version_is_not_supported = lambda {
-      if @supported_framework_version
-        skip "Skipping this test because sidekiq version #{@framework_version} is already supported!"
-      end
-    }
-
-    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)
     assert_equal true, ::Instana.config[:'sidekiq-worker'][:enabled]
   end
 
-  def test_no_sidekiq_tracing_if_unsupported_version_only_redis
-    @execute_test_only_if_framework_version_is_not_supported.call
-    clear_all!
-    ::Sidekiq.redis_pool.with do |redis|
-      redis.sadd('queues'.freeze, 'important')
-      redis.lpush(
-        'queue:important',
-        <<-JSON
-        {
-          "class":"SidekiqJobOne",
-          "args":[1,2,3],
-          "queue":"important",
-          "jid":"123456789"
-        }
-        JSON
-      )
-    end
-
-    spans = Instana.processor.queued_spans
-    assert spans
-  end
-
   def test_successful_worker_starts_new_trace
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
@@ -84,7 +42,6 @@ class SidekiqServerTest < Minitest::Test
   end
 
   def test_failed_worker_starts_new_trace
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
@@ -116,7 +73,6 @@ class SidekiqServerTest < Minitest::Test
   end
 
   def test_successful_worker_continues_previous_trace
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
@@ -150,7 +106,6 @@ class SidekiqServerTest < Minitest::Test
   end
 
   def test_failed_worker_continues_previous_trace
-    @execute_test_if_framework_version_is_supported.call
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
@@ -200,6 +155,7 @@ class SidekiqServerTest < Minitest::Test
 
     assert_equal 'important', worker_span[:data][:'sidekiq-worker'][:queue]
     assert_equal 'SidekiqJobOne', worker_span[:data][:'sidekiq-worker'][:job]
+    assert       worker_span[:data][:'sidekiq-worker'][:'redis-url']
     assert_equal false, worker_span[:data][:'sidekiq-worker'][:job_id].nil?
   end
 
@@ -208,6 +164,7 @@ class SidekiqServerTest < Minitest::Test
 
     assert_equal 'important', worker_span[:data][:'sidekiq-worker'][:queue]
     assert_equal 'SidekiqJobTwo', worker_span[:data][:'sidekiq-worker'][:job]
+    assert       worker_span[:data][:'sidekiq-worker'][:'redis-url']
     assert_equal false, worker_span[:data][:'sidekiq-worker'][:job_id].nil?
 
     assert_equal true, worker_span[:data][:'sidekiq-worker'][:error]
@@ -217,6 +174,7 @@ class SidekiqServerTest < Minitest::Test
   def assert_client_span(client_span, job)
     assert_equal :'sidekiq-client', client_span[:n]
     assert_equal 'important', client_span[:data][:'sidekiq-client'][:queue]
+    assert       client_span[:data][:'sidekiq-client'][:'redis-url']
     assert_equal job.name, client_span[:data][:'sidekiq-client'][:job]
   end
 end

data/test/support/apps/http_endpoint/boot.rb

@@ -22,7 +22,7 @@ Thread.new do
     end
   }
 
-  Rack::Handler::Puma.run(app, Host: '127.0.0.1', Port: 6511)
+  Rackup::Handler::Puma.run(app, Host: '127.0.0.1', Port: 6511)
 end
 
 sleep(2)

data/test/support/apps/sidekiq/worker.rb

@@ -12,15 +12,15 @@ require_relative 'jobs/sidekiq_job_2'
 ::Instana.logger.info "Booting instrumented sidekiq worker for tests."
 ::Sidekiq.logger.level = ::Logger::FATAL
 
-properties = {queues: ['important'], concurrency: 2}
-
 sidekiq_version = Gem::Specification.find_by_name('sidekiq').version
-config_or_options =
-  if sidekiq_version >= Gem::Version.new('7.0.0')
-    ::Sidekiq::Config.new(Sidekiq.default_configuration.merge!(properties))
-  else
-    ::Sidekiq.options.merge(properties)
-  end
+cli = ::Sidekiq::CLI.instance
+cli.parse(['sidekiq', '-r', __FILE__, '-C', "#{File.dirname(__FILE__)}/config.yaml"])
+
+config_or_options = if sidekiq_version >= Gem::Version.new('6.5.0')
+                      cli.config
+                    else
+                      cli.send :options
+                    end
 
 sidekiq_thread = Thread.new do
   launcher = ::Sidekiq::Launcher.new(

data/test/test_helper.rb

@@ -12,6 +12,7 @@ begin
 
     add_filter %r{^/test/}
 
+    command_name "Job #{ENV['CIRCLE_BUILD_NUM']}" if ENV['CIRCLE_BUILD_NUM']
     add_group(
       'In Process Collector',
       [%r{lib/instana/(agent|backend|tracing|collectors|open_tracing|snapshot)}, %r{lib/instana/[^/]+\.rb}]
@@ -26,9 +27,12 @@ begin
       add_filter %r{lib/instana/(activators|frameworks|instrumentation)}
     end
 
-    if ENV['CI']
-      formatter SimpleCov::Formatter::JSONFormatter
-    end
+    formatter SimpleCov::Formatter::MultiFormatter.new(
+      [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::JSONFormatter
+      ]
+    )
   end
 rescue LoadError => _e
   nil
@@ -57,7 +61,7 @@ if ENV['CI']
                            ])
 else
   Minitest::Reporters.use!([
-                             MiniTest::Reporters::SpecReporter.new
+                             Minitest::Reporters::SpecReporter.new
                            ])
 end
 Minitest::Test.include(Instana::TestHelpers)

data/test/tracing/custom_test.rb

@@ -42,6 +42,70 @@ class CustomTracingTest < Minitest::Test
     assert_equal ::Instana.agent.source, first_span[:f]
   end
 
+  # automagic (TM) as seen in the docs:
+  # https://www.ibm.com/docs/en/instana-observability/current?topic=ruby-tracing-sdk#the-instana-ruby-tracing-sdk
+  def test_custom_tracing_with_nested_automagic
+    clear_all!
+    assert_equal false, ::Instana.tracer.tracing?
+
+    kvs = {}
+    kvs[:on_entry_kv] = 1
+    kvs[:arguments] = [[1,2,3], "test_arg", :ok]
+    kvs[:return] = true
+
+    # Start tracing
+    ::Instana.tracer.log_start_or_continue(:rack, :on_trace_start => 1)
+    assert_equal true, ::Instana.tracer.tracing?
+
+    # Now the automagic
+    ::Instana.tracer.trace(:custom_span, kvs) do
+      answer = 42 * 1
+      active_span = ::Instana.tracer.current_span
+      active_span.set_tag(:answer, answer)
+
+      # And now nested automagic
+      ::Instana.tracer.trace(:custom_span2, kvs) do
+        was_here = 'stan'
+        active_span = ::Instana.tracer.current_span
+        active_span.set_tag(:was_here, was_here)
+      end
+    end
+
+    # End tracing
+    ::Instana.tracer.log_end(:rack, {:on_trace_end => 1})
+    assert_equal false, ::Instana.tracer.tracing?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    second_span = find_first_span_by_name(spans, :custom_span)
+    third_span = find_first_span_by_name(spans, :custom_span2)
+
+    assert_equal :sdk, second_span[:n]
+    assert second_span.key?(:data)
+    assert second_span[:data].key?(:sdk)
+    assert second_span[:data][:sdk].key?(:custom)
+    assert second_span[:data][:sdk][:custom].key?(:tags)
+    assert :custom_span, second_span[:data][:sdk][:name]
+    assert :unknown, second_span[:data][:sdk][:type]
+    assert [[1, 2, 3], "test_arg", :ok], second_span[:data][:sdk][:arguments]
+    assert true, second_span[:data][:sdk][:return]
+    assert_equal 1, second_span[:data][:sdk][:custom][:tags][:on_entry_kv]
+    assert_equal 42, second_span[:data][:sdk][:custom][:tags][:answer]
+
+    assert_equal :sdk, third_span[:n]
+    assert third_span.key?(:data)
+    assert third_span[:data].key?(:sdk)
+    assert third_span[:data][:sdk].key?(:custom)
+    assert third_span[:data][:sdk][:custom].key?(:tags)
+    assert :custom_span, third_span[:data][:sdk][:name]
+    assert :unknown, third_span[:data][:sdk][:type]
+    assert [[1, 2, 3], "test_arg", :ok], third_span[:data][:sdk][:arguments]
+    assert true, third_span[:data][:sdk][:return]
+    assert_equal 1, third_span[:data][:sdk][:custom][:tags][:on_entry_kv]
+    assert_equal 'stan', third_span[:data][:sdk][:custom][:tags][:was_here]
+  end
+
   def test_custom_tracing_with_args
     clear_all!
     assert_equal false, ::Instana.tracer.tracing?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.210.1
+  version: 1.212.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - ".github/ISSUE_TEMPLATE/bug.yml"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/workflows/pr_commits_signed_off.yml"
+- ".github/workflows/release-notification-on-slack.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -148,14 +149,18 @@ files:
 - MAINTAINERS.md
 - README.md
 - Rakefile
+- bin/announce_release_on_slack.py
 - bin/console
 - bin/setup
 - docker-compose.yml
+- download.sh
 - examples/opentracing.rb
 - examples/tracing.rb
 - extras/license_header.rb
 - gemfiles/.bundle/config
 - gemfiles/aws_30.gemfile
+- gemfiles/aws_60.gemfile
+- gemfiles/coverage_merge.gemfile
 - gemfiles/cuba_30.gemfile
 - gemfiles/cuba_40.gemfile
 - gemfiles/dalli_20.gemfile
@@ -169,15 +174,18 @@ files:
 - gemfiles/graphql_20.gemfile
 - gemfiles/grpc_10.gemfile
 - gemfiles/mongo_216.gemfile
+- gemfiles/mongo_219.gemfile
 - gemfiles/net_http_01.gemfile
 - gemfiles/rack_16.gemfile
 - gemfiles/rack_20.gemfile
+- gemfiles/rack_30.gemfile
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
+- gemfiles/rails_71.gemfile
 - gemfiles/redis_40.gemfile
 - gemfiles/resque_122.gemfile
 - gemfiles/resque_20.gemfile
@@ -186,11 +194,15 @@ files:
 - gemfiles/roda_20.gemfile
 - gemfiles/roda_30.gemfile
 - gemfiles/shoryuken_50.gemfile
+- gemfiles/shoryuken_60.gemfile
 - gemfiles/sidekiq_42.gemfile
 - gemfiles/sidekiq_50.gemfile
 - gemfiles/sidekiq_60.gemfile
+- gemfiles/sidekiq_65.gemfile
 - gemfiles/sidekiq_70.gemfile
 - gemfiles/sinatra_14.gemfile
+- gemfiles/sinatra_22.gemfile
+- gemfiles/sinatra_30.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb