appsignal 2.8.4-java → 2.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c51056cc45697339edad0c7229bea1d7097fc4e7c339197fcd4a41c65b9ba2
-  data.tar.gz: fb18f33d2c554adeea7181b36e0eb9dc3556a7d165e67b7a3e827586c42ca845
+  metadata.gz: 3b38042a65ea806408c1f1e06d501f5f53d6ed636c6167b7657e1cafb7c98c13
+  data.tar.gz: b136c90cc32e33981e995ee3ff11676a3c1fde5d5d33d375b834daf8ffa0ec6c
 SHA512:
-  metadata.gz: fe31ea0e9ce501ab473a0813d81c1d5191ddbc5fc99265633393a497d8a89aa7cf6e19778fa0ceda621c5eac0fbedc12176caf6f80eb3879638a60419075bfda
-  data.tar.gz: 3e1c72e0b453e4aa2d758efa511aff1735039dd442121f00dba87ef52b04912c031400dc6acd52e35920c55244f05dd41afd118953e4b14958d0381a198888da
+  metadata.gz: 7fe39d3f5fbed1bea903cae48155d191452cb57c0b96b4c7c3fa5fadb328f948f5117bcbd203023fb922afb974e1a32d37148b7b055d282e61376735c7995e40
+  data.tar.gz: 6a35ab1c3ccef917c3825fa6e0c05de381b6b9f735190eb39ffa7d600ba3ae9c294b4be61e1c82841eb636116ecb6cac65cf7e4b23f705337ebf1327a3fc7286

data/.gitignore

@@ -26,10 +26,10 @@ bundle_and_spec_all_rvm
 ext/libappsignal.*
 ext/appsignal-agent
 ext/appsignal.h
-ext/appsignal.architecture
 ext/appsignal.version
 ext/Makefile
 ext/*.bundle
 ext/*.o
 ext/*.so
+ext/*.report
 pkg/

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-01 17:12:10 +0200 using RuboCop version 0.50.0.
+# on 2019-03-12 21:08:54 +0100 using RuboCop version 0.50.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 44
+# Offense count: 50
 Metrics/AbcSize:
   Max: 56
 
@@ -28,13 +28,13 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 523
+# Offense count: 532
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 152
 
-# Offense count: 94
+# Offense count: 109
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 60
@@ -52,7 +52,7 @@ Metrics/PerceivedComplexity:
 # Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
-    - 'lib/appsignal.rb'
+    - 'lib/appsignal/helpers/instrumentation.rb'
     - 'lib/appsignal/transaction.rb'
 
 # Offense count: 4
@@ -71,6 +71,7 @@ Security/YAMLLoad:
 Style/Alias:
   Exclude:
     - 'lib/appsignal.rb'
+    - 'lib/appsignal/helpers/instrumentation.rb'
     - 'lib/appsignal/hooks/active_support_notifications.rb'
     - 'lib/appsignal/hooks/celluloid.rb'
     - 'lib/appsignal/hooks/net_http.rb'
@@ -88,7 +89,7 @@ Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/appsignal/integrations/padrino.rb'
 
-# Offense count: 4
+# Offense count: 6
 Style/ClassVars:
   Exclude:
     - 'lib/appsignal/event_formatter.rb'
@@ -98,13 +99,3 @@ Style/ClassVars:
 Style/DoubleNegation:
   Exclude:
     - 'lib/appsignal.rb'
-
-# Offense count: 5
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/appsignal.rb'
-    - 'lib/appsignal/event_formatter.rb'
-    - 'lib/appsignal/event_formatter/moped/query_formatter.rb'
-    - 'lib/appsignal/hooks.rb'
-    - 'lib/appsignal/marker.rb'

data/.travis.yml

@@ -24,7 +24,7 @@ before_script:
 - "./support/bundler_wrapper exec rake extension:install"
 script: "./support/bundler_wrapper exec rake test"
 after_failure:
-- find ./ext -name install.log -exec cat {} \;
+- find ./ext -name install.report -exec cat {} \;
 - find ./ext -name mkmf.log -exec cat {} \;
 matrix:
   fast_finish: true
@@ -122,6 +122,9 @@ matrix:
   - rvm: 2.6.0
     gemfile: gemfiles/rails-5.2.gemfile
     env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails-6.0.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
   - rvm: 2.6.0
     gemfile: gemfiles/resque.gemfile
     env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 2.9.0
+- Fix installations using git source. PR #455
+- Track installation results in installation report. PR #450
+- Fix Rails 6 deprecation warnings. PR #460, PR #478, PR #483
+- Improve error handling in minutely probes mechanism. PR #467
+- Only allow one minutely probe thread to run at a time. PR #469
+- Change minutely probes register method to use a key for every probe. PR #473
+- Send Sidekiq metrics by default. PR #471
+- Send MongoDB metrics by default. PR #472
+- Fix Ruby 2.6 deprecation warnings. PR #479
+- Support blocks for `Appsignal.send_error` to add more metadata to the
+  AppSignal transaction. PR #481
+- Move instrumentation & metrics helpers to modules. PR #487
+- Add Puma minutely probe. PR #488
+- Log invalid EventFormatter registrations as errors. PR #491
+
 # 2.8.4
 - Log memory usage of agent if high.
   Commit 46cf3770e13eff9f5fccbf8a4525a8dbfd8eeaad

data/README.md

@@ -172,6 +172,29 @@ bundle exec rake install
 bundle exec rake extension:install
 ```
 
+#### Git source for Bundler
+
+When specifying a git source for the AppSignal gem in Bundler we do not support
+JRuby. This is because our gemspec defaults to the Ruby implementation for
+installing the AppSignal C-extension.
+
+```ruby
+# Gemfile
+gem "appsignal",
+  :git => "https://github.com/appsignal/appsignal-ruby.git",
+  :branch => "master"
+```
+
+When you need to use a git source of the gem in your JRuby install, you'll need
+to run the following to install the C-extension on JRuby. Note that this
+post-install step is not possible on platforms such as Heroku where the app is
+sent through a deploy pipeline and the app is started immediately after.
+
+```bash
+bundle install
+(cd $(bundle show appsignal)/ext && rake)
+```
+
 ### Testing
 
 ```bash

data/Rakefile

@@ -99,23 +99,26 @@ namespace :travis do
 end
 
 namespace :build do
+  def base_gemspec
+    eval(File.read("appsignal.gemspec")) # rubocop:disable Security/Eval
+  end
+
   def modify_base_gemspec
-    eval(File.read("appsignal.gemspec")).tap do |s| # rubocop:disable Security/Eval
+    base_gemspec.tap do |s|
       yield s
     end
   end
 
   namespace :ruby do
-    spec = modify_base_gemspec do |s|
-      s.extensions = %w[ext/extconf.rb]
-    end
-
-    Gem::PackageTask.new(spec) { |_pkg| }
+    # Extension default set in `appsignal.gemspec`
+    Gem::PackageTask.new(base_gemspec) { |_pkg| }
   end
 
   namespace :jruby do
     spec = modify_base_gemspec do |s|
       s.platform = "java"
+      # Override extensions config with JRuby extension installer
+      # Default set in `appsignal.gemspec`
       s.extensions = %w[ext/Rakefile]
       s.add_dependency "ffi"
     end
@@ -300,7 +303,7 @@ namespace :extension do
           appsignal_extension.o \
           appsignal_extension.so \
           appsignal_extension.bundle \
-          install.log \
+          install.report \
           libappsignal.* \
           appsignal.version \
           Makefile \

data/appsignal.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |gem|
   gem.require_paths         = %w[lib ext]
   gem.version               = Appsignal::VERSION
   gem.required_ruby_version = ">= 1.9"
+  # Default extension installer. Overridden by JRuby gemspec as defined in
+  # `Rakefile`.
+  gem.extensions            = %w[ext/extconf.rb]
 
   gem.add_dependency "rack"
 

data/build_matrix.yml

@@ -24,7 +24,7 @@ travis: # Default `.travis.yml` contents
     - "./support/bundler_wrapper exec rake extension:install"
   script: "./support/bundler_wrapper exec rake test"
   after_failure:
-    - "find ./ext -name install.log -exec cat {} \\;"
+    - "find ./ext -name install.report -exec cat {} \\;"
     - "find ./ext -name mkmf.log -exec cat {} \\;"
 
   matrix:
@@ -98,6 +98,10 @@ matrix:
       exclude:
         ruby:
           - "2.0.0"
+    - gem: "rails-6.0"
+      exclude:
+        ruby:
+          - "2.0.0"
     - gem: "resque"
       bundler: "1.17.3"
     - gem: "sequel"

data/ext/Rakefile

@@ -1,28 +1,35 @@
-require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 require File.expand_path("../base.rb", __FILE__)
 
+def local_build?
+  File.exist?(ext_path("appsignal-agent")) &&
+    (
+      File.exist?(ext_path("libappsignal.dylib")) ||
+      File.exist?(ext_path("libappsignal.so"))
+    ) &&
+    File.exist?(ext_path("appsignal.h"))
+end
+
 task :default do
   begin
-    logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
-    write_agent_architecture
+    library_type = "dynamic"
+    report["language"]["implementation"] = "jruby"
+    report["build"]["library_type"] = library_type
     next unless check_architecture
     arch_config = AGENT_CONFIG["triples"][ARCH]
 
-    unless File.exist?(ext_path("appsignal-agent")) &&
-        (
-          File.exist?(ext_path("libappsignal.dylib")) ||
-          File.exist?(ext_path("libappsignal.so"))
-        ) &&
-        File.exist?(ext_path("appsignal.h"))
-      archive = download_archive(arch_config, "dynamic")
+    if local_build?
+      report["build"]["source"] = "local"
+    else
+      archive = download_archive(arch_config, library_type)
       next unless archive
-      next unless verify_archive(archive, arch_config, "dynamic")
+      next unless verify_archive(archive, arch_config, library_type)
       unarchive(archive)
     end
-  rescue => ex
-    installation_failed "Exception while installing: #{ex}"
-    ex.backtrace.each do |line|
-      logger.error line
-    end
+    successful_installation
+  rescue => error
+    fail_installation_with_error(error)
+  ensure
+    create_dummy_makefile unless installation_succeeded?
+    write_report
   end
 end

data/ext/agent.yml

@@ -1,67 +1,67 @@
 ---
-version: 4c4acdf
+version: 4a275d3
 triples:
   x86_64-darwin:
     static:
-      checksum: 33117d6fc3db70a87b6c643762d13f0ed2e961003952beb97fb86a6d528a8af2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: f8676db1685fa6df35d065fc829d5db33aea740f65b4e6e795d2a149154495c5
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a9eca0b19c1863560cf402b5171eb7d8b3aee134d9a11cd52ddb5facd9192242
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: ddb406306eb55a213c40802a6c1bb15327439145a85bf78ff971eda1b8feb6e2
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 33117d6fc3db70a87b6c643762d13f0ed2e961003952beb97fb86a6d528a8af2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: f8676db1685fa6df35d065fc829d5db33aea740f65b4e6e795d2a149154495c5
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a9eca0b19c1863560cf402b5171eb7d8b3aee134d9a11cd52ddb5facd9192242
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: ddb406306eb55a213c40802a6c1bb15327439145a85bf78ff971eda1b8feb6e2
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: a75c82ead6c0e31662d58ee1e2824e09f80c96a483c8fb00c8a622013bb531db
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-all-static.tar.gz
+      checksum: 93bb9907d91e8ce7a5a3fcd6e81cbec7fde965b9e36192032c36d5d058bae60b
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: f18cf71eed0921ee1ae423fb2cf4f980ec16c270ffab9cd9b8201a5c222c7448
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 313e4ff150e1556c3cc44520af8d9f0ef8db1e2147d09ec550060fdf7c795d77
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: a75c82ead6c0e31662d58ee1e2824e09f80c96a483c8fb00c8a622013bb531db
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-all-static.tar.gz
+      checksum: 93bb9907d91e8ce7a5a3fcd6e81cbec7fde965b9e36192032c36d5d058bae60b
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: f18cf71eed0921ee1ae423fb2cf4f980ec16c270ffab9cd9b8201a5c222c7448
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 313e4ff150e1556c3cc44520af8d9f0ef8db1e2147d09ec550060fdf7c795d77
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 2776672dfc380c30cceaa8274addf880d54a39cc803e515b0ba00dbcbd36b044
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: 04bba827f4e74bf3bd6ebe7da07ede82417dc4fdca6fd4484c0af0bbca979e7e
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 2776672dfc380c30cceaa8274addf880d54a39cc803e515b0ba00dbcbd36b044
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: 04bba827f4e74bf3bd6ebe7da07ede82417dc4fdca6fd4484c0af0bbca979e7e
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: d0ced9bf5ccbfa407dbdf7d3528e7976059f08da340728dcd2b76c4ab2012ed2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-linux-all-static.tar.gz
+      checksum: ae9714b731ecbe850959b2662b269af4c34abfa841cff6dbc8163793e408cb42
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 6ae9c20c3c51961a90476034ad54e26353f6f07d96ba4b3c568a5690be02cc0c
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-linux-all-dynamic.tar.gz
+      checksum: d61f9602e1eed0faa3398a885655839430790bca091dd7df6693510bbc9651dd
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: a8420232884339e4857fbdce76ecd7fbba2da893094b5f676e46b931f6767ec2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-linux-musl-all-static.tar.gz
+      checksum: 3445eb0cf4cb5f69852fc9ee1d1691f9cb06ff9cbed1f41d9daa88e04cc755b9
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: d447ae2422cf405d21efc5f3ebf96050e53feb86be7509462942d8ec51734dc9
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
+      checksum: f2e64f51301ff88731ad2ed38897744fc423e56d6baf4e77c0bbf306df005efa
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 457e191e72af77f082c788c5a87eac253342f7238c54a325ea09881106fc8476
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 2820bd938abe4b46e444f30255a51e7580598ab67b645ec531c47a7d6f0000fc
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: f789a7f7c4d3453b2ff23af734bb084dc6bc1372ab23e46453519ea436f4111b
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 320d313309973df935d0c859b0d79f047969b3d7521e2dd37f002187386eb73a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 457e191e72af77f082c788c5a87eac253342f7238c54a325ea09881106fc8476
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 2820bd938abe4b46e444f30255a51e7580598ab67b645ec531c47a7d6f0000fc
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: f789a7f7c4d3453b2ff23af734bb084dc6bc1372ab23e46453519ea436f4111b
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4c4acdf/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 320d313309973df935d0c859b0d79f047969b3d7521e2dd37f002187386eb73a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4a275d3/appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -1,10 +1,10 @@
 require "digest"
-require "logger"
 require "fileutils"
 require "open-uri"
 require "zlib"
 require "yaml"
 require "rubygems/package"
+require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 require File.expand_path("../../lib/appsignal/system.rb", __FILE__)
 
 EXT_PATH     = File.expand_path("..", __FILE__).freeze
@@ -18,60 +18,116 @@ def ext_path(path)
   File.join(EXT_PATH, path)
 end
 
-def logger
-  @logger ||= Logger.new(File.join(EXT_PATH, "install.log"))
+def report
+  @report ||=
+    begin
+      rbconfig = RbConfig::CONFIG
+      {
+        "result" => {
+          "status" => "incomplete"
+        },
+        "language" => {
+          "name" => "ruby",
+          "version" => "#{rbconfig["ruby_version"]}-p#{rbconfig["PATCHLEVEL"]}"
+        },
+        "download" => {
+          "checksum" => "unverified"
+        },
+        "build" => {
+          "time" => Time.now.utc,
+          "package_path" => File.dirname(__dir__),
+          "architecture" => rbconfig["host_cpu"],
+          "target" => PLATFORM,
+          "musl_override" => Appsignal::System.force_musl_build?,
+          "dependencies" => {},
+          "flags" => {}
+        },
+        "host" => {
+          "root_user" => Process.uid.zero?,
+          "dependencies" => {}.tap do |d|
+            ldd_output = Appsignal::System.ldd_version_output
+            ldd_version = Appsignal::System.extract_ldd_version(ldd_output)
+            d["libc"] = ldd_version if ldd_version
+          end
+        }
+      }
+    end
+end
+
+def write_report
+  File.open(File.join(EXT_PATH, "install.report"), "w") do |file|
+    file.write YAML.dump(report)
+  end
 end
 
-def installation_failed(reason)
-  logger.error "Installation failed: #{reason}"
+def create_dummy_makefile
   File.open(File.join(EXT_PATH, "Makefile"), "w") do |file|
     file.write "default:\nclean:\ninstall:"
   end
 end
 
-def write_agent_architecture
-  File.open(File.join(EXT_PATH, "appsignal.architecture"), "w") do |file|
-    file.write ARCH
-  end
+def successful_installation
+  report["result"] = { "status" => "success" }
+end
+
+def abort_installation(reason)
+  report["result"] = {
+    "status" => "failed",
+    "message" => reason
+  }
+  false
+end
+
+def fail_installation_with_error(error)
+  report["result"] = {
+    "status" => "error",
+    "error" => "#{error.class}: #{error}",
+    "backtrace" => error.backtrace
+  }
+  false
+end
+
+def installation_succeeded?
+  report["result"]["status"] == "success"
 end
 
 def check_architecture
   if AGENT_CONFIG["triples"].key?(ARCH)
     true
   else
-    installation_failed(
+    abort_installation(
       "AppSignal currently does not support your system architecture (#{ARCH})." \
-      "Please let us know at support@appsignal.com, we aim to support everything our customers run."
+        "Please let us know at support@appsignal.com, we aim to support everything our customers run."
     )
-    false
   end
 end
 
 def download_archive(arch_config, type)
+  report["build"]["source"] = "remote"
   if arch_config.key?(type)
-    logger.info "Downloading agent release from #{arch_config[type]["download_url"]}"
-    open(arch_config[type]["download_url"], :ssl_ca_cert => CA_CERT_PATH)
+    download_url = arch_config[type]["download_url"]
+    report["download"]["download_url"] = download_url
+    open(download_url, :ssl_ca_cert => CA_CERT_PATH)
   else
-    installation_failed(
+    abort_installation(
       "AppSignal currently does not support your system. " \
-      "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"
+        "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"
     )
-    false
   end
 end
 
 def verify_archive(archive, arch_config, type)
   if Digest::SHA256.hexdigest(archive.read) == arch_config[type]["checksum"]
-    logger.info "Checksum of downloaded archive verified, extracting archive"
+    report["download"]["checksum"] = "verified"
     true
   else
-    installation_failed(
-      "Aborting installation, checksum of downloaded archive could not be verified: " \
-      "Expected '#{arch_config[type]["checksum"]}', got '#{checksum}'."
+    report["download"]["checksum"] = "invalid"
+    abort_installation(
+      "Checksum of downloaded archive could not be verified: " \
+        "Expected '#{arch_config[type]["checksum"]}', got '#{checksum}'."
     )
-    false
   end
 end
 
@@ -85,5 +141,11 @@ def unarchive(archive)
       end
     end
   end
+  store_download_version_on_report
   FileUtils.chmod(0o755, ext_path("appsignal-agent"))
 end
+
+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