instana 1.213.2 → 1.214.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c1eb25bd9b00e353e9c403d217357931bcc714b5aab7080b598c81c0aa51cf
-  data.tar.gz: 8bb75b9d28e1562cb2b010589fa0667d451bd9a4389e332832fb2e6225cd7882
+  metadata.gz: f17a988f6d3117cee6198d76f4d1d927c78170857122933700352905ddf06382
+  data.tar.gz: 852125ef23731dca4817a18999b9cb1af142d8c62ff8bc5c81c717e370b0a943
 SHA512:
-  metadata.gz: 5976d705537afdb13d900a45831bc9a0947c8bfa9a126f67badad41917d828dc63e4f5546bb3041626822d4636d978047613c1f77d6a82b5922a6c8436ff087a
-  data.tar.gz: c00f53d5ebc10e92fdc3c096092ececc87727b281d5476ac345d7fcf6f273b902b93eca60a423139a6310ad8b9e6188319488608c9006c48dfc89c8913d3dca9
+  metadata.gz: ce8ce7e27297c544e50e7efa4a0ab79cdafacaa4faf7d0a860c7976a7d4bcf671996079f5f019af33215feabe024f1f495edf584f20cf940923883a65e9550dd
+  data.tar.gz: 3cc3695f26bdb194206e688996027366fed40adfd907c80f2d924209ac0d63a7f53155f277f7edd2180f4ab085d86c8a75c096f9891f83e7b1cc5ade1230de50

data/.circleci/config.yml

@@ -9,29 +9,24 @@ library_gemfile: &library_gemfile
     - "./gemfiles/dalli_20.gemfile"
     - "./gemfiles/dalli_30.gemfile"
     - "./gemfiles/dalli_32.gemfile"
-    - "./gemfiles/excon_02.gemfile"
     - "./gemfiles/excon_079.gemfile"
     - "./gemfiles/excon_100.gemfile"
     - "./gemfiles/graphql_10.gemfile"
     - "./gemfiles/graphql_20.gemfile"
     - "./gemfiles/grpc_10.gemfile"
     - "./gemfiles/net_http_01.gemfile"
-    - "./gemfiles/rack_16.gemfile"
     - "./gemfiles/rack_20.gemfile"
     - "./gemfiles/rack_30.gemfile"
     - "./gemfiles/redis_40.gemfile"
-    - "./gemfiles/rest_client_16.gemfile"
+    - "./gemfiles/redis_50.gemfile"
     - "./gemfiles/rest_client_20.gemfile"
     - "./gemfiles/resque_122.gemfile"
     - "./gemfiles/resque_20.gemfile"
     - "./gemfiles/roda_20.gemfile"
     - "./gemfiles/roda_30.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"
     - "./gemfiles/sinatra_40.gemfile"
@@ -40,9 +35,9 @@ library_gemfile: &library_gemfile
     - "./gemfiles/mongo_216.gemfile"
     - "./gemfiles/mongo_219.gemfile"
 executors:
-  ruby_27:
+  ruby_30:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
@@ -55,9 +50,9 @@ executors:
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
       - image: mongo:5-focal
-  ruby_27_mysql2:
+  ruby_30_mysql2:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
       - image: mariadb
@@ -68,18 +63,18 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_27_postgres:
+  ruby_30_postgres:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
-  ruby_30:
+  ruby_31:
     docker:
-      - image: cimg/ruby:3.0-node
+      - image: cimg/ruby:3.1-node
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
@@ -92,9 +87,9 @@ executors:
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
       - image: mongo:5-focal
-  ruby_30_mysql2:
+  ruby_31_mysql2:
     docker:
-      - image: cimg/ruby:3.0-node
+      - image: cimg/ruby:3.1-node
         environment:
           DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
       - image: mariadb
@@ -105,18 +100,18 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_30_postgres:
+  ruby_31_postgres:
     docker:
-      - image: cimg/ruby:3.0-node
+      - image: cimg/ruby:3.1-node
         environment:
           DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
-  ruby_31:
+  ruby_32:
     docker:
-      - image: cimg/ruby:3.1-node
+      - image: cimg/ruby:3.2-node
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
@@ -129,9 +124,9 @@ executors:
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
       - image: mongo:5-focal
-  ruby_31_mysql2:
+  ruby_32_mysql2:
     docker:
-      - image: cimg/ruby:3.1-node
+      - image: cimg/ruby:3.2-node
         environment:
           DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
       - image: mariadb
@@ -142,18 +137,18 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_31_postgres:
+  ruby_32_postgres:
     docker:
-      - image: cimg/ruby:3.1-node
+      - image: cimg/ruby:3.2-node
         environment:
           DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
-  ruby_32:
+  ruby_33:
     docker:
-      - image: cimg/ruby:3.2-node
+      - image: cimg/ruby:3.3-node
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
@@ -166,9 +161,9 @@ executors:
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
       - image: mongo:5-focal
-  ruby_32_mysql2:
+  ruby_33_mysql2:
     docker:
-      - image: cimg/ruby:3.2-node
+      - image: cimg/ruby:3.3-node
         environment:
           DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
       - image: mariadb
@@ -179,16 +174,15 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_32_postgres:
+  ruby_33_postgres:
     docker:
-      - image: cimg/ruby:3.2-node
+      - image: cimg/ruby:3.3-node
         environment:
           DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
-
 commands:
   setup:
     steps:
@@ -297,7 +291,7 @@ jobs:
     parameters:
       stack:
         type: executor
-        default: ruby_27
+        default: ruby_30
     executor: << parameters.stack >>
     steps:
       - checkout
@@ -307,7 +301,7 @@ jobs:
     parameters:
       stack:
         type: executor
-        default: ruby_27
+        default: ruby_30
       gemfile:
         type: string
         default: "./gemfiles/aws_30.gemfile"
@@ -320,7 +314,7 @@ jobs:
       - setup
       - run_tests
   lint:
-    executor: ruby_27
+    executor: ruby_30
     steps:
       - checkout
       - setup
@@ -331,7 +325,7 @@ jobs:
       - checkout
       - run_sonarqube
   publish:
-    executor: ruby_27
+    executor: ruby_30
     steps:
       - checkout
       - setup
@@ -353,10 +347,10 @@ workflows:
           matrix:
             parameters:
               stack:
-                - ruby_27
                 - ruby_30
                 - ruby_31
                 - ruby_32
+                - ruby_33
   libraries_ruby_3:
     jobs:
       - test_apprisal:
@@ -366,47 +360,8 @@ workflows:
                 - ruby_30
                 - ruby_31
                 - ruby_32
+                - ruby_33
               <<: *library_gemfile
-            exclude:
-            # Currently rest-client 1.6 gemfile pulls in mime-types 2.99.3
-            # and adaptation to mime-type 3.0 is only available in rest-client 2.0:
-            # https://github.com/rest-client/rest-client/issues/464
-            # But mime-types 2.99.3 is too old for Ruby 3.0 or newer:
-            # https://stackoverflow.com/a/68433864
-            # so we should exclude thiese scenarios
-            - stack: ruby_30
-              gemfile: "./gemfiles/rest_client_16.gemfile"
-            - stack: ruby_31
-              gemfile: "./gemfiles/rest_client_16.gemfile"
-            - stack: ruby_32
-              gemfile: "./gemfiles/rest_client_16.gemfile"
-            # Sinatra 1.4 relies on the Fixnum class
-            # which has been removed from Ruby 3.2, see:
-            # https://bugs.ruby-lang.org/issues/12005
-            # https://www.ruby-lang.org/en/news/2022/11/11/ruby-3-2-0-preview3-released/
-            - stack: ruby_32
-              gemfile: "./gemfiles/sinatra_14.gemfile"
-  libraries_ruby_2:
-    jobs:
-      - test_apprisal:
-          matrix:
-            parameters:
-              stack:
-                - ruby_27
-              <<: *library_gemfile
-  rails_ruby_2:
-    jobs:
-      - test_apprisal:
-          matrix:
-            parameters:
-              stack:
-                - ruby_27
-                - ruby_27_postgres
-                - ruby_27_mysql2
-              gemfile:
-                - "./gemfiles/rails_60.gemfile"
-                - "./gemfiles/rails_52.gemfile"
-                - "./gemfiles/rails_50.gemfile"
   rails_ruby_3:
     jobs:
       - test_apprisal:
@@ -422,6 +377,8 @@ workflows:
                 - ruby_32
                 - ruby_32_postgres
                 - ruby_32_mysql2
+                - ruby_33_postgres
+                - ruby_33_mysql2
               gemfile:
                 - "./gemfiles/rails_61.gemfile"
                 - "./gemfiles/rails_70.gemfile"

data/gemfiles/{rack_16.gemfile → redis_50.gemfile}

@@ -1,7 +1,4 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
+# (c) Copyright IBM Corp. 2024
 
 source "https://rubygems.org"
 
@@ -11,6 +8,7 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "rack", "~> 1.6"
+gem "redis", ">= 5.0.0"
+gem "debug"
 
 gemspec path: "../"

data/instana.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.test_files    = Dir.glob("{test}/**/*.rb")
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
   spec.platform      = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::RUBY
 
   spec.add_development_dependency "bundler", "~> 2.0"

data/lib/instana/activators/redis.rb

@@ -5,13 +5,18 @@ module Instana
   module Activators
     class Redis < Activator
       def can_instrument?
-        defined?(::Redis) && defined?(::Redis::Client) && ::Instana.config[:redis][:enabled]
+        defined?(::Redis) && defined?(::Redis::Client) && ::Instana.config[:redis][:enabled] &&
+          (Gem::Specification.find_by_name('redis').version < Gem::Version.new('5.0') || defined?(::RedisClient))
       end
 
       def instrument
         require 'instana/instrumentation/redis'
 
-        ::Redis::Client.prepend(::Instana::RedisInstrumentation)
+        if Gem::Specification.find_by_name('redis').version >= Gem::Version.new('5.0')
+          ::RedisClient.prepend(::Instana::RedisInstrumentation)
+        else
+          ::Redis::Client.prepend(::Instana::RedisInstrumentation)
+        end
 
         true
       end

data/lib/instana/instrumentation/redis.rb

@@ -1,58 +1,85 @@
-# (c) Copyright IBM Corp. 2021
+# (c) Copyright IBM Corp. 2024
 # (c) Copyright Instana Inc. 2017
 
 module Instana
   module RedisInstrumentation
-    def call(*args, &block)
-      kv_payload = { redis: {} }
-      dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
+    if Gem::Specification.find_by_name('redis').version >= Gem::Version.new('5.0') && defined?(::RedisClient)
+      ORIGINAL_METHODS = {
+        :call_v => ::RedisClient.instance_method(:call_v),
+        :pipelined => ::RedisClient.instance_method(:pipelined),
+        :multi => ::RedisClient.instance_method(:multi)
+      }.freeze
 
-      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
-        return super(*args, &block)
+      def call_v(*args, &block)
+        if skip_instrumentation?
+          super(*args, &block)
+        else
+          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call_v], *args, &block)
+        end
       end
 
-      begin
-        ::Instana.tracer.log_entry(:redis)
+      def pipelined(*args, &block)
+        if skip_instrumentation?
+          super(*args, &block)
+        else
+          call_with_instana('PIPELINE', ORIGINAL_METHODS[:pipelined], *args, &block)
+        end
+      end
 
-        begin
-          kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
-          kv_payload[:redis][:db] = db.to_s
-          kv_payload[:redis][:command] = args[0][0].to_s.upcase
-        rescue
-          nil
+      # Since, starting with 5.1 redis/client.rb:114:multi takes an unused default argument `watch: nil`
+      # but calls redis_client.rb:442:multi, which doesn't take any argument,
+      # here we have to take arguments but we should not use it.
+      def multi(*_, &block)
+        if skip_instrumentation?
+          super(&block)
+        else
+          call_with_instana('MULTI', ORIGINAL_METHODS[:multi], &block)
         end
+      end
 
-        super(*args, &block)
-      rescue => e
-        ::Instana.tracer.log_info({ redis: {error: true} })
-        ::Instana.tracer.log_error(e)
-        raise
-      ensure
-        ::Instana.tracer.log_exit(:redis, kv_payload)
+    else
+      ORIGINAL_METHODS = {
+        :call => ::Redis::Client.instance_method(:call),
+        :call_pipeline => ::Redis::Client.instance_method(:call_pipeline)
+      }.freeze
+
+      def call(*args, &block)
+        if skip_instrumentation?
+          super(*args, &block)
+        else
+          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call], *args, &block)
+        end
+      end
+
+      def call_pipeline(*args, &block)
+        if skip_instrumentation?
+          super(*args, &block)
+        else
+          call_with_instana(args.first.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE', ORIGINAL_METHODS[:call_pipeline], *args, &block)
+        end
       end
     end
 
-    def call_pipeline(*args, &block)
-      kv_payload = { redis: {} }
+    def skip_instrumentation?
       dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
+      !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
+    end
 
-      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
-        return super(*args, &block)
-      end
+    def call_with_instana(*args, &block)
+      command, original_super, *original_args = *args
+      kv_payload = { redis: {} }
 
       begin
         ::Instana.tracer.log_entry(:redis)
 
-        pipeline = args.first
         begin
           kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
           kv_payload[:redis][:db] = db.to_s
-          kv_payload[:redis][:command] = pipeline.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE'
+          kv_payload[:redis][:command] = command
         rescue
           nil
         end
-
-        super(*args, &block)
+        original_super.bind(self).call(*original_args, &block)
       rescue => e
         ::Instana.tracer.log_info({ redis: {error: true} })
         ::Instana.tracer.log_error(e)

data/lib/instana/util.rb

@@ -86,8 +86,17 @@ module Instana
           end
         end
 
-        if defined?(::RailsLts) || defined?(::Rails)
-          return Rails.application.class.to_s.split('::')[0]
+        rails_module = if defined?(::RailsLts)
+                         then ::RailsLts
+                       elsif defined?(::Rails)
+                         then ::Rails
+                       end
+
+        if rails_module &&
+           rails_module.respond_to?(:application_name) &&
+           rails_module.instance_variables.include?(:@application) &&
+           rails_module.application
+          return rails_module.application_name
         end
 
         if $0.to_s.empty?

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.213.2"
+  VERSION = "1.214.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/rails_action_cable_test.rb

@@ -28,11 +28,12 @@ class RailsActionCableTest < Minitest::Test
     data = span[:data]
 
     assert_nil rest
-    assert :"rpc-server", span[:n]
-    assert :actioncable, data[:rpc][:flavor]
-    assert channel_klass.to_s, data[:rpc][:call]
-    assert :transmit, data[:rpc][:call_type]
-    assert Socket.gethostname, data[:rpc][:host]
+    assert_equal :"rpc-server", span[:n]
+    assert_equal "rake_test_loader.rb", data[:service]
+    assert_equal :actioncable, data[:rpc][:flavor]
+    assert_equal channel_klass.to_s, data[:rpc][:call]
+    assert_equal :transmit, data[:rpc][:call_type]
+    assert_equal Socket.gethostname, data[:rpc][:host]
   end
 
   def test_transmit_parent
@@ -53,12 +54,13 @@ class RailsActionCableTest < Minitest::Test
     data = span[:data]
 
     assert_nil rest
-    assert 'ABC', span[:t]
-    assert :"rpc-server", span[:n]
-    assert :actioncable, data[:rpc][:flavor]
-    assert channel_klass.to_s, data[:rpc][:call]
-    assert :transmit, data[:rpc][:call_type]
-    assert Socket.gethostname, data[:rpc][:host]
+    assert_equal 'ABC', span[:t]
+    assert_equal :"rpc-server", span[:n]
+    assert_equal "rake_test_loader.rb", data[:service]
+    assert_equal :actioncable, data[:rpc][:flavor]
+    assert_equal channel_klass.to_s, data[:rpc][:call]
+    assert_equal :transmit, data[:rpc][:call_type]
+    assert_equal Socket.gethostname, data[:rpc][:host]
   end
 
   def test_action_no_parent
@@ -79,11 +81,12 @@ class RailsActionCableTest < Minitest::Test
     data = span[:data]
 
     assert_nil rest
-    assert :"rpc-server", span[:n]
-    assert :actioncable, data[:rpc][:flavor]
-    assert "#{channel_klass}#sample", data[:rpc][:call]
-    assert :action, data[:rpc][:call_type]
-    assert Socket.gethostname, data[:rpc][:host]
+    assert_equal :"rpc-server", span[:n]
+    assert_equal "rake_test_loader.rb", data[:service]
+    assert_equal :actioncable, data[:rpc][:flavor]
+    assert_equal "#{channel_klass}#sample", data[:rpc][:call]
+    assert_equal :action, data[:rpc][:call_type]
+    assert_equal Socket.gethostname, data[:rpc][:host]
   end
 
   def test_action_parent
@@ -108,12 +111,13 @@ class RailsActionCableTest < Minitest::Test
     data = span[:data]
 
     assert_nil rest
-    assert 'ABC', span[:t]
-    assert :"rpc-server", span[:n]
-    assert :actioncable, data[:rpc][:flavor]
-    assert "#{channel_klass}#sample", data[:rpc][:call]
-    assert :action, data[:rpc][:call_type]
-    assert Socket.gethostname, data[:rpc][:host]
+    assert_equal 'ABC', span[:t]
+    assert_equal :"rpc-server", span[:n]
+    assert_equal "rake_test_loader.rb", data[:service]
+    assert_equal :actioncable, data[:rpc][:flavor]
+    assert_equal "#{channel_klass}#sample", data[:rpc][:call]
+    assert_equal :action, data[:rpc][:call_type]
+    assert_equal Socket.gethostname, data[:rpc][:host]
   end
 
   private

data/test/instrumentation/redis_test.rb

@@ -49,9 +49,9 @@ class RedisTest < Minitest::Test
     clear_all!
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
-      @redis_client.pipelined do
-        @redis_client.set('hello', 'world')
-        @redis_client.set('other', 'world')
+      @redis_client.pipelined do |pipeline|
+        pipeline.set('hello', 'world')
+        pipeline.set('other', 'world')
       end
     end
 
@@ -63,9 +63,9 @@ class RedisTest < Minitest::Test
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        @redis_client.pipelined do
-          @redis_client.set('other', 'world')
-          @redis_client.call('invalid')
+        @redis_client.pipelined do |pipeline|
+          pipeline.set('other', 'world')
+          pipeline.call('invalid')
         end
       rescue; end
     end
@@ -77,9 +77,9 @@ class RedisTest < Minitest::Test
     clear_all!
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
-      @redis_client.multi do
-        @redis_client.set('hello', 'world')
-        @redis_client.set('other', 'world')
+      @redis_client.multi do |multi|
+        multi.set('hello', 'world')
+        multi.set('other', 'world')
       end
     end
 
@@ -91,9 +91,9 @@ class RedisTest < Minitest::Test
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        @redis_client.multi do
-          @redis_client.set('other', 'world')
-          @redis_client.call('invalid')
+        @redis_client.multi do |multi|
+          multi.set('other', 'world')
+          multi.call('invalid')
         end
       rescue; end
     end

data/test/snapshot/ruby_process_test.rb

@@ -10,5 +10,23 @@ class RubyProcessTest < Minitest::Test
 
     assert_equal Instana::Snapshot::RubyProcess::ID, snapshot[:name]
     assert_equal Process.pid.to_s, snapshot[:entityId]
+    assert_equal File.basename($PROGRAM_NAME), snapshot[:data][:name]
+  end
+
+  def test_snapshot_with_rails_defined_but_no_rails_application
+    Object.send(:const_set, :Rails,
+                Module.new do
+                  def respond_to?
+                    false
+                  end
+                end)
+    subject = Instana::Snapshot::RubyProcess.new
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::RubyProcess::ID, snapshot[:name]
+    assert_equal Process.pid.to_s, snapshot[:entityId]
+    assert_equal File.basename($PROGRAM_NAME), snapshot[:data][:name]
+  ensure
+    Object.send(:remove_const, :Rails)
   end
 end

data/test/support/helpers.rb

@@ -81,17 +81,5 @@ module Instana
       end
       raise StandardError, 'Span with qualifier not found'
     end
-
-    def has_postgres_database?
-      URI(ENV.fetch('DATABASE_URL', '')).scheme == 'postgres'
-    end
-
-    def has_mysql2_database?
-      URI(ENV.fetch('DATABASE_URL', '')).scheme == 'mysql2'
-    end
-
-    def has_mysql_database?
-      URI(ENV.fetch('DATABASE_URL', '')).scheme == 'mysql'
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.213.2
+  version: 1.214.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,6 @@ files:
 - 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
@@ -186,20 +185,17 @@ files:
 - gemfiles/rails_70.gemfile
 - gemfiles/rails_71.gemfile
 - gemfiles/redis_40.gemfile
+- gemfiles/redis_50.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/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
 - gemfiles/sinatra_40.gemfile
@@ -396,14 +392,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana

data/gemfiles/rest_client_16.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
-
-source "https://rubygems.org"
-
-gem "rack"
-gem "rackup"
-gem "minitest-reporters"
-gem "webmock"
-gem "puma"
-gem "rubocop", "~> 1.9"
-gem "rack-test"
-gem "simplecov", "~> 0.21.2"
-gem "rest-client", ">= 1.6", "< 2.0"
-
-gemspec path: "../"

data/gemfiles/sidekiq_42.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
-
-source "https://rubygems.org"
-
-gem "minitest-reporters"
-gem "webmock"
-gem "puma"
-gem "rubocop", "~> 1.9"
-gem "rack-test"
-gem "simplecov", "~> 0.21.2"
-gem "sidekiq", "~> 4.2.10"
-
-gemspec path: "../"

data/gemfiles/sidekiq_50.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
-
-source "https://rubygems.org"
-
-gem "minitest-reporters"
-gem "webmock"
-gem "puma"
-gem "rubocop", "~> 1.9"
-gem "rack-test"
-gem "simplecov", "~> 0.21.2"
-gem "sidekiq", "< 6.0"
-
-gemspec path: "../"

data/gemfiles/sinatra_14.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
-
-source "https://rubygems.org"
-
-gem "minitest-reporters"
-gem "webmock"
-gem "puma"
-gem "rubocop", "~> 1.9"
-gem "rack-test"
-gem "simplecov", "~> 0.21.2"
-gem "sinatra", ">= 1.4.8", "< 2.0"
-
-gemspec path: "../"