appsignal 2.8.4.beta.1 → 2.9.18.beta.1

data/ext/Rakefile

@@ -1,28 +1,34 @@
-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(library_type)
       next unless archive
-      next unless verify_archive(archive, arch_config, "dynamic")
+      next unless verify_archive(archive, 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,70 @@
 ---
-version: 4c4acdf
+version: c348132
+mirrors:
+- https://appsignal-agent-releases.global.ssl.fastly.net
+- https://d135dj0rjqvssy.cloudfront.net
 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: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      filename: 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: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      filename: 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: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      filename: 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: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      filename: 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: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      filename: 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: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      filename: 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: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      filename: 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: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      filename: 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: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      filename: 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: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      filename: 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: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
+      filename: 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: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
+      filename: 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: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
+      filename: 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: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
+      filename: 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: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      filename: 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: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      filename: 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: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      filename: 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: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -1,77 +1,156 @@
 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
 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)
   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(EXT_PATH),
+          "architecture" => rbconfig["host_cpu"],
+          "target" => AGENT_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)
-  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)
-  else
-    installation_failed(
+def download_archive(type)
+  report["build"]["source"] = "remote"
+
+  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. " \
-      "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
+    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"]
-    logger.info "Checksum of downloaded archive verified, extracting archive"
+def verify_archive(archive, type)
+  if Digest::SHA256.hexdigest(archive.read) == ARCH_CONFIG[type]["checksum"]
+    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 +164,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

data/ext/extconf.rb

@@ -1,35 +1,38 @@
-require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 require File.expand_path("../base.rb", __FILE__)
 
-def install # rubocop:disable Metrics/CyclomaticComplexity
-  logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
-  write_agent_architecture
+def local_build?
+  File.exist?(ext_path("appsignal-agent")) &&
+    File.exist?(ext_path("libappsignal.a")) &&
+    File.exist?(ext_path("appsignal.h"))
+end
+
+def install
+  library_type = "static"
+  report["language"]["implementation"] = "ruby"
+  report["build"]["library_type"] = library_type
   return unless check_architecture
-  arch_config = AGENT_CONFIG["triples"][ARCH]
 
-  unless File.exist?(ext_path("appsignal-agent")) &&
-      File.exist?(ext_path("libappsignal.a")) &&
-      File.exist?(ext_path("appsignal.h"))
-    archive = download_archive(arch_config, "static")
+  if local_build?
+    report["build"]["source"] = "local"
+  else
+    archive = download_archive(library_type)
     return unless archive
-    return unless verify_archive(archive, arch_config, "static")
+    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)
 
-  logger.info "Creating makefile"
   require "mkmf"
-
   link_libraries if is_linux_system
 
   if !have_library("appsignal", "appsignal_start", "appsignal.h")
-    installation_failed "Aborting installation, libappsignal.a or appsignal.h not found"
+    abort_installation("Library libappsignal.a or appsignal.h not found")
   elsif !find_executable("appsignal-agent", EXT_PATH)
-    installation_failed "Aborting installation, appsignal-agent not found"
+    abort_installation("File appsignal-agent not found")
   else
     if is_linux_system
       # Statically link libgcc and libgcc_s libraries.
@@ -38,15 +41,16 @@ def install # rubocop:disable Metrics/CyclomaticComplexity
       # run on one that isn't the missing libraries will cause the extension
       # to fail on start.
       $LDFLAGS += " -static-libgcc" # rubocop:disable Style/GlobalVars
+      report["build"]["flags"]["LDFLAGS"] = $LDFLAGS # rubocop:disable Style/GlobalVars
     end
     create_makefile "appsignal_extension"
-    logger.info "Successfully created Makefile for appsignal extension"
-  end
-rescue => ex
-  installation_failed "Exception while installing: #{ex}"
-  ex.backtrace.each do |line|
-    logger.error line
+    successful_installation
   end
+rescue => error
+  fail_installation_with_error(error)
+ensure
+  create_dummy_makefile unless installation_succeeded?
+  write_report
 end
 
 # Ruby 2.6 requires us to statically link more libraries we use in our
@@ -54,26 +58,28 @@ end
 # and musl builds.
 def link_libraries
   if RbConfig::CONFIG["THREAD_MODEL"] == "pthread"
-    logger.info "Linking extension against 'pthread' library"
     # Link gem extension against pthread library
     have_library "pthread"
-    have_required_function "pthread_create"
+    have_required_function "pthread", "pthread_create"
   end
 
   # Links gem extension against the `dl` library. This is needed when Ruby is
   # not linked against `dl` itself, so link it on the gem extension.
-  logger.info "Linking extension against 'dl' library"
   have_library "dl"
   # Check if functions are available now from the linked library
   %w[dlopen dlclose dlsym].each do |func|
-    have_required_function func
+    have_required_function "dl", func
   end
 end
 
-def have_required_function(func) # rubocop:disable Naming/PredicateName
-  return if have_func(func)
+def have_required_function(library, func) # rubocop:disable Naming/PredicateName
+  if have_func(func)
+    report["build"]["dependencies"][library] = "linked"
+    return
+  end
 
-  installation_failed "Aborting installation, missing function '#{func}'"
+  report["build"]["dependencies"][library] = "not linked"
+  abort_installation("Missing function '#{func}'")
   # Exit with true/0/success because the AppSignal installation should never
   # break a build
   exit