appsignal 2.11.5-java → 2.11.10-java

data/appsignal.gemspec

@@ -42,9 +42,31 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "yard", ">= 0.9.20"
-  is_modern_ruby = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.0.0")
-  if is_modern_ruby
+
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+  if ruby_version >= Gem::Version.new("2.0.0")
     gem.add_development_dependency "pry"
     gem.add_development_dependency "rubocop", "0.50.0"
   end
+
+  # Dependencies that need to be locked to a specific version in developement
+  if ruby_version < Gem::Version.new("2.0.0")
+    # The rexml gem use keyword arguments with optional arguments which
+    # work in Ruby 2.1 and newer. Lock crack to a version without rexml.
+    gem.add_development_dependency "crack", "0.4.4"
+  elsif ruby_version < Gem::Version.new("2.1.0")
+    # The rexml gem use keyword arguments with optional arguments which
+    # work in Ruby 2.1 and newer.
+    gem.add_development_dependency "rexml", "3.2.4"
+  end
+  if ruby_version < Gem::Version.new("2.0.0")
+    # public_suffix 2.0 and newer don't support Ruby < 2.0
+    gem.add_development_dependency "public_suffix", "~> 1.4.6"
+  elsif ruby_version < Gem::Version.new("2.1.0")
+    # public_suffix 3.0 and newer don't support Ruby < 2.1
+    gem.add_development_dependency "public_suffix", "~> 2.0.5"
+  elsif ruby_version < Gem::Version.new("2.3.0")
+    # public_suffix 4.0 and newer don't support Ruby < 2.3
+    gem.add_development_dependency "public_suffix", "~> 3.1.1"
+  end
 end

data/build_matrix.yml

@@ -33,6 +33,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
       commands:
         - checkout
         - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
+        - "if [ -n \"$_C_VERSION\" ]; then sem-version c $_C_VERSION; fi"
         - sem-version ruby $RUBY_VERSION
         - ./support/check_versions
         - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
@@ -88,6 +89,10 @@ matrix:
   gemsets: # By default all gems are tested
     none:
       - "no_dependencies"
+    old_rails:
+      - "no_dependencies"
+      - "rails-3.2"
+      - "rails-4.2"
     minimal:
       - "no_dependencies"
       - "rails-5.2"
@@ -101,6 +106,7 @@ matrix:
     - ruby: "2.0.0-p648"
       rubygems: "2.7.8"
       bundler: "1.17.3"
+      gems: "old_rails"
     - ruby: "2.1.10"
       rubygems: "2.7.8"
       bundler: "1.17.3"
@@ -117,74 +123,66 @@ matrix:
       gems: "minimal"
     - ruby: "2.6.5"
     - ruby: "2.7.1"
-    - ruby: "3.0.0"
-    - ruby: "jruby-9.1.17.0"
+    - ruby: "3.0.1"
+    - ruby: "jruby-9.2.19.0"
       gems: "minimal"
+      env_vars:
+        - name: "_C_VERSION"
+          value: "8"
   gems:
     - gem: "no_dependencies"
     - gem: "capistrano2"
     - gem: "capistrano3"
     - gem: "grape"
     - gem: "padrino"
-      exclude:
-        ruby:
-          - "2.0.0-p648"
     - gem: "que"
     - gem: "que_beta"
-      exclude:
-        ruby:
-          - "2.0.0-p648"
     - gem: "rails-3.2"
       bundler: "1.17.3"
       exclude:
         ruby:
           - "2.6.5"
           - "2.7.1"
-          - "3.0.0"
+          - "3.0.1"
     - gem: "rails-4.2"
       bundler: "1.17.3"
       exclude:
         ruby:
           - "2.6.5"
           - "2.7.1"
-          - "3.0.0"
+          - "3.0.1"
     - gem: "rails-5.0"
       exclude:
         ruby:
           - "2.0.0-p648"
-          - "3.0.0"
+          - "3.0.1"
     - gem: "rails-5.1"
       exclude:
         ruby:
           - "2.0.0-p648"
-          - "3.0.0"
+          - "3.0.1"
     - gem: "rails-5.2"
       exclude:
         ruby:
           - "2.0.0-p648"
-          - "3.0.0"
+          - "3.0.1"
     - gem: "rails-6.0"
       exclude:
         ruby:
-          - "2.0.0-p648"
           - "2.1.10"
           - "2.2.10"
           - "2.3.8"
           - "2.4.9"
-          - "jruby-9.1.17.0"
     - gem: "resque-1"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "3.0.0"
+          - "3.0.1"
     - gem: "resque-2"
-      exclude:
-        ruby:
-          - "2.0.0-p648"
     - gem: "sequel"
     - gem: "sequel-435"
       exclude:
         ruby:
-          - "3.0.0"
+          - "3.0.1"
     - gem: "sinatra"
     - gem: "webmachine"

data/gemfiles/capistrano2.gemfile

@@ -2,6 +2,5 @@ source 'https://rubygems.org'
 
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -3,6 +3,5 @@ source 'https://rubygems.org'
 gem 'capistrano', '~> 3.0'
 gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'grape', '0.14.0'
-gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'rack', '~> 1.6'
+ruby_version = Gem::Version.new(RUBY_VERSION)
+if ruby_version < Gem::Version.new("2.3.0")
+  gem 'rack', '~> 1.6'
+end
 
 ruby_version = Gem::Version.new(RUBY_VERSION)
 if ruby_version < Gem::Version.new("2.0.0")

data/gemfiles/rails-3.2.gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 gem 'rails', '~> 3.2.14'
 gem 'test-unit'
 
+gem "rack-cache", "~> 1.9.0"
+
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -13,5 +13,11 @@ end
 if ruby_version < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
+if ruby_version < Gem::Version.new("2.5.0")
+  gem 'sprockets', '~> 3.7.2'
+end
+
+gem "minitest", "5.12.0"
+gem "connection_pool", "2.2.3"
 
 gemspec :path => '../'

data/gemfiles/resque-2.gemfile

@@ -4,7 +4,3 @@ gem 'resque', "~> 2.0"
 gem 'sinatra'
 
 gemspec :path => '../'
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
-  gem 'nokogiri', '~> 1.6.0'
-end

data/gemfiles/sequel-435.gemfile

@@ -6,6 +6,5 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sequel.gemfile

@@ -6,6 +6,5 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
-gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/lib/appsignal/extension.rb

@@ -40,6 +40,16 @@ module Appsignal
       def method_missing(m, *args, &block)
         super if Appsignal.testing?
       end
+
+      unless Appsignal.extension_loaded?
+        def data_map_new
+          Appsignal::Extension::MockData.new
+        end
+
+        def data_array_new
+          Appsignal::Extension::MockData.new
+        end
+      end
     end
 
     if Appsignal::System.jruby?
@@ -62,5 +72,45 @@ module Appsignal
         "#<#{self.class.name}:#{object_id} #{self}>"
       end
     end
+
+    # Mock of the {Data} class. This mock is used when the extension cannot be
+    # loaded. This mock listens to all method calls and does nothing, and
+    # prevents NoMethodErrors from being raised.
+    #
+    # Disabled in testing so we can make sure that we don't miss an extension
+    # function implementation.
+    #
+    # This class inherits from the {Data} class so that it passes type checks.
+    class MockData < Data
+      def initialize(*_args)
+        # JRuby extension requirement, as it sends a pointer to the Data object
+        # when creating it
+      end
+
+      def method_missing(_method, *_args, &_block)
+        super if Appsignal.testing?
+      end
+
+      def to_s
+        "{}"
+      end
+    end
+
+    # Mock of the {Transaction} class. This mock is used when the extension
+    # cannot be loaded. This mock listens to all method calls and does nothing,
+    # and prevents NoMethodErrors from being raised.
+    #
+    # Disabled in testing so we can make sure that we don't miss an extension
+    # function implementation.
+    class MockTransaction
+      def initialize(*_args)
+        # JRuby extension requirement, as it sends a pointer to the Transaction
+        # object when creating it
+      end
+
+      def method_missing(_method, *_args, &_block)
+        super if Appsignal.testing?
+      end
+    end
   end
 end

data/lib/appsignal/hooks/action_cable.rb

@@ -56,7 +56,11 @@ module Appsignal
       def install_callbacks
         ActionCable::Channel::Base.set_callback :subscribe, :around, :prepend => true do |channel, inner|
           # The request is only the original websocket request
-          env = channel.connection.env
+          connection = channel.connection
+          # #env is not available on the Rails ConnectionStub class used in the
+          # Rails app test suite. If we call `#env` it causes an error to occur
+          # in apps' test suites.
+          env = connection.respond_to?(:env) ? connection.env : {}
           request = ActionDispatch::Request.new(env)
           env[Appsignal::Hooks::ActionCableHook::REQUEST_ID] ||=
             request.request_id || SecureRandom.uuid
@@ -84,7 +88,11 @@ module Appsignal
 
         ActionCable::Channel::Base.set_callback :unsubscribe, :around, :prepend => true do |channel, inner|
           # The request is only the original websocket request
-          env = channel.connection.env
+          connection = channel.connection
+          # #env is not available on the Rails ConnectionStub class used in the
+          # Rails app test suite. If we call `#env` it causes an error to occur
+          # in apps' test suites.
+          env = connection.respond_to?(:env) ? connection.env : {}
           request = ActionDispatch::Request.new(env)
           env[Appsignal::Hooks::ActionCableHook::REQUEST_ID] ||=
             request.request_id || SecureRandom.uuid

data/lib/appsignal/hooks/sidekiq.rb

@@ -16,7 +16,11 @@ module Appsignal
 
         ::Sidekiq.configure_server do |config|
           config.server_middleware do |chain|
-            chain.add Appsignal::Hooks::SidekiqPlugin
+            if chain.respond_to? :prepend
+              chain.prepend Appsignal::Hooks::SidekiqPlugin
+            else
+              chain.add Appsignal::Hooks::SidekiqPlugin
+            end
           end
         end
       end

data/lib/appsignal/integrations/object_ruby_modern.rb

@@ -1,56 +1,33 @@
 # frozen_string_literal: true
 
 class Object
-  if Appsignal::System.ruby_2_7_or_newer?
-    def self.appsignal_instrument_class_method(method_name, options = {})
-      singleton_class.send \
-        :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-      singleton_class.send(:define_method, method_name) do |*args, **kwargs, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, **kwargs, &block
-        end
+  def self.appsignal_instrument_class_method(method_name, options = {})
+    singleton_class.send \
+      :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
+    singleton_class.send(:define_method, method_name) do |*args, &block|
+      name = options.fetch(:name) do
+        "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
       end
-    end
-
-    def self.appsignal_instrument_method(method_name, options = {})
-      alias_method "appsignal_uninstrumented_#{method_name}", method_name
-      define_method method_name do |*args, **kwargs, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, **kwargs, &block
-        end
+      Appsignal.instrument name do
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
-  else
-    def self.appsignal_instrument_class_method(method_name, options = {})
-      singleton_class.send \
-        :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-      singleton_class.send(:define_method, method_name) do |*args, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, &block
-        end
-      end
+    if singleton_class.respond_to?(:ruby2_keywords, true)
+      singleton_class.send(:ruby2_keywords, method_name)
     end
+  end
 
-    def self.appsignal_instrument_method(method_name, options = {})
-      alias_method "appsignal_uninstrumented_#{method_name}", method_name
-      define_method method_name do |*args, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, &block
-        end
+  def self.appsignal_instrument_method(method_name, options = {})
+    alias_method "appsignal_uninstrumented_#{method_name}", method_name
+    define_method method_name do |*args, &block|
+      name = options.fetch(:name) do
+        "#{method_name}.#{appsignal_reverse_class_name}.other"
+      end
+      Appsignal.instrument name do
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
+    ruby2_keywords method_name if respond_to?(:ruby2_keywords, true)
   end
 
   def self.appsignal_reverse_class_name

data/lib/appsignal/minutely.rb

@@ -135,6 +135,12 @@ module Appsignal
       def start
         stop
         @thread = Thread.new do
+          # Advise multi-threaded app servers to ignore this thread
+          # for the purposes of fork safety warnings
+          if Thread.current.respond_to?(:thread_variable_set)
+            Thread.current.thread_variable_set(:fork_safe, true)
+          end
+
           sleep initial_wait_time
           initialize_probes
           loop do

data/lib/appsignal/transaction.rb

@@ -90,7 +90,7 @@ module Appsignal
         @transaction_id,
         @namespace,
         self.class.garbage_collection_profiler.total_time
-      )
+      ) || Appsignal::Extension::MockTransaction.new
     end
 
     def nil_transaction?

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.11.5".freeze
+  VERSION = "2.11.10".freeze
 end