appsignal 0.12.beta.35 → 0.12.beta.36

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cfdb043df76d74ac83f045edd351aa8901330cdf
-  data.tar.gz: 7d67e984a04d00605f4e8bf53f2d47e70f81d963
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmNkYzEzMjU1YjlhNDQ2NDQxZTNlZTI2YTBiOGZlYzhlNjdhZjMzNA==
+  data.tar.gz: !binary |-
+    ZmJhNDJiZmI0YjczNmJhMTNjZGZlN2NiMjM3NTkxOTZjNjA4ZjIyYQ==
 SHA512:
-  metadata.gz: 0611964579b4ee0c3dc5f31b5bcc13bf880390f328dee6c01de1cdc6715da9fde171ece1e31a505991a6dc0f7b0daee7eebe917243e657622b0b86faa6c96699
-  data.tar.gz: 0c95d1f4a335a979b9dae2e2f03cd6e18f3a5affca8ab1728e3a3ba96bea2143be0953a6c1d74d876654245e906eb66e82c6ea7e12bcadcd94cbfee8dd0bc106
+  metadata.gz: !binary |-
+    MGI4YzRiOGI1MWU5NWU4N2E1YTYxMzJhMjI4NDAzNWRmODJjYTRlMzIyNmVk
+    YTFlNjE1YTAxYTk0YmVjNjZiZTU1ZmFkZGFlMGM3MjdmYzliYzg4MzlkNmFl
+    YmEwMWZjNDQyNGE4NDQ1ZjY1YzQ1NDdlMjIxZGQ4MjMxNjBiOTQ=
+  data.tar.gz: !binary |-
+    NWUzY2YxMjBlZjc4NTE1OTY2ZDJmZjMzMjRkMDJjZTcxYWIwNDFhNWZmNGVi
+    OTI1MTJjOTZjMjNkMGI4MjAyYTQ0ODM3ZTY4ZDFmM2U1NzBhMzQ5N2YxNGYx
+    NmU0NzQ3MTMwMWQzMzQ0NTk1MmQ4OWYzZTg5MWE2NzJlOGQyODA=

data/ext/agent.yml

@@ -2,10 +2,10 @@
 :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
+    :checksum: 822058862ff44f8f77d6ee60ae116358b33af35cb09bdf6a87631653cc4da116
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/c0f342f/appsignal-agent-x86_64-linux-static.tar.gz
+    :lib_filename: libappsignal.a
   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
+    :checksum: 46ce8aad2689df40ad5a323264e6e4b8bb9919adbc6767cdf3bb9fc97e0a5aa7
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/c0f342f/appsignal-agent-x86_64-darwin-static.tar.gz
+    :lib_filename: libappsignal.a

data/lib/appsignal.rb

@@ -37,6 +37,8 @@ module Appsignal
     end
 
     def start
+      return unless extension_loaded?
+
       unless @config
         @config = Config.new(
           ENV['PWD'],

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::ExtensionLoader.agent_version
+      ENV['APPSIGNAL_AGENT_VERSION']     = Appsignal::Extension.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

@@ -1,60 +1,26 @@
+require 'yaml'
+
+begin
+  require 'appsignal_extension'
+  Appsignal.extension_loaded = true
+rescue LoadError => err
+  Appsignal.logger.error(
+    "Failed to load extension (#{err}), 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
+
 module Appsignal
-  module ExtensionLoader
+  class Extension
     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,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.beta.35'
+  VERSION = '0.12.beta.36'
 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::ExtensionLoader.agent_version
+        ENV['APPSIGNAL_AGENT_VERSION'].should     == Appsignal::Extension.agent_version
         ENV['APPSIGNAL_HTTP_PROXY'].should        == 'http://localhost'
         ENV['APPSIGNAL_IGNORE_ACTIONS'].should    == 'action1,action2'
       end

data/spec/lib/appsignal/extension_spec.rb

@@ -3,46 +3,22 @@ require 'fileutils'
 
 describe "extension loading and operation" do
   describe ".agent_config" do
-    subject { Appsignal::ExtensionLoader.agent_config }
+    subject { Appsignal::Extension.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 }
+    subject { Appsignal::Extension.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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.35
+  version: 0.12.beta.36
 platform: ruby
 authors:
 - Robert Beekman
@@ -15,98 +15,98 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -118,9 +118,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -244,17 +244,17 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com