instana 1.209.7 → 1.210.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad727e388d233521b7837cfc0157cd6b5af54f307529ad5e58207894d6863de
-  data.tar.gz: 9fb40e5a5769d996195f076475c2ef5d67182e245e549cf14970dcc0779d6014
+  metadata.gz: f0c28b91f8eb2d64963d01cf4a2368efbdb21ca9d9a8290324c382730d7a4785
+  data.tar.gz: b36132d8b22cf57151889f9955f58656cf8d02048c148bf3c7bc62b619926604
 SHA512:
-  metadata.gz: 0f9e58d31701ffd88af39ff5ac25e7c87a443153122a63b6e319e04c545d3926318d4c5862b8a628a215325f6f873d26852eb426440ceaa19746c4c80e9d19e6
-  data.tar.gz: d83ea081e9721634bcbf0aff97b1fc67f78fdcfabe52bfbeda95f20fc144c017e16d137f74d02a54f9a0adbb028916c5a62596b7af2a7cb51a80880d0fc79f99
+  metadata.gz: b55ba81f80d1d99e79225cf611fe435b7db3ea64ff4dd2ce0044fa524d0ccf1618b52cf01de59daf9e60fc8d0c78caf6425f00c8a8983ad92eea505c5036e0a2
+  data.tar.gz: de69af23be0d789a7468f8927ed948ced66ebb7e3f49d78422d52dbc08988dfe2427c7690c06e105cb429d62447cd9bd863543ca9fd982864d8899cf38e3ca58

data/.circleci/config.yml

@@ -38,6 +38,117 @@ executors:
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
+  ruby_30:
+    docker:
+      - image: cimg/ruby:3.0-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_30_mysql2:
+    docker:
+      - image: cimg/ruby:3.0-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_30_postgres:
+    docker:
+      - 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_31:
+    docker:
+      - image: cimg/ruby:3.1-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_31_mysql2:
+    docker:
+      - image: cimg/ruby:3.1-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_31_postgres:
+    docker:
+      - 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_32:
+    docker:
+      - image: cimg/ruby:3.2-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_32_mysql2:
+    docker:
+      - image: cimg/ruby:3.2-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_32_postgres:
+    docker:
+      - 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'
 
 commands:
   setup:
@@ -176,6 +287,9 @@ workflows:
             parameters:
               stack:
                 - ruby_27
+                - ruby_30
+                - ruby_31
+                - ruby_32
   libraries:
     jobs:
       - test_apprisal:
@@ -183,6 +297,9 @@ workflows:
             parameters:
               stack:
                 - ruby_27
+                - ruby_30
+                - ruby_31
+                - ruby_32
               gemfile:
                 - "./gemfiles/aws_30.gemfile"
                 - "./gemfiles/cuba_30.gemfile"
@@ -190,6 +307,7 @@ workflows:
                 - "./gemfiles/dalli_20.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"
@@ -205,10 +323,32 @@ workflows:
                 - "./gemfiles/roda_30.gemfile"
                 - "./gemfiles/sidekiq_42.gemfile"
                 - "./gemfiles/sidekiq_50.gemfile"
+                - "./gemfiles/sidekiq_60.gemfile"
+                - "./gemfiles/sidekiq_70.gemfile"
                 - "./gemfiles/sinatra_14.gemfile"
                 - "./gemfiles/shoryuken_50.gemfile"
                 - "./gemfiles/mongo_216.gemfile"
-  rails:
+            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"
+
+  rails_ruby_2:
     jobs:
       - test_apprisal:
           matrix:
@@ -221,3 +361,21 @@ workflows:
                 - "./gemfiles/rails_60.gemfile"
                 - "./gemfiles/rails_52.gemfile"
                 - "./gemfiles/rails_50.gemfile"
+  rails_ruby_3:
+    jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
+                - ruby_30
+                - ruby_30_postgres
+                - ruby_30_mysql2
+                - ruby_31
+                - ruby_31_postgres
+                - ruby_31_mysql2
+                - ruby_32
+                - ruby_32_postgres
+                - ruby_32_mysql2
+              gemfile:
+                - "./gemfiles/rails_61.gemfile"
+                - "./gemfiles/rails_70.gemfile"

data/gemfiles/excon_100.gemfile

@@ -0,0 +1,16 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rack", "<3.0.0"
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "excon", ">= 0.100.0", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/grpc_10.gemfile

@@ -13,6 +13,6 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "grpc", ">= 1.0", "< 2.0"
+gem "grpc", ">= 1.55.0", "< 2.0"
 
 gemspec path: "../"

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mail", ">= 2.8.1"
+gem "rails", ">= 6.1", "< 7.0"
+gem "mysql2", "0.5.5"
+gem "pg"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/gemfiles/rails_70.gemfile

@@ -0,0 +1,19 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mail", ">= 2.8.1"
+gem "rails", ">= 7.0"
+gem "mysql2", "0.5.5"
+gem "pg"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/gemfiles/rest_client_20.gemfile

@@ -14,6 +14,6 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "rest-client", ">= 2.0", "< 3.0"
+gem "rest-client", ">= 2.1.0", "< 3.0"
 
 gemspec path: "../"

data/gemfiles/sidekiq_60.gemfile

@@ -0,0 +1,15 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sidekiq", ">= 6.0", "< 7.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_70.gemfile

@@ -0,0 +1,15 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sidekiq", ">= 7.0"
+
+gemspec path: "../"

data/lib/instana/instrumentation/action_cable.rb

@@ -15,7 +15,7 @@ module Instana
     end
 
     module ActionCableChannel
-      def transmit(*args)
+      def transmit(data, via: nil)
         rpc_tags = {
           service: ::Instana::Util.get_app_name,
           rpc: {
@@ -28,7 +28,7 @@ module Instana
 
         context = connection.instana_trace_context
         ::Instana.tracer.start_or_continue_trace(:'rpc-server', rpc_tags, context) do
-          super(*args)
+          super(data, via: via)
         end
       end
 

data/lib/instana/instrumentation/active_record.rb

@@ -8,7 +8,7 @@ module Instana
       IGNORED_SQL = %w[BEGIN COMMIT SET].freeze
       SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i.freeze
 
-      def log(sql, name = 'SQL', binds = [], *args)
+      def log(sql, name = 'SQL', binds = [], *args, **kwargs, &block)
         call_payload = {
           activerecord: {
             adapter: @config[:adapter],
@@ -24,7 +24,7 @@ module Instana
           call_payload[:activerecord][:binds] = mapped
         end
 
-        maybe_trace(call_payload, name) { super(sql, name, binds, *args) }
+        maybe_trace(call_payload, name) { super(sql, name, binds, *args, **kwargs, &block) }
       end
 
       private

data/lib/instana/instrumentation/graphql.rb

@@ -63,7 +63,20 @@ module Instana
         return [] unless parent.respond_to?(method)
 
         parent.send(method).map do |field|
-          [{object: parent.name, field: field.name}] + walk_fields(field, method)
+          # Certain types like GraphQL::Language::Nodes::InlineFragment
+          # have no "name" instance variable defined,
+          # in such case we use the class's name
+          parent_name = if parent.instance_variable_defined?(:@name)
+                          parent.name
+                        else
+                          parent.class.name.split('::').last
+                        end
+          field_name = if field.instance_variable_defined?(:@name)
+                         field.name
+                       else
+                         field.class.name.split('::').last
+                       end
+          [{object: parent_name, field: field_name}] + walk_fields(field, method)
         end.flatten
       end
 

data/lib/instana/version.rb

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

data/lib/opentracing.rb

@@ -17,8 +17,8 @@ module OpenTracing
 
     attr_accessor :global_tracer
 
-    def method_missing(method_name, *args, &block)
-      @global_tracer.send(method_name, *args, &block)
+    def method_missing(method_name, *args, **kwargs, &block)
+      @global_tracer.send(method_name, *args, **kwargs, &block)
     end
 
     def respond_to_missing?(name, all)

data/test/instrumentation/graphql_test.rb

@@ -8,84 +8,213 @@ class GraphqlTest < Minitest::Test
     field :id, ID, null: false
     field :action, String, null: false
   end
-  
+
+  class JobType < GraphQL::Schema::Object
+    field :id, ID, null: false
+    field :name, String, null: false
+    field :description, String, null: false
+  end
+
+  class TaskJobUnion < GraphQL::Schema::Union
+    description "A union type for Task and Job"
+    possible_types TaskType, JobType
+
+    def self.resolve_type(object, _context)
+      if !object.action.nil?
+        TaskType
+      elsif !object.description?
+        JobType
+      else
+        raise("Unexpected object: #{object}")
+      end
+    end
+  end
+
   class NewTaskType < GraphQL::Schema::Mutation
     argument :action, String, required: true
     field :task, TaskType, null: true
-    
+
     def resolve(action:)
       {
         task: OpenStruct.new(id: '0', action: action)
       }
     end
   end
-  
+
   class QueryType < GraphQL::Schema::Object
     field :tasks, TaskType.connection_type, null: false
-    
+    field :jobs, JobType.connection_type, null: false
+    field :tasksorjobs, TaskJobUnion.connection_type, null: false
+
     def tasks()
       [
-        OpenStruct.new(id: '0', action: 'Sample')
+        OpenStruct.new(id: '0', action: 'Sample 00'),
+        OpenStruct.new(id: '1', action: 'Sample 01'),
+        OpenStruct.new(id: '2', action: 'Sample 02'),
+        OpenStruct.new(id: '3', action: 'Sample 03'),
+        OpenStruct.new(id: '4', action: 'Sample 04')
+      ]
+    end
+
+    def jobs()
+      [
+        OpenStruct.new(id: '0', name: 'Name 00', description: 'Desc 00'),
+        OpenStruct.new(id: '1', name: 'Name 01', description: 'Desc 01'),
+        OpenStruct.new(id: '2', name: 'Name 02', description: 'Desc 02'),
+        OpenStruct.new(id: '3', name: 'Name 03', description: 'Desc 03'),
+        OpenStruct.new(id: '4', name: 'Name 04', description: 'Desc 04')
+      ]
+    end
+
+    def tasksorjobs()
+      [
+        OpenStruct.new(id: '0', action: 'Task 00'),
+        OpenStruct.new(id: '0', name: 'Job 00', description: 'Job Desc 00')
       ]
     end
   end
-  
+
   class MutationType < GraphQL::Schema::Object
     field :create_task, mutation: NewTaskType
   end
-  
+
   class Schema < GraphQL::Schema
     query QueryType
     mutation MutationType
   end
-  
+
   def test_it_works
     assert defined?(GraphQL)
   end
-  
-  def test_config_defaults    
+
+  def test_config_defaults
     assert ::Instana.config[:graphql].is_a?(Hash)
     assert ::Instana.config[:graphql].key?(:enabled)
     assert_equal true, ::Instana.config[:graphql][:enabled]
   end
-  
+
   def test_query
     clear_all!
-    
-    query = "query Sample {
-      tasks(after: \"\", first: 10) {
+
+    query = "query FirstTwoTaskSamples {
+      tasks(after: \"\", first: 2) {
         nodes {
           action
         }
       }
     }"
-    
+
     expected_data = {
-      :operationName => "Sample",
+      :operationName => "FirstTwoTaskSamples",
       :operationType => "query",
       :arguments => { "tasks" => ["after", "first"] },
       :fields => { "tasks" => ["nodes"], "nodes" => ["action"] }
     }
     expected_results = {
       "data" => {
-        "tasks" => { 
-          "nodes" => [{ "action" => "Sample" }]
+        "tasks" => {
+          "nodes" => [{"action" => "Sample 00"}, {"action" => "Sample 01"}]
+        }
+      }
+    }
+
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+
+  def test_query_with_fragment
+    clear_all!
+
+    query = "
+    fragment actionDetails on Task {
+      action
+    }
+
+    query SampleWithFragment {
+      tasks {
+        nodes {
+          ... actionDetails
+        }
+      }
+    }"
+
+    expected_data = {
+      :operationName => "SampleWithFragment",
+      :operationType => "query",
+      :arguments => {},
+      :fields => { "tasks" => ["nodes"], "nodes" => ["actionDetails"] }
+    }
+    expected_results = {
+      "data" => {
+        "tasks" => {
+          "nodes" => [{"action" => "Sample 00"}, {"action" => "Sample 01"},
+                      {"action" => "Sample 02"}, {"action" => "Sample 03"},
+                      {"action" => "Sample 04"}]
         }
       }
     }
-    
+
     results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
     query_span, root_span = *Instana.processor.queued_spans
-    
+
     assert_equal expected_results, results.to_h
     assert_equal :sdk, root_span[:n]
     assert_equal :'graphql.server', query_span[:n]
     assert_equal expected_data, query_span[:data][:graphql]
   end
-  
+
+  def test_query_union_with_fragment
+    clear_all!
+
+    query = "
+    query QueryUnionWithFragment {
+      tasksorjobs {
+        nodes {
+          ... on Task {
+            action
+          }
+          ... on Job {
+            name
+            description
+          }
+        }
+      }
+    }"
+
+    expected_data = {
+      :operationName => "QueryUnionWithFragment",
+      :operationType => "query",
+      :arguments => {},
+      :fields => { "tasksorjobs" => ["nodes"],
+                   "nodes" => ["InlineFragment", "InlineFragment"],
+                   "InlineFragment" => %w[action name description]}
+    }
+    expected_results = {
+      "data" => {
+        "tasksorjobs" => {
+          "nodes" => [{"action" => "Task 00"},
+                      {"name" => "Job 00", "description" => "Job Desc 00"}]
+        }
+      }
+    }
+
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+
   def test_mutation
     clear_all!
-    
+
     query = "mutation Sample {
       createTask(action: \"Sample\") {
         task {
@@ -93,7 +222,7 @@ class GraphqlTest < Minitest::Test
         }
       }
     }"
-    
+
     expected_data = {
       :operationName => "Sample",
       :operationType => "mutation",
@@ -102,15 +231,15 @@ class GraphqlTest < Minitest::Test
     }
     expected_results = {
       "data" => {
-        "createTask" => { 
+        "createTask" => {
           "task" => { "action" => "Sample" }
         }
       }
     }
-    
+
     results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
     query_span, root_span = *Instana.processor.queued_spans
-        
+
     assert_equal expected_results, results.to_h
     assert_equal :sdk, root_span[:n]
     assert_equal :'graphql.server', query_span[:n]

data/test/instrumentation/rails_action_cable_test.rb

@@ -22,7 +22,7 @@ class RailsActionCableTest < Minitest::Test
 
     channel_klass
       .new(connection, :test)
-      .send(:transmit, 'action' => 'sample')
+      .send(:transmit, 'Sample message', via: nil)
 
     span, rest = Instana.processor.queued_spans
     data = span[:data]
@@ -47,7 +47,7 @@ class RailsActionCableTest < Minitest::Test
 
     channel_klass
       .new(connection, :test)
-      .send(:transmit, 'action' => 'sample')
+      .send(:transmit, 'Sample message', via: 'Important')
 
     span, rest = Instana.processor.queued_spans
     data = span[:data]
@@ -125,7 +125,7 @@ class RailsActionCableTest < Minitest::Test
       config: OpenStruct.new(log_tags: [])
     )
     connection = ActionCable::Connection::Base.new(server, {})
-    connection.define_singleton_method(:transmit) { |*_args| true }
+    connection.define_singleton_method(:transmit) { |*_args, **_kwargs| true }
     connection
   end
 end

data/test/instrumentation/rails_action_mailer_test.rb

@@ -7,13 +7,24 @@ require 'action_mailer'
 class RailsActionMailerTest < Minitest::Test
   class TestMailer < ActionMailer::Base
     def sample_email
-      mail(
-        from: 'test@example.com',
-        to: 'test@example.com',
-        subject: 'Test Email',
-        body: 'Hello',
-        content_type: "text/html"
-      )
+      mail_version = Gem::Specification.find_by_name('mail').version
+      if mail_version >= Gem::Version.new('2.8.1')
+        Mail.new do
+          from 'test@example.com'
+          to 'test@example.com'
+          subject 'Test Email'
+          body 'Hello'
+          content_type "text/html"
+        end
+      else
+        mail(
+          from: 'test@example.com',
+          to: 'test@example.com',
+          subject: 'Test Email',
+          body: 'Hello',
+          content_type: "text/html"
+        )
+      end
     end
   end
 

data/test/instrumentation/rails_action_view_test.rb

@@ -13,6 +13,18 @@ class RailsActionViewTest < Minitest::Test
 
   def setup
     clear_all!
+    @framework_version = Gem::Specification.find_by_name('rails').version
+    @supported_framework_version = @framework_version < Gem::Version.new('6.1')
+    @execute_test_if_framework_version_is_supported = lambda {
+      unless @supported_framework_version
+        skip "Skipping this test because Rails 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 Rails version #{@framework_version} is already supported!"
+      end
+    }
   end
 
   def test_config_defaults
@@ -21,7 +33,25 @@ class RailsActionViewTest < Minitest::Test
     assert_equal true, ::Instana.config[:action_view][:enabled]
   end
 
+  def test_no_tracing_if_unsupported_version_only_render_is_ok
+    @execute_test_only_if_framework_version_is_not_supported.call
+
+    ['/render_view', '/render_view_direct', '/render_partial', '/render_collection', '/render_file',
+     '/render_alternate_layout', '/render_json', '/render_xml',
+     '/render_rawbody', '/render_js'].each do |endpoint|
+      get endpoint
+      assert last_response.ok?
+    end
+
+    get '/render_partial_that_errors'
+    assert_equal false, last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal [], spans
+  end
+
   def test_render_view
+    @execute_test_if_framework_version_is_supported.call
     get '/render_view'
     assert last_response.ok?
 
@@ -32,6 +62,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_view_direct
+    @execute_test_if_framework_version_is_supported.call
     get '/render_view_direct'
     assert last_response.ok?
 
@@ -54,6 +85,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_file
+    @execute_test_if_framework_version_is_supported.call
     get '/render_file'
     assert last_response.ok?
 
@@ -64,6 +96,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_json
+    @execute_test_if_framework_version_is_supported.call
     get '/render_json'
     assert last_response.ok?
 
@@ -74,6 +107,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_xml
+    @execute_test_if_framework_version_is_supported.call
     get '/render_xml'
     assert last_response.ok?
 
@@ -84,6 +118,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_body
+    @execute_test_if_framework_version_is_supported.call
     get '/render_rawbody'
     assert last_response.ok?
 
@@ -94,6 +129,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_js
+    @execute_test_if_framework_version_is_supported.call
     get '/render_js'
     assert last_response.ok?
 
@@ -104,6 +140,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_alternate_layout
+    @execute_test_if_framework_version_is_supported.call
     get '/render_alternate_layout'
     assert last_response.ok?
 
@@ -114,6 +151,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial
+    @execute_test_if_framework_version_is_supported.call
     get '/render_partial'
     assert last_response.ok?
 
@@ -124,6 +162,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial_that_errors
+    @execute_test_if_framework_version_is_supported.call
     get '/render_partial_that_errors'
     refute last_response.ok?
 
@@ -139,6 +178,7 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_collection
+    @execute_test_if_framework_version_is_supported.call
     get '/render_collection'
     assert last_response.ok?
 

data/test/instrumentation/sidekiq-client_test.rb

@@ -6,6 +6,19 @@ 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
@@ -19,6 +32,7 @@ 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
@@ -39,6 +53,7 @@ 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

data/test/instrumentation/sidekiq-worker_test.rb

@@ -6,6 +6,19 @@ 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
@@ -17,7 +30,30 @@ class SidekiqServerTest < Minitest::Test
     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
@@ -48,6 +84,7 @@ 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
@@ -79,6 +116,7 @@ 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
@@ -112,6 +150,7 @@ 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

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})
+  Rack::Handler::Puma.run(app, Host: '127.0.0.1', Port: 6511)
 end
 
 sleep(2)

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

@@ -12,12 +12,19 @@ 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
+
 sidekiq_thread = Thread.new do
   launcher = ::Sidekiq::Launcher.new(
-    ::Sidekiq.options.merge(
-      queues: ['important'],
-      concurrency: 2
-    )
+    config_or_options
   )
   launcher.run
   Thread.current[:worker] = launcher

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.209.7
+  version: 1.210.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,7 @@ files:
 - gemfiles/excon_02.gemfile
 - gemfiles/excon_021.gemfile
 - gemfiles/excon_079.gemfile
+- gemfiles/excon_100.gemfile
 - gemfiles/graphql_10.gemfile
 - gemfiles/graphql_20.gemfile
 - gemfiles/grpc_10.gemfile
@@ -173,6 +174,8 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
+- gemfiles/rails_70.gemfile
 - gemfiles/redis_40.gemfile
 - gemfiles/resque_122.gemfile
 - gemfiles/resque_20.gemfile
@@ -183,6 +186,8 @@ files:
 - gemfiles/shoryuken_50.gemfile
 - gemfiles/sidekiq_42.gemfile
 - gemfiles/sidekiq_50.gemfile
+- gemfiles/sidekiq_60.gemfile
+- gemfiles/sidekiq_70.gemfile
 - gemfiles/sinatra_14.gemfile
 - instana.gemspec
 - lib/instana.rb