appsignal 0.12.beta.34 → 0.12.beta.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5312e8db537d45b2a3913c0a92b059e37ddd9eb5
-  data.tar.gz: d9bdccb664cd829276c94fd683863f6db851bdf6
+  metadata.gz: cfdb043df76d74ac83f045edd351aa8901330cdf
+  data.tar.gz: 7d67e984a04d00605f4e8bf53f2d47e70f81d963
 SHA512:
-  metadata.gz: d4d4b632190bd7256c6a1caa7d3083bf65c1e9483f0f6505595752c065f4fbab4072bbbd970ac56aea3eff7988800186397349e1ddb4e5013d46e9b6d4f0bda2
-  data.tar.gz: df3edf5a79410c65b1d13dafcfe9a374b6bb73ff5e6372d138903fe878d2de8894cb661efaa0fd23ba1e8aeb04fa869da9750e2db5eb8bca94d1089c05133fd2
+  metadata.gz: 0611964579b4ee0c3dc5f31b5bcc13bf880390f328dee6c01de1cdc6715da9fde171ece1e31a505991a6dc0f7b0daee7eebe917243e657622b0b86faa6c96699
+  data.tar.gz: 0c95d1f4a335a979b9dae2e2f03cd6e18f3a5affca8ab1728e3a3ba96bea2143be0953a6c1d74d876654245e906eb66e82c6ea7e12bcadcd94cbfee8dd0bc106

data/appsignal.gemspec

@@ -4,10 +4,7 @@ require File.expand_path('../lib/appsignal/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = [
     'Robert Beekman',
-    'Steven Weller',
-    'Thijs Cadier',
-    'Ron Cadier',
-    'Jacob Vosmaer'
+    'Thijs Cadier'
   ]
   gem.email                 = ['support@appsignal.com']
   gem.description           = 'The official appsignal.com gem'
@@ -34,12 +31,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'timecop'
   gem.add_development_dependency 'webmock'
-
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-    gem.add_development_dependency 'racc'
-    gem.add_development_dependency 'rubysl-enumerator'
-    gem.add_development_dependency 'rubysl-net-http'
-    gem.add_development_dependency 'rubysl-rexml'
-    gem.add_development_dependency 'rubysl-test-unit'
-  end
 end

data/ext/agent.yml

@@ -0,0 +1,11 @@
+---
+:version: c0f342f
+:triples:
+  x86_64-linux:
+    :checksum: 34ec5169c4ed863a36c113a4bb78609ad77b8bd262d1607cc34ef0b809b6f7b4
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/c0f342f/appsignal-agent-x86_64-linux.tar.gz
+    :lib_filename: libappsignal.so
+  x86_64-darwin:
+    :checksum: 0ff18e87ea16c40cceda3677fee48e912ea9eeaca81c407935ea59e0fb45eeb4
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/c0f342f/appsignal-agent-x86_64-darwin.tar.gz
+    :lib_filename: libappsignal.dylib

data/ext/extconf.rb

@@ -1,23 +1,62 @@
+require 'digest'
+require 'logger'
 require 'mkmf'
 require 'fileutils'
 require 'open-uri'
 require 'zlib'
 require 'rubygems/package'
+require 'yaml'
 require File.expand_path('../../lib/appsignal/version.rb', __FILE__)
 
-HOST            = 'd135dj0rjqvssy.cloudfront.net'
-SUPPORTED_ARCHS = %w(x86_64-linux x86_64-darwin)
+EXT_PATH     = File.expand_path('..', __FILE__)
+AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, 'agent.yml')))
+ARCH         = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
 
 def ext_path(path)
-  File.join(File.expand_path('..', __FILE__), path)
+  File.join(EXT_PATH, path)
 end
 
-arch = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
+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 install
+  logger.info "Installing appsignal agent for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+
+  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
+
+  arch_config = AGENT_CONFIG[:triples][ARCH]
+
+  unless File.exists?(ext_path('appsignal-agent')) &&
+           File.exists?(ext_path(arch_config[:lib_filename])) &&
+           File.exists?(ext_path('appsignal_extension.h'))
+    logger.info "Downloading agent release from #{arch_config[:download_url]}"
+
+    archive = open(arch_config[:download_url])
+
+    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
 
-if SUPPORTED_ARCHS.include?(arch)
-  if !File.exists?(ext_path('appsignal-agent')) || !File.exists?(ext_path('libappsignal.a'))
-    archive_url = "https://#{HOST}/#{Appsignal::AGENT_VERSION}/appsignal-agent-#{arch}.tar.gz"
-    archive     = open(archive_url)
     Gem::Package::TarReader.new(Zlib::GzipReader.open(archive)) do |tar|
       tar.each do |entry|
         if entry.file?
@@ -30,10 +69,17 @@ if SUPPORTED_ARCHS.include?(arch)
     FileUtils.chmod(0755, ext_path('appsignal-agent'))
   end
 
-  have_library 'appsignal', 'appsignal_start'
-
-  create_makefile 'appsignal_extension'
-else
-  puts "AppSignal currently does not support your system architecture (#{arch})."
-  puts "Please let us know at support@appsignal.com, we aim to support everything our customers run."
+  logger.info "Creating makefile"
+  if find_library('appsignal', 'appsignal_start', EXT_PATH) &&
+       find_executable('appsignal-agent', EXT_PATH) &&
+       find_header('appsignal_extension.h', EXT_PATH)
+    create_makefile 'appsignal_extension'
+    logger.info 'Successfully installed appsignal extension'
+  else
+    installation_failed "Aborting installation, extension files were not present"
+  end
+rescue => ex
+  installation_failed "Exception while installing: #{ex}"
 end
+
+install

data/lib/appsignal.rb

@@ -10,7 +10,7 @@ end
 
 module Appsignal
   class << self
-    attr_accessor :config, :subscriber, :logger, :agent, :in_memory_log
+    attr_accessor :config, :subscriber, :logger, :agent, :in_memory_log, :extension_loaded
 
     def load_integrations
       require 'appsignal/integrations/celluloid'
@@ -198,8 +198,12 @@ module Appsignal
       @logger << @in_memory_log.string if @in_memory_log
     end
 
+    def extension_loaded?
+      !!@extension_loaded
+    end
+
     def active?
-      config && config.active?
+      config && config.active? && extension_loaded?
     end
 
     def is_ignored_error?(error)
@@ -223,7 +227,7 @@ module Appsignal
   end
 end
 
-require 'appsignal_extension'
+require 'appsignal/extension'
 require 'appsignal/auth_check'
 require 'appsignal/config'
 require 'appsignal/event_formatter'

data/lib/appsignal/config.rb

@@ -75,7 +75,7 @@ module Appsignal
       ENV['APPSIGNAL_AGENT_PATH']        = File.expand_path('../../../ext', __FILE__).to_s
       ENV['APPSIGNAL_LOG_PATH']          = File.join(root_path, 'log')
       ENV['APPSIGNAL_ENVIRONMENT']       = env
-      ENV['APPSIGNAL_AGENT_VERSION']     = Appsignal::AGENT_VERSION
+      ENV['APPSIGNAL_AGENT_VERSION']     = Appsignal::ExtensionLoader.agent_version
       ENV['APPSIGNAL_DEBUG_LOGGING']     = config_hash[:debug].to_s
       ENV['APPSIGNAL_PUSH_API_ENDPOINT'] = config_hash[:endpoint]
       ENV['APPSIGNAL_PUSH_API_KEY']      = config_hash[:push_api_key]

data/lib/appsignal/extension.rb

@@ -0,0 +1,60 @@
+module Appsignal
+  module ExtensionLoader
+    def self.agent_config
+      @agent_config ||= YAML.load(
+        File.read(File.join(File.dirname(__FILE__), '../../ext/agent.yml'))
+      )
+    end
+
+    def self.arch
+      "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
+    end
+
+    def self.lib_path
+      File.join(
+        File.dirname(__FILE__),
+        '../../ext/',
+        agent_config[:triples][arch][:lib_filename]
+      )
+    end
+
+    def self.agent_version
+      agent_config[:version]
+    end
+
+    def self.failed(exception)
+      Appsignal.logger.error(
+        "Failed to load extension (#{exception}), please check the install.log file in " \
+        "the ext directory of the gem and e-mail us at support@appsignal.com"
+      )
+      Appsignal.extension_loaded = false
+    end
+
+    def self.load_extension
+      begin
+        require 'fiddle'
+        begin
+          Fiddle.dlopen(lib_path)
+        rescue => ex
+          failed(ex)
+          return
+        end
+      rescue LoadError
+        # This is Ruby 2.1 or older
+        require 'dl'
+        begin
+          DL.dlopen(lib_path)
+        rescue => ex
+          failed(ex)
+          return
+        end
+      end
+
+      require 'appsignal_extension'
+
+      Appsignal.extension_loaded = true
+    end
+  end
+end
+
+Appsignal::ExtensionLoader.load_extension

data/lib/appsignal/version.rb

@@ -1,4 +1,5 @@
+require 'yaml'
+
 module Appsignal
-  VERSION       = '0.12.beta.34'
-  AGENT_VERSION = '1531496'
+  VERSION = '0.12.beta.35'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -58,7 +58,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_PUSH_API_KEY'].should      == 'abc'
         ENV['APPSIGNAL_APP_NAME'].should          == 'TestApp'
         ENV['APPSIGNAL_ENVIRONMENT'].should       == 'production'
-        ENV['APPSIGNAL_AGENT_VERSION'].should     == Appsignal::AGENT_VERSION
+        ENV['APPSIGNAL_AGENT_VERSION'].should     == Appsignal::ExtensionLoader.agent_version
         ENV['APPSIGNAL_HTTP_PROXY'].should        == 'http://localhost'
         ENV['APPSIGNAL_IGNORE_ACTIONS'].should    == 'action1,action2'
       end

data/spec/lib/appsignal/extension_spec.rb

@@ -1,9 +1,51 @@
 require 'spec_helper'
+require 'fileutils'
 
-describe Appsignal::Extension do
-  context "call native methods without errors" do
+describe "extension loading and operation" do
+  describe ".agent_config" do
+    subject { Appsignal::ExtensionLoader.agent_config }
+
+    it { should have_key(:version) }
+    it { should have_key(:triples) }
+  end
+
+  describe ".arch" do
+    subject { Appsignal::ExtensionLoader.agent_config }
+
+    it { should_not be_nil }
+  end
+
+  describe ".agent_version" do
+    subject { Appsignal::ExtensionLoader.agent_version }
+
+    it { should_not be_nil }
+  end
+
+  context "when the extension library cannot be loaded" do
+    before do
+      Appsignal::ExtensionLoader.stub(:lib_path => '/tmp/nonsense')
+    end
+
+    it "should log an error and set appsignal to inactive" do
+      Appsignal.logger.should_receive(:error).with(
+        'Failed to load extension (dlopen(/tmp/nonsense, 9): image not found), ' \
+        'please check the install.log file in the ext directory of the gem and e-mail us at support@appsignal.com'
+      )
+
+      Appsignal::ExtensionLoader.load_extension
+
+      Appsignal.extension_loaded?.should be_false
+    end
+  end
+
+  context "when the extension library can be loaded" do
     subject { Appsignal::Extension }
 
+    it "should load the extension" do
+      Appsignal::ExtensionLoader.load_extension
+      Appsignal.extension_loaded?.should be_true
+    end
+
     it "should have a start method" do
       subject.start
     end

metadata

@@ -1,18 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.34
+  version: 0.12.beta.35
 platform: ruby
 authors:
 - Robert Beekman
-- Steven Weller
 - Thijs Cadier
-- Ron Cadier
-- Jacob Vosmaer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,6 +129,7 @@ files:
 - appsignal.gemspec
 - benchmark.rake
 - bin/appsignal
+- ext/agent.yml
 - ext/appsignal_extension.c
 - ext/extconf.rb
 - gemfiles/capistrano2.gemfile
@@ -156,6 +154,7 @@ files:
 - lib/appsignal/event_formatter/active_record/sql_formatter.rb
 - lib/appsignal/event_formatter/moped/query_formatter.rb
 - lib/appsignal/event_formatter/net_http/request_formatter.rb
+- lib/appsignal/extension.rb
 - lib/appsignal/instrumentations/net_http.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb