appsignal 2.9.2.alpha.1 → 2.9.18.beta.2

data/ext/Rakefile

@@ -15,14 +15,13 @@ task :default do
     report["language"]["implementation"] = "jruby"
     report["build"]["library_type"] = library_type
     next unless check_architecture
-    arch_config = AGENT_CONFIG["triples"][ARCH]
 
     if local_build?
       report["build"]["source"] = "local"
     else
-      archive = download_archive(arch_config, library_type)
+      archive = download_archive(library_type)
       next unless archive
-      next unless verify_archive(archive, arch_config, library_type)
+      next unless verify_archive(archive, library_type)
       unarchive(archive)
     end
     successful_installation

data/ext/agent.yml

@@ -1,67 +1,70 @@
 ---
-version: 4019bf9
+version: c348132
+mirrors:
+- https://appsignal-agent-releases.global.ssl.fastly.net
+- https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: ab5d75d7d1554b53d83b9181fc1b3d05220d5bd86cd6d5a0b91ef4a262e1c571
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 19fb47d063aa02f665868220568095996c6616b61d58f9a86980a7ace60ed7f9
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: ab5d75d7d1554b53d83b9181fc1b3d05220d5bd86cd6d5a0b91ef4a262e1c571
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 19fb47d063aa02f665868220568095996c6616b61d58f9a86980a7ace60ed7f9
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 6ab48834486b380edf22aa85ea858763046e98952ff3afcad8cb61589be802ff
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-static.tar.gz
+      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 6e4c3b0f62ee688938ad35842452ff9ac54f35da07959d90f6aa43269effdbe9
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 6ab48834486b380edf22aa85ea858763046e98952ff3afcad8cb61589be802ff
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-static.tar.gz
+      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 6e4c3b0f62ee688938ad35842452ff9ac54f35da07959d90f6aa43269effdbe9
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      filename: appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: cf6e2d45978d32ad0330bdad035f536df931a9e5e647cc4eadfb5982dfb76818
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: cf6e2d45978d32ad0330bdad035f536df931a9e5e647cc4eadfb5982dfb76818
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: c7f4383ec3a896fe8652d28a96f272763e9a7c81372520bf082eabd0ed34bdbd
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-all-static.tar.gz
+      checksum: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
+      filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: fe0f3a0fcfe48aa29a88fa8fe97c9c3f16210e53ea1fc741845bf2addab5fce5
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-all-dynamic.tar.gz
+      checksum: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
+      filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: d110e32589041d03f2787982591557aa934172392a4ff9d63b5823fc624232c7
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-musl-all-static.tar.gz
+      checksum: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
+      filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 7230a12b448cdec33a72ad4abfb405ade8a02e0c47a7302a40267b87039533d2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
+      checksum: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
+      filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 203c49fabed6a375d691e8d62c2b3f0e82bef806765fa1cd718bd5c04658c629
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 4d5df3da68e7961f5b6a779f63db5d8a458472700ae8cc729932c606dea84b71
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 203c49fabed6a375d691e8d62c2b3f0e82bef806765fa1cd718bd5c04658c629
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 4d5df3da68e7961f5b6a779f63db5d8a458472700ae8cc729932c606dea84b71
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -10,8 +10,9 @@ require File.expand_path("../../lib/appsignal/system.rb", __FILE__)
 EXT_PATH     = File.expand_path("..", __FILE__).freeze
 AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
 
-PLATFORM     = Appsignal::System.agent_platform
-ARCH         = "#{RbConfig::CONFIG["host_cpu"]}-#{PLATFORM}".freeze
+AGENT_PLATFORM = Appsignal::System.agent_platform
+ARCH = "#{RbConfig::CONFIG["host_cpu"]}-#{AGENT_PLATFORM}".freeze
+ARCH_CONFIG = AGENT_CONFIG["triples"][ARCH].freeze
 CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
 
 def ext_path(path)
@@ -35,9 +36,9 @@ def report
         },
         "build" => {
           "time" => Time.now.utc,
-          "package_path" => File.dirname(__dir__),
+          "package_path" => File.dirname(EXT_PATH),
           "architecture" => rbconfig["host_cpu"],
-          "target" => PLATFORM,
+          "target" => AGENT_PLATFORM,
           "musl_override" => Appsignal::System.force_musl_build?,
           "dependencies" => {},
           "flags" => {}
@@ -102,31 +103,53 @@ def check_architecture
   end
 end
 
-def download_archive(arch_config, type)
+def download_archive(type)
   report["build"]["source"] = "remote"
-  if arch_config.key?(type)
-    download_url = arch_config[type]["download_url"]
-    report["download"]["download_url"] = download_url
-    open(download_url, :ssl_ca_cert => CA_CERT_PATH)
-  else
+
+  unless ARCH_CONFIG.key?(type)
     abort_installation(
       "AppSignal currently does not support your system. " \
-        "Expected config for architecture '#{ARCH}' and package type '#{type}', but none found. " \
+        "Expected config for architecture '#{arch}' and package type '#{type}', but none found. " \
         "For a full list of supported systems visit: " \
         "https://docs.appsignal.com/support/operating-systems.html"
     )
+    return
   end
+
+  version = AGENT_CONFIG["version"]
+  filename = ARCH_CONFIG[type]["filename"]
+  attempted_mirror_urls = []
+
+  AGENT_CONFIG["mirrors"].each do |mirror|
+    download_url = [mirror, version, filename].join("/")
+    attempted_mirror_urls << download_url
+    report["download"]["download_url"] = download_url
+
+    begin
+      return open(download_url, :ssl_ca_cert => CA_CERT_PATH)
+    rescue
+      next
+    end
+  end
+
+  attempted_mirror_urls_mapped = attempted_mirror_urls.map { |mirror| "- #{mirror}" }
+  abort_installation(
+    "Could not download archive from any of our mirrors. " \
+      "Attempted to download the archive from the following urls:\n" \
+      "#{attempted_mirror_urls_mapped.join("\n")}\n" \
+      "Please make sure your network allows access to any of these mirrors."
+  )
 end
 
-def verify_archive(archive, arch_config, type)
-  if Digest::SHA256.hexdigest(archive.read) == arch_config[type]["checksum"]
+def verify_archive(archive, type)
+  if Digest::SHA256.hexdigest(archive.read) == ARCH_CONFIG[type]["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 '#{ARCH_CONFIG[type]["checksum"]}', got '#{checksum}'."
     )
   end
 end

data/ext/extconf.rb

@@ -11,21 +11,20 @@ def install
   report["language"]["implementation"] = "ruby"
   report["build"]["library_type"] = library_type
   return unless check_architecture
-  arch_config = AGENT_CONFIG["triples"][ARCH]
 
   if local_build?
     report["build"]["source"] = "local"
   else
-    archive = download_archive(arch_config, library_type)
+    archive = download_archive(library_type)
     return unless archive
-    return unless verify_archive(archive, arch_config, library_type)
+    return unless verify_archive(archive, library_type)
     unarchive(archive)
   end
 
   is_linux_system = [
     Appsignal::System::LINUX_TARGET,
     Appsignal::System::MUSL_TARGET
-  ].include?(PLATFORM)
+  ].include?(AGENT_PLATFORM)
 
   require "mkmf"
   link_libraries if is_linux_system

data/gemfiles/capistrano2.gemfile

@@ -3,5 +3,10 @@ source 'https://rubygems.org'
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -4,5 +4,10 @@ gem 'capistrano', '~> 3.0'
 gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -3,5 +3,10 @@ source 'https://rubygems.org'
 gem 'grape', '0.14.0'
 gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,5 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'rack', '~> 1.6'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/padrino.gemfile

@@ -3,5 +3,10 @@ source 'https://rubygems.org'
 gem 'padrino', '~> 0.13.0'
 gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,5 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'que'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/que_beta.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'que', '1.0.0.beta3'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
+
+gemspec :path => '../'

data/gemfiles/rails-3.2.gemfile

@@ -2,5 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
 gem 'test-unit'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

@@ -2,5 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 gem 'mime-types', '~> 2.6'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/rails-4.1.gemfile

@@ -2,5 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
 gem 'mime-types', '~> 2.6'
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end
 
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -8,3 +8,8 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end

data/gemfiles/rails-6.0.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.0.beta.1'
+gem 'rails', '~> 6.0.0'
 
 gemspec :path => '../'

data/gemfiles/resque.gemfile

@@ -10,3 +10,8 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
+  gem 'public_suffix', "~> 2.0.0"
+else
+  gem 'public_suffix'
+end

data/lib/appsignal.rb

@@ -135,10 +135,7 @@ module Appsignal
             Appsignal::Extension.install_allocation_event_hook
           end
 
-          if config[:enable_gc_instrumentation]
-            GC::Profiler.enable
-            Appsignal::Minutely.register_garbage_collection_probe
-          end
+          GC::Profiler.enable if config[:enable_gc_instrumentation]
 
           Appsignal::Minutely.start if config[:enable_minutely_probes]
         else

data/lib/appsignal/cli/demo.rb

@@ -54,8 +54,11 @@ module Appsignal
             puts "Demonstration sample data sent!"
             puts "It may take about a minute for the data to appear on https://appsignal.com/accounts"
           else
-            puts "Error: Unable to start the AppSignal agent and send data to AppSignal.com"
-            puts "Please use `appsignal diagnose` to debug your configuration."
+            puts "\nError: Unable to start the AppSignal agent and send data to AppSignal.com."
+            puts "Please use the diagnose command (https://docs.appsignal.com/ruby/command-line/diagnose.html) to debug your configuration:"
+            puts
+            puts "    bundle exec appsignal diagnose --environment=production"
+            puts
             exit 1
           end
         end

data/lib/appsignal/cli/diagnose/utils.rb

@@ -6,12 +6,14 @@ module Appsignal
           passwd_struct = Etc.getpwuid(uid)
           return unless passwd_struct
           passwd_struct.name
+        rescue ArgumentError # rubocop:disable Lint/HandleExceptions
         end
 
         def self.group_for_gid(gid)
           passwd_struct = Etc.getgrgid(gid)
           return unless passwd_struct
           passwd_struct.name
+        rescue ArgumentError # rubocop:disable Lint/HandleExceptions
         end
 
         def self.read_file_content(path, bytes_to_read)

data/lib/appsignal/cli/install.rb

@@ -75,18 +75,39 @@ module Appsignal
         def install_for_rails(config)
           puts "Installing for Ruby on Rails"
 
-          require File.expand_path(File.join(Dir.pwd, "config/application.rb"))
+          name_overwritten = configure_rails_app_name(config)
+          configure(config, rails_environments, name_overwritten)
+          done_notice
+        end
 
-          config[:name] = Appsignal::Utils::RailsHelper.detected_rails_app_name
-          name_overwritten = yes_or_no("  Your app's name is: '#{config[:name]}' \n  Do you want to change how this is displayed in AppSignal? (y/n): ")
-          puts
-          if name_overwritten
-            config[:name] = required_input("  Choose app's display name: ")
+        def configure_rails_app_name(config)
+          loaded =
+            begin
+              load Appsignal::Utils::RailsHelper.application_config_path
+              true
+            rescue LoadError, StandardError
+              false
+            end
+
+          name_overwritten = false
+          if loaded
+            config[:name] = Appsignal::Utils::RailsHelper.detected_rails_app_name
+            puts
+            name_overwritten = yes_or_no(
+              "  Your app's name is: '#{config[:name]}' \n  " \
+                "Do you want to change how this is displayed in AppSignal? " \
+                "(y/n): "
+            )
+            if name_overwritten
+              config[:name] = required_input("  Choose app's display name: ")
+              puts
+            end
+          else
+            puts "  Unable to automatically detect your Rails app's name."
+            config[:name] = required_input("  Choose your app's display name for AppSignal.com: ")
             puts
           end
-
-          configure(config, rails_environments, name_overwritten)
-          done_notice
+          name_overwritten
         end
 
         def install_for_sinatra(config)
@@ -227,7 +248,10 @@ module Appsignal
 
         def installed_frameworks
           [].tap do |out|
-            out << :rails if framework_available? "rails"
+            if framework_available?("rails") &&
+                File.exist?(Appsignal::Utils::RailsHelper.application_config_path)
+              out << :rails
+            end
             out << :sinatra if framework_available? "sinatra"
             out << :padrino if framework_available? "padrino"
             out << :grape if framework_available? "grape"