appsignal 2.4.3 → 2.5.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ab143f228d94a363e4689815fd535ce46f1a320847df9ed1cf307a1d98318a
-  data.tar.gz: b0b7e3193dea2004e41550ed803cb1055f4a35f07a891c8d6857a63417917f4b
+  metadata.gz: aa4dc16e9ee1b853c9166e3c550e95820239d22fcf4be2bfbe908fff03681ce3
+  data.tar.gz: 980caa31b345676bb7964fa941f9aa0116195e28d933aac6ade62b2834006834
 SHA512:
-  metadata.gz: a0c4da23abe2cffccc34e8ab9f0d5e9ef12d3512d878718ff3844ca27c37e44c3899361b28a6f038e56d127c734ce7b63b3151d4d91506d16b7909498a55b2ca
-  data.tar.gz: 8fe67e9d23ffa026548c230fea7683cb0ac6f4651109901d0de2d1ec0857d792078ba45d825e8cb0169b8e5c916a8fdec3519fae6568d79c8551aee6639a22d4
+  metadata.gz: 99c6c3197f6d895731d8afb3bda5ed65cb38f1b0a1e9fe8a6b98f457429a0011f7f81bd1eab4ccf89e1bee8cf2448c168a50b8d00fd443c1a47e74f6a168b7f9
+  data.tar.gz: 49cfc74c9a975443b9b111c330e1b9b25600d6ac08c2a7c7037b46739af275f192f6b52e4ac5f713e622e795d5cbb285aff551b07035568e910033031645f019

data/.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
     - "tmp/**/*"
     - "gemfiles/vendor/**/*"
     - "vendor/**/*"
+    - "benchmark.rake"
   DisplayCopNames: true
   UseCache: true
   CacheRootDirectory: ./tmp
@@ -24,22 +25,22 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/AlignHash:
+Layout/AlignHash:
   EnforcedLastArgumentHashStyle: ignore_implicit
 
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
 
 Style/EmptyMethod:
@@ -53,5 +54,13 @@ Style/MethodMissing:
 Style/TrailingUnderscoreVariable:
   Enabled: false
 
+Style/FileName:
+  Exclude:
+    - "ext/Rakefile"
+
+Metrics/BlockLength:
+  Exclude:
+    - "Rakefile"
+
 # Metrics/LineLength:
 #   Max: 80

data/.rubocop_todo.yml

@@ -119,3 +119,6 @@ Style/IfUnlessModifier:
 Style/NonNilCheck:
   Exclude:
     - 'lib/appsignal/transaction.rb'
+
+Security/YAMLLoad:
+  Enabled: false

data/.travis.yml

@@ -42,9 +42,6 @@ matrix:
       gemfile: "gemfiles/no_dependencies.gemfile"
       script: "bundle exec rubocop"
   exclude:
-    # We don't currently support jRuby
-    - rvm: "jruby-19mode"
-
     # Rails 5 doesn't support Ruby < 2.2
     - rvm: "2.0.0"
       gemfile: "gemfiles/rails-5.0.gemfile"
@@ -62,7 +59,9 @@ matrix:
       gemfile: "gemfiles/rails-4.1.gemfile"
 
 env:
-  global: "RAILS_ENV=test"
+  global:
+    - "RAILS_ENV=test"
+    - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
 
 before_install:
   - "gem update --system"

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.5.0 (Alpha)
+* Add jRuby support. PR #376
+
 # 2.4.3
 * Store more details for Redis events. PR #374
 

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler"
+require "fileutils"
 
-GEMFILES = %w(
+GEMFILES = %w[
   capistrano2
   capistrano3
   grape
@@ -18,18 +19,18 @@ GEMFILES = %w(
   grape
   webmachine
   que
-).freeze
+].freeze
 
-RUBY_VERSIONS = %w(
+RUBY_VERSIONS = %w[
   2.0.0-p648
   2.1.8
   2.2.4
   2.3.0
   2.4.0
-).freeze
+].freeze
 
 EXCLUSIONS = {
-  "rails-5.0" => %w(2.0.0 2.1.8)
+  "rails-5.0" => %w[2.0.0 2.1.8]
 }.freeze
 
 VERSION_MANAGERS = {
@@ -48,6 +49,7 @@ task :publish do
 
   def build_and_push_gem
     puts "# Building gem"
+    FileUtils.rm_f("#{NAME}-#{gem_version}.gem")
     puts `gem build #{NAME}.gemspec`
     puts "# Publishing Gem"
     puts `gem push #{NAME}-#{gem_version}.gem`
@@ -93,7 +95,16 @@ task :publish do
   Appsignal.send(:remove_const, :VERSION)
   load File.expand_path(VERSION_FILE)
   system("$EDITOR #{CHANGELOG_FILE}")
+
+  # Build and push for MRI
+  ENV.delete("APPSIGNAL_PUSH_JAVA_GEM")
+  build_and_push_gem
+
+  # Build and push for jRuby
+  ENV["APPSIGNAL_PUSH_JAVA_GEM"] = "true"
   build_and_push_gem
+
+  # Create tag
   create_and_push_tag
 end
 
@@ -167,7 +178,11 @@ end
 namespace :extension do
   desc "Install the AppSignal gem extension"
   task :install => :clean do
-    system "cd ext && ruby extconf.rb && make clean && make"
+    if RUBY_PLATFORM == "java"
+      system "cd ext && rake"
+    else
+      system "cd ext && ruby extconf.rb && make clean && make"
+    end
   end
 
   desc "Clean the AppSignal gem extension directory of installation artifacts"

data/appsignal.gemspec

@@ -1,7 +1,8 @@
 # -*- encoding: utf-8 -*-
+
 require File.expand_path("../lib/appsignal/version", __FILE__)
 
-Gem::Specification.new do |gem|
+Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.authors = [
     "Robert Beekman",
     "Thijs Cadier"
@@ -10,18 +11,24 @@ Gem::Specification.new do |gem|
   gem.description           = "The official appsignal.com gem"
   gem.summary               = "Logs performance and exception data from your app to "\
                               "appsignal.com"
-  gem.homepage              = "https://github.com/appsignal/appsignal"
+  gem.homepage              = "https://github.com/appsignal/appsignal-ruby"
   gem.license               = "MIT"
 
   gem.files                 = `git ls-files`.split($\) # rubocop:disable Style/SpecialGlobalVars
   gem.executables           = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files            = gem.files.grep(%r{^(test|spec|features)/})
   gem.name                  = "appsignal"
-  gem.require_paths         = %w(lib ext)
+  gem.require_paths         = %w[lib ext]
   gem.version               = Appsignal::VERSION
   gem.required_ruby_version = ">= 1.9"
 
-  gem.extensions = %w(ext/extconf.rb)
+  if RUBY_PLATFORM == "java" || ENV["APPSIGNAL_PUSH_JAVA_GEM"]
+    gem.platform = "java"
+    gem.extensions = %w[ext/Rakefile]
+    gem.add_dependency "ffi"
+  else
+    gem.extensions = %w[ext/extconf.rb]
+  end
 
   gem.add_dependency "rack"
 
@@ -30,6 +37,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"
-  gem.add_development_dependency "rubocop", "0.46.0"
+  gem.add_development_dependency "rubocop", "0.49.0"
   gem.add_development_dependency "yard"
 end

data/ext/Rakefile

@@ -0,0 +1,27 @@
+require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
+require File.expand_path("../base.rb", __FILE__)
+
+task :default do
+  begin
+    logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+    write_agent_architecture
+    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")
+      next unless verify_archive(archive, arch_config, "dynamic")
+      unarchive(archive)
+    end
+  rescue => ex
+    installation_failed "Exception while installing: #{ex}"
+    ex.backtrace.each do |line|
+      logger.error line
+    end
+  end
+end

data/ext/agent.yml

@@ -1,33 +1,64 @@
 ---
-version: 98aef2c
+version: 57a48f4
 triples:
   x86_64-darwin:
-    checksum: 275b03a13348a853f188a1ca88c60478a802a6d75e78468234eb4842f26f666c
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-darwin-all-static.tar.gz
+    static:
+      checksum: 4fa30287925bad17abb3e86784793e13399dd9390c0579ca94bd8f4ee7a832a3
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-static.tar.gz
+    dynamic:
+      checksum: 1380d4d7263b0fe2a546085efa64643289010b7dd21282c2900e81164a123e8d
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
-    checksum: 275b03a13348a853f188a1ca88c60478a802a6d75e78468234eb4842f26f666c
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-darwin-all-static.tar.gz
+    static:
+      checksum: 4fa30287925bad17abb3e86784793e13399dd9390c0579ca94bd8f4ee7a832a3
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-static.tar.gz
+    dynamic:
+      checksum: 1380d4d7263b0fe2a546085efa64643289010b7dd21282c2900e81164a123e8d
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
-    checksum: 7ae3942e3aa7cc659e2318f06cbe45b0dc9fbba219f804665b0bc60ea68efce4
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-i686-linux-all-static.tar.gz
+    static:
+      checksum: 9a1e59dd42e5ddcd0af04c0cffb0aadeace05dfae46d00aec71e90490186cbfd
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-static.tar.gz
+    dynamic:
+      checksum: ef45877189d3ea4be568ec2fa64a0f04fc94783c42e53f6a55672576a2cfb150
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
-    checksum: 7ae3942e3aa7cc659e2318f06cbe45b0dc9fbba219f804665b0bc60ea68efce4
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-i686-linux-all-static.tar.gz
+    static:
+      checksum: 9a1e59dd42e5ddcd0af04c0cffb0aadeace05dfae46d00aec71e90490186cbfd
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-static.tar.gz
+    dynamic:
+      checksum: ef45877189d3ea4be568ec2fa64a0f04fc94783c42e53f6a55672576a2cfb150
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
-    checksum: 38859a7d5513f1aa3c849559807c4fba42c8fe76eb93eaf46a96fc5adb8c105a
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-i686-linux-musl-all-static.tar.gz
+    static:
+      checksum: cfa14d6aa3ad419a1d87854dfb13a780b34e4ccbf3afbe6adc7704ef750fc414
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
-    checksum: 38859a7d5513f1aa3c849559807c4fba42c8fe76eb93eaf46a96fc5adb8c105a
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-i686-linux-musl-all-static.tar.gz
+    static:
+      checksum: cfa14d6aa3ad419a1d87854dfb13a780b34e4ccbf3afbe6adc7704ef750fc414
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
-    checksum: cbf6104586e004bbd6f0e67c8629224a27612ee24a5a9434a5240471330f73a4
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-linux-all-static.tar.gz
+    static:
+      checksum: 8a68e7da4710fc97be73210437c890897a84f37f6ae9095f36d61099e52f07dc
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-all-static.tar.gz
+    dynamic:
+      checksum: 5b2806ae841a6052f55c0824370dad41a04ae0ad2025df87a54847cce81054c3
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
-    checksum: 968964c84e0a640b2b7f50c376190d95aa5bee105361d0989c679bcc42f12f79
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-linux-musl-all-static.tar.gz
+    static:
+      checksum: ffc91182064c1f0dbd9d219816054903fcc28db977cdd74df15802c468a2f252
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-musl-all-static.tar.gz
   x86_64-freebsd:
-    checksum: f9f604127a8315d776312a7ce608aa1df937ed0263a2f0d3ef871d6a0f470b8b
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-freebsd-all-static.tar.gz
+    static:
+      checksum: c1781a09ec4e4c9e2f08a60e662acd8790286ebad62c9d32712a7932d0852a10
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-static.tar.gz
+    dynamic:
+      checksum: 0ce479051f5734b330d91811c51813d93e65758ecad97e5f6b9e86764480e7c2
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
-    checksum: f9f604127a8315d776312a7ce608aa1df937ed0263a2f0d3ef871d6a0f470b8b
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/98aef2c/appsignal-x86_64-freebsd-all-static.tar.gz
+    static:
+      checksum: c1781a09ec4e4c9e2f08a60e662acd8790286ebad62c9d32712a7932d0852a10
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-static.tar.gz
+    dynamic:
+      checksum: 0ce479051f5734b330d91811c51813d93e65758ecad97e5f6b9e86764480e7c2
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -0,0 +1,79 @@
+require "digest"
+require "logger"
+require "fileutils"
+require "open-uri"
+require "zlib"
+require "yaml"
+require "rubygems/package"
+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
+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"))
+end
+
+def installation_failed(reason)
+  logger.error "Installation failed: #{reason}"
+  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
+end
+
+def check_architecture
+  if AGENT_CONFIG["triples"].keys.include?(ARCH)
+    true
+  else
+    installation_failed(
+      "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."
+    )
+    false
+  end
+end
+
+def download_archive(arch_config, type)
+  logger.info "Downloading agent release from #{arch_config[type]["download_url"]}"
+  open(arch_config[type]["download_url"], :ssl_ca_cert => CA_CERT_PATH)
+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"
+    true
+  else
+    installation_failed(
+      "Aborting installation, checksum of downloaded archive could not be verified: " \
+      "Expected '#{arch_config[type]["checksum"]}', got '#{checksum}'."
+    )
+    false
+  end
+end
+
+def unarchive(archive)
+  Gem::Package::TarReader.new(Zlib::GzipReader.open(archive)) do |tar|
+    tar.each do |entry|
+      next unless entry.file?
+
+      File.open(ext_path(entry.full_name), "wb") do |f|
+        f.write(entry.read)
+      end
+    end
+  end
+  FileUtils.chmod(0o755, ext_path("appsignal-agent"))
+end

data/ext/extconf.rb

@@ -1,89 +1,18 @@
-require "digest"
-require "logger"
-require "fileutils"
-require "open-uri"
-require "zlib"
-require "rubygems/package"
-require "yaml"
 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         = "#{Gem::Platform.local.cpu}-#{PLATFORM}".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"))
-end
-
-def installation_failed(reason)
-  logger.error "Installation failed: #{reason}"
-  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
-end
+require File.expand_path("../base.rb", __FILE__)
 
 def install
   logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
   write_agent_architecture
-
-  if RUBY_PLATFORM =~ /java/
-    installation_failed(
-      "We do not support jRuby at the moment, email support@appsignal.com if you want to join the beta"
-    )
-    return
-  end
-
-  unless AGENT_CONFIG["triples"].keys.include?(ARCH)
-    installation_failed(
-      "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."
-    )
-    return
-  end
-
+  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"))
-    logger.info "Downloading agent release from #{arch_config["download_url"]}"
-
-    archive = open(arch_config["download_url"], :ssl_ca_cert => CA_CERT_PATH)
-
-    if Digest::SHA256.hexdigest(archive.read) == arch_config["checksum"]
-      logger.info "Checksum of downloaded archive verified, extracting archive"
-    else
-      installation_failed(
-        "Aborting installation, checksum of downloaded archive could not be verified: " \
-        "Expected '#{arch_config["checksum"]}', got '#{checksum}'."
-      )
-      return
-    end
-
-    Gem::Package::TarReader.new(Zlib::GzipReader.open(archive)) do |tar|
-      tar.each do |entry|
-        next unless entry.file?
-
-        File.open(ext_path(entry.full_name), "wb") do |f|
-          f.write(entry.read)
-        end
-      end
-    end
-    FileUtils.chmod(0o755, ext_path("appsignal-agent"))
+    archive = download_archive(arch_config, "static")
+    return unless verify_archive(archive, arch_config, "static")
+    unarchive(archive)
   end
 
   logger.info "Creating makefile"