instana 1.213.1 → 1.213.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1509ebcf4f8afa64594e49f0fc133fda38e6a7170ef86de6510fcb44ed0021e
-  data.tar.gz: b21a8ecac7c698a973171f77d126718e925e0323f500a76a1596248db85615eb
+  metadata.gz: 8d41daf6f68e3738199d8b2fca28811cc70f521eb25b25379bd8c185aef0621c
+  data.tar.gz: bd2cc50d91fbaa639f170150c049b9ffd801b9e1ef2953d1ebd4d1c7c8f95434
 SHA512:
-  metadata.gz: 841b715e429f54599356feaf5e623f4b6084d888968409cbc493ad2d56b2bfba0a43fb9c17a4e1fd303ac863821fc70b42091652d52ded2df94f22e473a03a72
-  data.tar.gz: a57470a6b55b7cbf553c6eb094fa462a1bc9f26ac2349c5be37bec5a26a8bf61f99f365a1e6735783c3344b9ac586461a2fb5ca9dd2cc5b9db86d9db4cabc157
+  metadata.gz: 032ef7a9dc62ead3c64e7ab86420c1f28b093b0ce4f27ccbc4ecd8d6f05f4ccdcd34079c2b5d09f88b4a786977eaa7f3944ea4a97074e96f363f7671baf1b3d1
+  data.tar.gz: c9c2c346dc945b697a65add442e3fbb09c0f9983c7a0ee4601903a961142bbcc55539ee5cc2ba6b71e607d5d86eb8c60d49f3d25c35c17ae1cee4cd077c9e3e4

data/.circleci/config.yml

@@ -16,24 +16,20 @@ library_gemfile: &library_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/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"
     - "./gemfiles/shoryuken_50.gemfile"
     - "./gemfiles/shoryuken_60.gemfile"
     - "./gemfiles/mongo_216.gemfile"
@@ -58,24 +54,23 @@ executors:
     docker:
       - image: cimg/ruby:2.7-node
         environment:
-          DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
+          DATABASE_URL: "mysql2://root:passw0rd@127.0.0.1:3306/ci_test"
       - image: mariadb
         environment:
           MYSQL_DATABASE: 'ci_test'
           MYSQL_USER: 'root'
-          MYSQL_PASSWORD: ''
-          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_PASSWORD: 'passw0rd'
           MYSQL_ROOT_HOST: '%'
   ruby_27_postgres:
     docker:
       - image: cimg/ruby:2.7-node
         environment:
-          DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
+          DATABASE_URL: "postgres://root:passw0rd@127.0.0.1:5432/ci_test"
       - image: postgres
         environment:
-          POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
+          POSTGRES_USER: 'root'
+          POSTGRES_PASSWORD: 'passw0rd'
   ruby_30:
     docker:
       - image: cimg/ruby:3.0-node
@@ -187,7 +182,43 @@ executors:
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
-
+  ruby_33:
+    docker:
+      - image: cimg/ruby:3.3-node
+        environment:
+          MEMCACHED_HOST: '127.0.0.1:11211'
+          REDIS_URL: 'redis://127.0.0.1:6379'
+          DATABASE_URL: 'sqlite3::memory:'
+      - image: memcached
+      - image: redis
+      - image: amazon/dynamodb-local
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
+      - image: mongo:5-focal
+  ruby_33_mysql2:
+    docker:
+      - image: cimg/ruby:3.3-node
+        environment:
+          DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
+      - image: mariadb
+        environment:
+          MYSQL_DATABASE: 'ci_test'
+          MYSQL_USER: 'root'
+          MYSQL_PASSWORD: ''
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_HOST: '%'
+  ruby_33_postgres:
+    docker:
+      - 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:
@@ -356,6 +387,7 @@ workflows:
                 - ruby_30
                 - ruby_31
                 - ruby_32
+                - ruby_33
   libraries_ruby_3:
     jobs:
       - test_apprisal:
@@ -365,26 +397,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:
@@ -421,6 +435,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/sinatra_30.gemfile

@@ -8,6 +8,6 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "sinatra", ">= 3.0.6"
+gem "sinatra", ">= 3.0.6", "< 4.0"
 
 gemspec path: "../"

data/gemfiles/{rack_16.gemfile → sinatra_40.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. 2023
 
 source "https://rubygems.org"
 
@@ -11,6 +8,6 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "rack", "~> 1.6"
+gem "sinatra", ">= 4.0.0"
 
 gemspec path: "../"

data/lib/instana/activators/sinatra.rb

@@ -12,6 +12,9 @@ module Instana
         require 'instana/frameworks/sinatra'
 
         ::Sinatra::Base.use ::Instana::Rack
+        unless ::Sinatra::Base.respond_to?(:mustermann_opts)
+          ::Sinatra::Base.set :mustermann_opts, {}
+        end
         ::Sinatra::Base.register ::Instana::SinatraPathTemplateExtractor
 
         true

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.1"
+  VERSION = "1.213.3"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/frameworks/sinatra_test.rb

@@ -6,7 +6,11 @@ require 'rack/test'
 
 class SinatraTest < Minitest::Test
   include Rack::Test::Methods
-  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru').first
+  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru')
+  sinatra_version = Gem::Specification.find_by_name('sinatra').version
+  if sinatra_version < Gem::Version.new('4.0.0')
+    APP = APP.first
+  end
 
   def app
     APP

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/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.1
+  version: 1.213.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-03-22 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
@@ -188,20 +187,17 @@ files:
 - 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/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
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb

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: "../"