appsignal 2.10.5 → 2.10.9.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c9d7f0b5b452a0bb42cd53fdc6f447964547741b392754a7084bea42661a59
-  data.tar.gz: 80397f1d4de60177e02fb171a3cc8db21b902a6e9f47e5fc2c5e8ec33bb24db5
+  metadata.gz: feb0fea54454760dda53b315801abe633ff93020494901b2d1259dff9d2785cd
+  data.tar.gz: 1f2547a66a52cfb860e7edee2bf687ccea4e01bd84f110fade1ca2e54a856a8e
 SHA512:
-  metadata.gz: bb3e7c9da02b713fd17f8eea16a381da4442792a2ccda7b9b72ea59b5b70e938ed771a6f2506c79173bea63ad101ae3f3f6cd4217d7cb71c19801e06df4cf673
-  data.tar.gz: e14a05c638b9d3ed4a9adbe6d4bb0715bd4f1e2123c0872bbc782826e3234c69c8a6643da1ec82642530a31139994d6ae99624694ae49bc66375004bebe00f60
+  metadata.gz: 6ea79ec6f7bff12717cb54c9a7541c3b9dea45ab51dc369c62db9e67b878243f7b20ccc74e177910e6dd6d2e2c4d7ae09dcab3a71ac1298e4c3b6cfe92d5a5af
+  data.tar.gz: 682e932a33c5b9945297519b6a9404670a1196a796303f4cdc7e7a48fd908bae580302a22aa926f491133d75317c4bc4cd7acb250004907789fa3a2bfd6f8f20

data/.semaphore/semaphore.yml

@@ -36,6 +36,7 @@ global_job_config:
     - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET,$_BUNDLER_CACHE-bundler-$RUBY_VERSION
     - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_GEMS_CACHE-gems-$RUBY_VERSION
     - "./support/install_deps"
+    - bundle config set clean 'true'
     - "./support/bundler_wrapper install --jobs=3 --retry=3"
   epilogue:
     on_pass:
@@ -43,6 +44,11 @@ global_job_config:
       - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
         .bundle
       - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
+    on_fail:
+      commands:
+      - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report
+        file found'"
+      - "[ -f ext/mkmf.log ] && cat ext/mkmf.log || echo 'No ext/mkmf.log file found'"
 blocks:
 - name: Validation
   dependencies: []

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+# 2.10.9
+- Use http proxy if configured when downloading agent
+- Clear event details cache every 48 hours
+
+## 2.10.8
+- Fix failed checksum error log. PR #609
+- Fix DelayedJob action name detection for objects that listen to the `[]`
+  method and return a non-String value. #611
+- CI test build improvements. PR #607, #608, #614
+
+## 2.10.7
+- Revert fix for compatibility with the `http_logger` gem. PR #604.
+  For more information, see issue #603 about our reasoning and discussion.
+
+## 2.10.6
+- Check if queued payloads are for correct app and not expired
+
 ## 2.10.5
 - Improve Ruby 1.9 compatibility. PR #591
 - Add grape.skip_appsignal_error request env. PR #588

data/build_matrix.yml

@@ -37,12 +37,17 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET,$_BUNDLER_CACHE-bundler-$RUBY_VERSION
         - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_GEMS_CACHE-gems-$RUBY_VERSION
         - ./support/install_deps
+        - bundle config set clean 'true'
         - ./support/bundler_wrapper install --jobs=3 --retry=3
     epilogue:
       on_pass:
         commands:
           - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
           - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
+      on_fail:
+        commands:
+          - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report file found'"
+          - "[ -f ext/mkmf.log ] && cat ext/mkmf.log || echo 'No ext/mkmf.log file found'"
 
   blocks:
     - name: Validation

data/ext/agent.yml

@@ -1,70 +1,70 @@
 ---
-version: c348132
+version: 6ced5a6
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: dcc623a7eea18727c8628cf29d30e61379e543328a53d91bcf0c5751f3f9f313
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: 63f2ba8289390df75b72f414ed026acca07f26ac52bd25cd679c6de776b53ca4
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: dcc623a7eea18727c8628cf29d30e61379e543328a53d91bcf0c5751f3f9f313
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: 63f2ba8289390df75b72f414ed026acca07f26ac52bd25cd679c6de776b53ca4
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: 8941c1d0a546da8f63bc65953afc439987616c62f2d5307856728ae4f2e0b2f5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: ccb59ee85f8ba8790482db9de29be6936e92c395bb6306f0fecefbc4de50f78d
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: 8941c1d0a546da8f63bc65953afc439987616c62f2d5307856728ae4f2e0b2f5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: ccb59ee85f8ba8790482db9de29be6936e92c395bb6306f0fecefbc4de50f78d
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 9cfe62cfd0559b900c37b256a2ffc95021007cf3f365152b62af74b55da465a9
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 9cfe62cfd0559b900c37b256a2ffc95021007cf3f365152b62af74b55da465a9
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
+      checksum: fe74119337cfb8353c64707e4689dc398df1adf2d4bb1bf7750e9a71cca39b3a
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
+      checksum: 6816b709ca388421906b178ae592f565ebc433b59cc50223de8c914e44c75d7a
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
+      checksum: 5382a1b0933a2b4d8fae74f89c1af7a21176a1bc100bb245078a1b369b91caca
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
+      checksum: e222dd4b09d5042e5315512353f987b1be0302c457285de0bfaeb911d72a8e3e
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: b98fcf6490cb5d1485e96656992ee083f534ec43d67caf015f72b8f4cc6e8fa6
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 28e8cab256c3550e249e0768dc9cb0f352396e972186e1ccf9f2c02461a87345
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: b98fcf6490cb5d1485e96656992ee083f534ec43d67caf015f72b8f4cc6e8fa6
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 28e8cab256c3550e249e0768dc9cb0f352396e972186e1ccf9f2c02461a87345
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -32,7 +32,8 @@ def report
           "version" => "#{rbconfig["ruby_version"]}-p#{rbconfig["PATCHLEVEL"]}"
         },
         "download" => {
-          "checksum" => "unverified"
+          "checksum" => "unverified",
+          "http_proxy" => http_proxy
         },
         "build" => {
           "time" => Time.now.utc,
@@ -126,7 +127,11 @@ def download_archive(type)
     report["download"]["download_url"] = download_url
 
     begin
-      return open(download_url, :ssl_ca_cert => CA_CERT_PATH)
+      return open(
+        download_url,
+        :ssl_ca_cert => CA_CERT_PATH,
+        :proxy => http_proxy
+      )
     rescue
       next
     end
@@ -142,14 +147,16 @@ def download_archive(type)
 end
 
 def verify_archive(archive, type)
-  if Digest::SHA256.hexdigest(archive.read) == ARCH_CONFIG[type]["checksum"]
+  expected_checksum = ARCH_CONFIG[type]["checksum"]
+  actual_checksum = Digest::SHA256.hexdigest(archive.read)
+  if actual_checksum == expected_checksum
     report["download"]["checksum"] = "verified"
     true
   else
     report["download"]["checksum"] = "invalid"
     abort_installation(
       "Checksum of downloaded archive could not be verified: " \
-        "Expected '#{ARCH_CONFIG[type]["checksum"]}', got '#{checksum}'."
+        "Expected '#{expected_checksum}', got '#{actual_checksum}'."
     )
   end
 end
@@ -172,3 +179,7 @@ def store_download_version_on_report
   path = File.expand_path(File.join(File.dirname(__FILE__), "appsignal.version"))
   report["build"]["agent_version"] = File.read(path).strip
 end
+
+def http_proxy
+  Gem.configuration[:http_proxy] || ENV["http_proxy"] || ENV["HTTP_PROXY"]
+end

data/lib/appsignal.rb

@@ -6,6 +6,7 @@ require "securerandom"
 require "appsignal/logger"
 require "appsignal/helpers/instrumentation"
 require "appsignal/helpers/metrics"
+require "appsignal/utils/deprecation_message"
 
 # AppSignal for Ruby gem's main module.
 #
@@ -15,9 +16,9 @@ require "appsignal/helpers/metrics"
 # {Appsignal::Helpers::Metrics}) for ease of use.
 module Appsignal
   class << self
-    extend Gem::Deprecate
     include Helpers::Instrumentation
     include Helpers::Metrics
+    include Utils::DeprecationMessage
 
     # Accessor for the AppSignal configuration.
     # Return the current AppSignal configuration.
@@ -280,16 +281,18 @@ module Appsignal
 
     # @deprecated No replacement
     def is_ignored_error?(error) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_error? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_errors].include?(error.class.name)
     end
     alias :is_ignored_exception? :is_ignored_error?
-    deprecate :is_ignored_error?, :none, 2017, 3
 
     # @deprecated No replacement
     def is_ignored_action?(action) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_action? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_actions].include?(action)
     end
-    deprecate :is_ignored_action?, :none, 2017, 3
 
     private
 

data/lib/appsignal/cli/notify_of_deploy.rb

@@ -94,7 +94,7 @@ module Appsignal
             "see our documentation for more information on the recommended " \
             "method: " \
             "https://docs.appsignal.com/application/markers/deploy-markers.html"
-          deprecation_message message, Appsignal.logger
+          deprecation_message message
         end
 
         private

data/lib/appsignal/event_formatter.rb

@@ -91,8 +91,7 @@ module Appsignal
           "Formatter for '#{name}' is using a deprecated registration " \
           "method. This event formatter will not be loaded. " \
           "Please update the formatter according to the documentation at: " \
-          "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html",
-          logger
+          "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html"
 
         EventFormatter.deprecated_formatter_classes[name] = self
       end

data/lib/appsignal/hooks/net_http.rb

@@ -13,20 +13,15 @@ module Appsignal
       end
 
       def install
-        if Appsignal::System.ruby_2_or_up?
-          require "appsignal/integrations/net_http"
-          Net::HTTP.send(:prepend, Appsignal::Integrations::NetHttpIntegration)
-        else
-          Net::HTTP.class_eval do
-            alias request_without_appsignal request
+        Net::HTTP.class_eval do
+          alias request_without_appsignal request
 
-            def request(request, body = nil, &block)
-              Appsignal.instrument(
-                "request.net_http",
-                "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-              ) do
-                request_without_appsignal(request, body, &block)
-              end
+          def request(request, body = nil, &block)
+            Appsignal.instrument(
+              "request.net_http",
+              "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
+            ) do
+              request_without_appsignal(request, body, &block)
             end
           end
         end

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -27,9 +27,8 @@ module Appsignal
           method_name = "perform"
         else
           # Delayed Job
-          args = extract_value(job.payload_object, :args, {})
-          class_and_method_name = extract_value(job.payload_object, :appsignal_name, job.name)
-          class_name, method_name = class_and_method_name.split("#")
+          args = extract_value(payload, :args, {})
+          class_name, method_name = class_and_method_name_from_object_or_hash(payload, job.name)
         end
 
         params = Appsignal::Utils::HashSanitizer.sanitize(
@@ -54,6 +53,20 @@ module Appsignal
         end
       end
 
+      def self.class_and_method_name_from_object_or_hash(payload, default_name)
+        # Attempt to find appsignal_name override
+        class_and_method_name = extract_value(payload, :appsignal_name, nil)
+        return class_and_method_name.split("#") if class_and_method_name.is_a?(String)
+
+        pound_split = default_name.split("#")
+        return pound_split if pound_split.length == 2
+
+        dot_split = default_name.split(".")
+        return default_name if dot_split.length == 2
+
+        ["unknown"]
+      end
+
       def self.extract_value(object_or_hash, field, default_value = nil, convert_to_s = false)
         value = nil
 

data/lib/appsignal/minutely.rb

@@ -33,8 +33,7 @@ module Appsignal
       # @return [void]
       def <<(probe)
         deprecation_message "Deprecated `Appsignal::Minute.probes <<` " \
-          "call. Please use `Appsignal::Minutely.probes.register` instead.",
-          logger
+          "call. Please use `Appsignal::Minutely.probes.register` instead."
         register probe.object_id, probe
       end
 

data/lib/appsignal/rack/js_exception_catcher.rb

@@ -28,10 +28,9 @@ module Appsignal
       def initialize(app, _options = nil)
         Appsignal.logger.debug \
           "Initializing Appsignal::Rack::JSExceptionCatcher"
-        message = "The Appsignal::Rack::JSExceptionCatcher is deprecated. " \
-          "Please use the official AppSignal JavaScript integration instead. " \
-          "https://docs.appsignal.com/front-end/"
-        deprecation_message message, Appsignal.logger
+        deprecation_message "The Appsignal::Rack::JSExceptionCatcher is " \
+          "deprecated. Please use the official AppSignal JavaScript " \
+          "integration instead. https://docs.appsignal.com/front-end/"
         @app = app
       end
 

data/lib/appsignal/system.rb

@@ -76,14 +76,8 @@ module Appsignal
       ldd_version && ldd_version[0]
     end
 
-    # @api private
     def self.jruby?
       RUBY_PLATFORM == "java"
     end
-
-    # @api private
-    def self.ruby_2_or_up?
-      versionify(RUBY_VERSION) >= versionify("2.0")
-    end
   end
 end

data/lib/appsignal/utils/deprecation_message.rb

@@ -1,8 +1,8 @@
 module Appsignal
   module Utils
     module DeprecationMessage
-      def deprecation_message(message, logger)
-        $stdout.puts "appsignal WARNING: #{message}"
+      def deprecation_message(message, logger = Appsignal.logger)
+        $stderr.puts "appsignal WARNING: #{message}"
         logger.warn message
       end
     end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.10.5".freeze
+  VERSION = "2.10.9.beta.1".freeze
 end

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -263,7 +263,8 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           },
           "download" => {
             "download_url" => kind_of(String),
-            "checksum" => "verified"
+            "checksum" => "verified",
+            "http_proxy" => nil
           },
           "build" => {
             "time" => kind_of(String),

data/spec/lib/appsignal/cli/notify_of_deploy_spec.rb

@@ -5,6 +5,8 @@ describe Appsignal::CLI::NotifyOfDeploy do
 
   let(:out_stream) { std_stream }
   let(:output) { out_stream.read }
+  let(:err_stream) { std_stream }
+  let(:stderr) { err_stream.read }
 
   define :include_deploy_notification do
     match do |log|
@@ -32,7 +34,7 @@ describe Appsignal::CLI::NotifyOfDeploy do
   end
 
   def run
-    capture_stdout(out_stream) do
+    capture_std_streams(out_stream, err_stream) do
       run_cli("notify_of_deploy", options)
     end
   end
@@ -130,7 +132,7 @@ describe Appsignal::CLI::NotifyOfDeploy do
         it "prints a deprecation message" do
           run
           deprecation_message = "This command (appsignal notify_of_deploy) has been deprecated"
-          expect(output).to include("appsignal WARNING: #{deprecation_message}")
+          expect(stderr).to include("appsignal WARNING: #{deprecation_message}")
           expect(log).to contains_log :warn, deprecation_message
         end
 

data/spec/lib/appsignal/config_spec.rb

@@ -323,11 +323,11 @@ describe Appsignal::Config do
     end
 
     describe "support for old config keys" do
-      let(:out_stream) { std_stream }
-      let(:output) { out_stream.read }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:config) { project_fixture_config(env, {}, test_logger(log)) }
       let(:log) { StringIO.new }
-      before { capture_stdout(out_stream) { config } }
+      before { capture_std_streams(std_stream, err_stream) { config } }
 
       describe ":api_key" do
         context "without :push_api_key" do
@@ -338,7 +338,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :api_key
 
             message = "Old configuration key found. Please update the 'api_key' to 'push_api_key'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -351,7 +351,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :api_key
 
             message = "Old configuration key found. Please update the 'api_key' to 'push_api_key'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -366,7 +366,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :ignore_exceptions
 
             message = "Old configuration key found. Please update the 'ignore_exceptions' to 'ignore_errors'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -379,7 +379,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :ignore_exceptions
 
             message = "Old configuration key found. Please update the 'ignore_exceptions' to 'ignore_errors'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -116,7 +116,8 @@ describe Appsignal::EventFormatter do
     end
 
     context "when registering deprecated formatters" do
-      let(:stdout_stream) { std_stream }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:deprecated_formatter) do
         Class.new(Appsignal::EventFormatter) do
           register "mock.deprecated"
@@ -133,16 +134,16 @@ describe Appsignal::EventFormatter do
           "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html"
 
         logs = capture_logs do
-          capture_stdout(stdout_stream) { deprecated_formatter }
+          capture_std_streams(std_stream, err_stream) { deprecated_formatter }
         end
         expect(logs).to contains_log :warn, message
-        expect(stdout_stream.read).to include "appsignal WARNING: #{message}"
+        expect(stderr).to include "appsignal WARNING: #{message}"
 
         expect(klass.deprecated_formatter_classes.keys).to include("mock.deprecated")
       end
 
       it "initializes deprecated formatters" do
-        capture_stdout(stdout_stream) { deprecated_formatter }
+        capture_std_streams(std_stream, err_stream) { deprecated_formatter }
         klass.initialize_deprecated_formatters
 
         expect(klass.registered?("mock.deprecated")).to be_truthy

data/spec/lib/appsignal/hooks/delayed_job_spec.rb

@@ -36,6 +36,7 @@ describe Appsignal::Hooks::DelayedJobHook do
       let(:time) { Time.parse("01-01-2001 10:01:00UTC") }
       let(:created_at) { time - 3600 }
       let(:run_at) { time - 3600 }
+      let(:payload_object) { double(:args => args) }
       let(:job_data) do
         {
           :id             => 123,
@@ -45,38 +46,40 @@ describe Appsignal::Hooks::DelayedJobHook do
           :queue          => "default",
           :created_at     => created_at,
           :run_at         => run_at,
-          :payload_object => double(:args => args)
+          :payload_object => payload_object
         }
       end
       let(:args) { ["argument"] }
       let(:job) { double(job_data) }
       let(:invoked_block) { proc {} }
 
-      context "with a normal call" do
-        let(:default_params) do
-          {
-            :class    => "TestClass",
-            :method   => "perform",
-            :metadata => {
-              :priority => 1,
-              :attempts => 1,
-              :queue    => "default",
-              :id       => "123"
-            },
-            :params      => args,
-            :queue_start => run_at
-          }
-        end
-        after do
-          Timecop.freeze(time) do
+      def perform
+        Timecop.freeze(time) do
+          keep_transactions do
             plugin.invoke_with_instrumentation(job, invoked_block)
           end
         end
+      end
 
-        it "wraps it in a transaction with the correct params" do
-          expect(Appsignal).to receive(:monitor_transaction).with(
-            "perform_job.delayed_job",
-            default_params.merge(:params => ["argument"])
+      context "with a normal call" do
+        it "wraps it in a transaction" do
+          perform
+          transaction_data = last_transaction.to_h
+          expect(transaction_data).to include(
+            "action" => "TestClass#perform",
+            "namespace" => "background_job",
+            "error" => nil
+          )
+          expect(transaction_data["events"].map { |e| e["name"] })
+            .to eql(["perform_job.delayed_job"])
+          expect(transaction_data["sample_data"]).to include(
+            "metadata" => {
+              "priority" => 1,
+              "attempts" => 1,
+              "queue"    => "default",
+              "id"       => "123"
+            },
+            "params" => ["argument"]
           )
         end
 
@@ -89,14 +92,13 @@ describe Appsignal::Hooks::DelayedJobHook do
           end
 
           it "adds the more complex arguments" do
-            expect(Appsignal).to receive(:monitor_transaction).with(
-              "perform_job.delayed_job",
-              default_params.merge(
-                :params => {
-                  :foo => "Foo",
-                  :bar => "Bar"
-                }
-              )
+            perform
+            transaction_data = last_transaction.to_h
+            expect(transaction_data["sample_data"]).to include(
+              "params" => {
+                "foo" => "Foo",
+                "bar" => "Bar"
+              }
             )
           end
 
@@ -107,14 +109,13 @@ describe Appsignal::Hooks::DelayedJobHook do
             end
 
             it "filters selected arguments" do
-              expect(Appsignal).to receive(:monitor_transaction).with(
-                "perform_job.delayed_job",
-                default_params.merge(
-                  :params => {
-                    :foo => "[FILTERED]",
-                    :bar => "Bar"
-                  }
-                )
+              perform
+              transaction_data = last_transaction.to_h
+              expect(transaction_data["sample_data"]).to include(
+                "params" => {
+                  "foo" => "[FILTERED]",
+                  "bar" => "Bar"
+                }
               )
             end
           end
@@ -124,98 +125,135 @@ describe Appsignal::Hooks::DelayedJobHook do
           let(:run_at) { Time.parse("2017-01-01 10:01:00UTC") }
 
           it "reports queue_start with run_at time" do
+            # TODO: Not available in transaction.to_h yet.
+            # https://github.com/appsignal/appsignal-agent/issues/293
             expect(Appsignal).to receive(:monitor_transaction).with(
               "perform_job.delayed_job",
-              default_params.merge(:queue_start => run_at)
-            )
+              a_hash_including(:queue_start => run_at)
+            ).and_call_original
+            perform
           end
         end
 
-        context "with custom name call" do
+        context "with class method job" do
           let(:job_data) do
-            {
-              :payload_object => double(
-                :appsignal_name => "CustomClass#perform",
-                :args           => args
-              ),
-              :id         => "123",
-              :name       => "TestClass#perform",
-              :priority   => 1,
-              :attempts   => 1,
-              :queue      => "default",
-              :created_at => created_at,
-              :run_at     => run_at
-            }
-          end
-          let(:default_params) do
-            {
-              :class => "CustomClass",
-              :method => "perform",
-              :metadata => {
-                :priority => 1,
-                :attempts => 1,
-                :queue    => "default",
-                :id       => "123"
-              },
-              :queue_start => run_at
-            }
+            { :name => "CustomClassMethod.perform", :payload_object => payload_object }
           end
 
-          it "wraps it in a transaction with the correct params" do
-            expect(Appsignal).to receive(:monitor_transaction).with(
-              "perform_job.delayed_job",
-              default_params.merge(
-                :params => ["argument"]
-              )
-            )
+          it "wraps it in a transaction using the class method job name" do
+            perform
+            expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
           end
+        end
 
-          context "with more complex params" do
-            let(:args) do
-              {
-                :foo => "Foo",
-                :bar => "Bar"
-              }
-            end
+        context "with custom name call" do
+          before { perform }
 
-            it "adds the more complex arguments" do
-              expect(Appsignal).to receive(:monitor_transaction).with(
-                "perform_job.delayed_job",
-                default_params.merge(
-                  :params => {
-                    :foo => "Foo",
-                    :bar => "Bar"
-                  }
-                )
-              )
+          context "with appsignal_name defined" do
+            context "with payload_object being an object" do
+              context "with value" do
+                let(:payload_object) { double(:appsignal_name => "CustomClass#perform") }
+
+                it "wraps it in a transaction using the custom name" do
+                  expect(last_transaction.to_h["action"]).to eql("CustomClass#perform")
+                end
+              end
+
+              context "with non-String value" do
+                let(:payload_object) { double(:appsignal_name => Object.new) }
+
+                it "wraps it in a transaction using the original job name" do
+                  expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
+                end
+              end
+
+              context "with class method name as job" do
+                let(:payload_object) { double(:appsignal_name => "CustomClassMethod.perform") }
+
+                it "wraps it in a transaction using the custom name" do
+                  perform
+                  expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
+                end
+              end
             end
 
-            context "with parameter filtering" do
-              before do
-                Appsignal.config = project_fixture_config("production")
-                Appsignal.config[:filter_parameters] = ["foo"]
+            context "with payload_object being a Hash" do
+              context "with value" do
+                let(:payload_object) { double(:appsignal_name => "CustomClassHash#perform") }
+
+                it "wraps it in a transaction using the custom name" do
+                  expect(last_transaction.to_h["action"]).to eql("CustomClassHash#perform")
+                end
               end
 
-              it "filters selected arguments" do
-                expect(Appsignal).to receive(:monitor_transaction).with(
-                  "perform_job.delayed_job",
-                  default_params.merge(
-                    :params => {
-                      :foo => "[FILTERED]",
-                      :bar => "Bar"
-                    }
-                  )
-                )
+              context "with non-String value" do
+                let(:payload_object) { double(:appsignal_name => Object.new) }
+
+                it "wraps it in a transaction using the original job name" do
+                  expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
+                end
+              end
+
+              context "with class method name as job" do
+                let(:payload_object) { { :appsignal_name => "CustomClassMethod.perform" } }
+
+                it "wraps it in a transaction using the custom name" do
+                  perform
+                  expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
+                end
+              end
+            end
+
+            context "with payload_object being acting like a Hash and returning a non-String value" do
+              class ClassActingAsHash
+                def self.[](_key)
+                  Object.new
+                end
+
+                def self.appsignal_name
+                  "ClassActingAsHash#perform"
+                end
+              end
+              let(:payload_object) { ClassActingAsHash }
+
+              # We check for hash values before object values
+              # this means ClassActingAsHash returns `Object.new` instead
+              # of `self.appsignal_name`. Since this isn't a valid `String`
+              # we return the default job name as action name.
+              it "wraps it in a transaction using the original job name" do
+                expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
               end
             end
           end
         end
 
+        context "without job name" do
+          let(:job_data) do
+            { :name => "", :payload_object => payload_object }
+          end
+
+          it "wraps it in a transaction using the class method job name" do
+            perform
+            expect(last_transaction.to_h["action"]).to eql("unknown")
+          end
+        end
+
+        context "with invalid job name" do
+          let(:job_data) do
+            { :name => "Banana", :payload_object => payload_object }
+          end
+
+          it "wraps it in a transaction using the class method job name" do
+            perform
+            expect(last_transaction.to_h["action"]).to eql("unknown")
+          end
+        end
+
         if active_job_present?
           require "active_job"
 
           context "when wrapped by ActiveJob" do
-            let(:wrapped_job) do
+            let(:payload_object) do
               ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(
                 "arguments"  => args,
                 "job_class"  => "TestClass",
@@ -233,32 +271,30 @@ describe Appsignal::Hooks::DelayedJobHook do
                 :queue          => "default",
                 :created_at     => created_at,
                 :run_at         => run_at,
-                :payload_object => wrapped_job
+                :payload_object => payload_object
               )
             end
-            let(:default_params) do
-              {
-                :class    => "TestClass",
-                :method   => "perform",
-                :metadata => {
-                  :priority => 1,
-                  :attempts => 1,
-                  :queue    => "default",
-                  :id       => "123"
-                },
-                :queue_start => run_at,
-                :params      => args
-              }
-            end
             let(:args) { ["activejob_argument"] }
 
-            context "with simple params" do
-              it "wraps it in a transaction with the correct params" do
-                expect(Appsignal).to receive(:monitor_transaction).with(
-                  "perform_job.delayed_job",
-                  default_params.merge(:params => ["activejob_argument"])
-                )
-              end
+            it "wraps it in a transaction with the correct params" do
+              perform
+              transaction_data = last_transaction.to_h
+              expect(transaction_data).to include(
+                "action" => "TestClass#perform",
+                "namespace" => "background_job",
+                "error" => nil
+              )
+              expect(transaction_data["events"].map { |e| e["name"] })
+                .to eql(["perform_job.delayed_job"])
+              expect(transaction_data["sample_data"]).to include(
+                "metadata" => {
+                  "priority" => 1,
+                  "attempts" => 1,
+                  "queue"    => "default",
+                  "id"       => "123"
+                },
+                "params" => ["activejob_argument"]
+              )
             end
 
             context "with more complex params" do
@@ -270,14 +306,14 @@ describe Appsignal::Hooks::DelayedJobHook do
               end
 
               it "adds the more complex arguments" do
-                expect(Appsignal).to receive(:monitor_transaction).with(
-                  "perform_job.delayed_job",
-                  default_params.merge(
-                    :params => {
-                      :foo => "Foo",
-                      :bar => "Bar"
-                    }
-                  )
+                perform
+                transaction_data = last_transaction.to_h
+                expect(transaction_data).to include("action" => "TestClass#perform")
+                expect(transaction_data["sample_data"]).to include(
+                  "params" => {
+                    "foo" => "Foo",
+                    "bar" => "Bar"
+                  }
                 )
               end
 
@@ -288,14 +324,14 @@ describe Appsignal::Hooks::DelayedJobHook do
                 end
 
                 it "filters selected arguments" do
-                  expect(Appsignal).to receive(:monitor_transaction).with(
-                    "perform_job.delayed_job",
-                    default_params.merge(
-                      :params => {
-                        :foo => "[FILTERED]",
-                        :bar => "Bar"
-                      }
-                    )
+                  perform
+                  transaction_data = last_transaction.to_h
+                  expect(transaction_data).to include("action" => "TestClass#perform")
+                  expect(transaction_data["sample_data"]).to include(
+                    "params" => {
+                      "foo" => "[FILTERED]",
+                      "bar" => "Bar"
+                    }
                   )
                 end
               end
@@ -307,8 +343,9 @@ describe Appsignal::Hooks::DelayedJobHook do
               it "reports queue_start with run_at time" do
                 expect(Appsignal).to receive(:monitor_transaction).with(
                   "perform_job.delayed_job",
-                  default_params.merge(:queue_start => run_at)
-                )
+                  a_hash_including(:queue_start => run_at)
+                ).and_call_original
+                perform
               end
             end
           end
@@ -316,33 +353,28 @@ describe Appsignal::Hooks::DelayedJobHook do
       end
 
       context "with an erroring call" do
-        let(:error) { ExampleException }
-        let(:transaction) do
-          Appsignal::Transaction.new(
-            SecureRandom.uuid,
-            Appsignal::Transaction::BACKGROUND_JOB,
-            Appsignal::Transaction::GenericRequest.new({})
-          )
-        end
+        let(:error) { ExampleException.new("uh oh") }
         before do
           expect(invoked_block).to receive(:call).and_raise(error)
-
-          allow(Appsignal::Transaction).to receive(:current).and_return(transaction)
-          expect(Appsignal::Transaction).to receive(:create)
-            .with(
-              kind_of(String),
-              Appsignal::Transaction::BACKGROUND_JOB,
-              kind_of(Appsignal::Transaction::GenericRequest)
-            ).and_return(transaction)
         end
 
         it "adds the error to the transaction" do
-          expect(transaction).to receive(:set_error).with(error)
-          expect(transaction).to receive(:complete)
-
           expect do
-            plugin.invoke_with_instrumentation(job, invoked_block)
+            perform
           end.to raise_error(error)
+
+          transaction_data = last_transaction.to_h
+          expect(transaction_data).to include(
+            "action" => "TestClass#perform",
+            "namespace" => "background_job",
+            "error" => {
+              "name" => "ExampleException",
+              "message" => "uh oh",
+              # TODO: backtrace should be an Array of Strings
+              # https://github.com/appsignal/appsignal-agent/issues/294
+              "backtrace" => kind_of(String)
+            }
+          )
         end
       end
     end

data/spec/lib/appsignal/minutely_spec.rb

@@ -285,19 +285,19 @@ describe Appsignal::Minutely do
     end
 
     describe "#<<" do
-      let(:out_stream) { std_stream }
-      let(:output) { out_stream.read }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:log_stream) { std_stream }
       let(:log) { log_contents(log_stream) }
       before { Appsignal.logger = test_logger(log_stream) }
 
       it "adds the probe, but prints a deprecation warning" do
         probe = lambda {}
-        capture_stdout(out_stream) { collection << probe }
+        capture_std_streams(std_stream, err_stream) { collection << probe }
         deprecation_message = "Deprecated " \
           "`Appsignal::Minute.probes <<` call. Please use " \
           "`Appsignal::Minutely.probes.register` instead."
-        expect(output).to include "appsignal WARNING: #{deprecation_message}"
+        expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
         expect(log).to contains_log :warn, deprecation_message
         expect(collection[probe.object_id]).to eql(probe)
       end

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -11,18 +11,22 @@ describe Appsignal::Rack::JSExceptionCatcher do
   before { Appsignal.config = config }
 
   describe "#initialize" do
+    let(:out_stream) { std_stream }
+    let(:err_stream) { std_stream }
+    let(:output) { out_stream.read }
+    let(:stderr) { err_stream.read }
+
     it "logs to the logger" do
-      stdout = std_stream
-      stderr = std_stream
       log = capture_logs do
-        capture_std_streams(stdout, stderr) do
+        capture_std_streams(out_stream, err_stream) do
           Appsignal::Rack::JSExceptionCatcher.new(app, options)
         end
       end
       expect(log).to contains_log(:warn, deprecation_message)
       expect(log).to contains_log(:debug, "Initializing Appsignal::Rack::JSExceptionCatcher")
-      expect(stdout.read).to include "appsignal WARNING: #{deprecation_message}"
-      expect(stderr.read).to_not include("appsignal:")
+      expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
+      expect(stderr).to_not include("appsignal:")
+      expect(output).to be_empty
     end
   end
 

data/spec/lib/appsignal/system_spec.rb

@@ -93,40 +93,4 @@ describe Appsignal::System do
       end
     end
   end
-
-  describe ".ruby_2_or_up?" do
-    around do |example|
-      original_ruby_version = RUBY_VERSION
-      Object.send(:remove_const, "RUBY_VERSION")
-      Object.const_set("RUBY_VERSION", ruby_version)
-      example.run
-      Object.send(:remove_const, "RUBY_VERSION")
-      Object.const_set("RUBY_VERSION", original_ruby_version)
-    end
-    subject { described_class.ruby_2_or_up? }
-
-    context "when on Ruby 1.9" do
-      let(:ruby_version) { "1.9.3-p533" }
-
-      it "returns false" do
-        is_expected.to be(false)
-      end
-    end
-
-    context "when on Ruby 2.0" do
-      let(:ruby_version) { "2.0.0" }
-
-      it "returns true" do
-        is_expected.to be(true)
-      end
-    end
-
-    context "when on Ruby 2.x" do
-      let(:ruby_version) { "2.1.0" }
-
-      it "returns true" do
-        is_expected.to be(true)
-      end
-    end
-  end
 end

data/spec/lib/appsignal_spec.rb

@@ -949,7 +949,7 @@ describe Appsignal do
 
       it "outputs deprecated warning" do
         subject
-        expect(stderr).to include("Appsignal.is_ignored_error? is deprecated with no replacement.")
+        expect(stderr).to include("Appsignal.is_ignored_error? is deprecated with no replacement")
       end
 
       context "when error is not in the ignored list" do
@@ -981,7 +981,7 @@ describe Appsignal do
 
       it "outputs deprecated warning" do
         subject
-        expect(stderr).to include("Appsignal.is_ignored_action? is deprecated with no replacement.")
+        expect(stderr).to include("Appsignal.is_ignored_action? is deprecated with no replacement")
       end
 
       context "when action is not in the ingore list" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.10.9.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -227,7 +227,6 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
-- lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb
@@ -392,9 +391,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/lib/appsignal/integrations/net_http.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  module Integrations
-    module NetHttpIntegration
-      def request(request, body = nil, &block)
-        Appsignal.instrument(
-          "request.net_http",
-          "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-        ) do
-          super
-        end
-      end
-    end
-  end
-end