appsignal 2.0.6 → 2.1.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71dba256de2f6e7c3fef2638fe3ff22ac1867734
-  data.tar.gz: 19afcda8d5855a43912aee21e4953744990ae96f
+  metadata.gz: 20f58e406be6333a02b4e9d9c71b27f39012406d
+  data.tar.gz: 66bb80adf03714c807bfdcc8b08718a750d2aedb
 SHA512:
-  metadata.gz: 4abc56838105533b0384f14889fc80af1898bc4744b60f4d55ea7524cfccfaf1052bb9e1c88da98c8840b4f72956ec1e2c854af9a845d6d61e14121183dfb8e1
-  data.tar.gz: fe65746d9243bfc5393519b1d23c0beeefc7c0ed53588043a3b95b0c16a66a2372a2472775d4cd9ba0dc60395cecf32c72c28457ea664ee33dce59c9e659d2e4
+  metadata.gz: e8e6951d7689466dbf33dcfba1e17f9bab6d17cfb723079f8a306b57c7508d77f1eb42ec5e00a6c5ac945c38a8edaa253091b14af9abfbe19406a85b9360813f
+  data.tar.gz: 410d73ddc69a17245fa52f8c9298ff21a7fefdd99edbd306cdd8cdb9917834a7b3b7c740e4827f59c233c134c41665b360d907c3c8ed40a0f2575a8049511a83

data/.gitignore

@@ -3,7 +3,6 @@
 .sass-cache
 capybara-*.html
 *.log
-/doc
 /.bundle
 /vendor/bundle
 /tmp/*

data/CHANGELOG.md

@@ -1,10 +1,5 @@
-# 2.0.6
-* Fix `Appsignal::Transaction#record_event` method call. PR #240
-
-# 2.0.5
-* Improved logging for agent connection issues. Commit
-  cdf9d3286d704e22473eb901c839cab4fab45a6f
-* Handle nil request/environments in transactions. PR #231
+# 2.1.0
+* Add support for musl libc
 
 # 2.0.4
 * Use consistent log format for both file and STDOUT logs. PR #203

data/Rakefile

@@ -57,7 +57,7 @@ task :publish do
       puts "# Creating tag #{version}"
       puts `git tag #{version}`
       puts `git push origin #{version}`
-      puts `git push origin #{branch}`
+      puts `git push origin #{current_branch}`
     rescue
       raise "Tag: '#{version}' already exists"
     end
@@ -75,14 +75,8 @@ task :publish do
     @version ||= 'v' << gem_version
   end
 
-  def branch
-    if gem_version.include?('alpha') ||
-         gem_version.include?('beta') ||
-         gem_version.include?('rc')
-      'develop'
-    else
-      'master'
-    end
+  def current_branch
+    `git rev-parse --abbrev-ref HEAD`.chomp
   end
 
   def git_status_to_array(changes)

data/ext/agent.yml

@@ -1,18 +1,6 @@
 ---
-version: a1cb32f
+version: 21f0b26
 triples:
   x86_64-linux:
-    checksum: 8905166cbd29ad3038d013438781118bb2fa4ea3fef2e7abfe3a4a4d90d7b40c
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/a1cb32f/appsignal-x86_64-linux-all-static.tar.gz
-  i686-linux:
-    checksum: 0ae5f06cf9fd516c7a33cbe29a78016b3b419717870d5fba793345fecb696950
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/a1cb32f/appsignal-i686-linux-all-static.tar.gz
-  x86-linux:
-    checksum: 0ae5f06cf9fd516c7a33cbe29a78016b3b419717870d5fba793345fecb696950
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/a1cb32f/appsignal-i686-linux-all-static.tar.gz
-  x86_64-darwin:
-    checksum: 750e49e56c2024c82adc64471feb855ab7a5caff79cb37978a83e11e31a023ce
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/a1cb32f/appsignal-x86_64-darwin-all-static.tar.gz
-  universal-darwin:
-    checksum: 750e49e56c2024c82adc64471feb855ab7a5caff79cb37978a83e11e31a023ce
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/a1cb32f/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: e965ea8d4a01ea2caf9b50a6520c2f2385a00c00bc5d259079f93baddca0b28c
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/21f0b26/appsignal-x86_64-linux-all-static.tar.gz

data/gemfiles/rails-4.2.gemfile

@@ -4,7 +4,3 @@ gem 'rails', '~> 4.2.0'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
-  gem 'nokogiri', '~> 1.6.0'
-end

data/gemfiles/resque.gemfile

@@ -6,7 +6,3 @@ gem 'sinatra'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
-  gem 'nokogiri', '~> 1.6.0'
-end

data/lib/appsignal/cli/demo.rb

@@ -10,7 +10,7 @@ module Appsignal
           puts "Sending demonstration sample data..."
           if Appsignal::Demo.transmit
             puts "Demonstration sample data sent!"
-            puts "It may take about a minute for the data to appear on https://appsignal.com/accounts"
+            puts "It may take about a minute for the data to appear on AppSignal.com/accounts"
           else
             puts "Error: Unable to start the AppSignal agent and send data to AppSignal.com"
             puts "Please use `appsignal diagnose` to debug your configuration."

data/lib/appsignal/cli/install.rb

@@ -204,7 +204,7 @@ module Appsignal
             puts "  Sending example data to AppSignal..."
             if Appsignal::Demo.transmit
               puts "  Example data sent!"
-              puts "  It may take about a minute for the data to appear on https://appsignal.com/accounts"
+              puts "  It may take about a minute for the data to appear on AppSignal.com/accounts"
               puts
               puts "  Please return to your browser and follow the instructions."
             else

data/lib/appsignal/transaction.rb

@@ -213,8 +213,7 @@ module Appsignal
         title || BLANK,
         body || BLANK,
         duration,
-        body_format || Appsignal::EventFormatter::DEFAULT,
-        self.class.garbage_collection_profiler.total_time
+        body_format || Appsignal::EventFormatter::DEFAULT
       )
     end
 
@@ -239,40 +238,23 @@ module Appsignal
 
     protected
 
-    # Returns calculated background queue start time in milliseconds, based on
-    # environment values.
-    #
-    # @return [nil] if no {#environment} is present.
-    # @return [nil] if there is no `:queue_start` in the {#environment}.
-    # @return [Integer]
     def background_queue_start
-      env = environment
-      return unless env
-      queue_start = env[:queue_start]
-      return unless queue_start
-
+      return unless request.env
+      return unless queue_start = request.env[:queue_start]
       (queue_start.to_f * 1000.0).to_i
     end
 
-    # Returns HTTP queue start time in milliseconds.
-    #
-    # @return [nil] if no queue start time is found.
-    # @return [nil] if begin time is too low to be plausible.
-    # @return [Integer] queue start in milliseconds.
     def http_queue_start
-      env = environment
-      return unless env
-      env_var = env["HTTP_X_QUEUE_START".freeze] || env["HTTP_X_REQUEST_START".freeze]
-      return unless env_var
-      cleaned_value = env_var.tr("^0-9".freeze, "".freeze)
+      return unless request.env
+      return unless env_var = request.env['HTTP_X_QUEUE_START'.freeze] || request.env['HTTP_X_REQUEST_START'.freeze]
+      cleaned_value = env_var.tr('^0-9'.freeze, ''.freeze)
       return if cleaned_value.empty?
-
       value = cleaned_value.to_i
       if value > 4_102_441_200_000
-        # Value is in microseconds. Transform to milliseconds.
+        # Value is in microseconds
         value / 1_000
       elsif value < 946_681_200_000
-        # Value is too low to be plausible
+        # Value is to low to be plausible
         nil
       else
         # Value is in milliseconds
@@ -301,62 +283,24 @@ module Appsignal
       Appsignal::Utils::ParamsSanitizer.sanitize params, options
     end
 
-    # Returns sanitized environment for a transaction.
-    #
-    # The environment of a transaction can contain a lot of information, not
-    # all of it useful for debugging.
-    #
-    # Only the values from the keys specified in `ENV_METHODS` are returned.
-    #
-    # @return [nil] if no environment is present.
-    # @return [Hash<String, Object>]
     def sanitized_environment
-      env = environment
-      return if env.empty?
-
+      return unless request.env
       {}.tap do |out|
         ENV_METHODS.each do |key|
-          out[key] = env[key] if env[key]
+          out[key] = request.env[key] if request.env[key]
         end
       end
     end
 
-    # Returns sanitized session data.
-    #
-    # The session data is sanitized by the {Appsignal::Utils::ParamsSanitizer}.
-    #
-    # @return [nil] if `:skip_session_data` config is set to `true`.
-    # @return [nil] if the {#request} object doesn't respond to `#session`.
-    # @return [nil] if the {#request} session data is `nil`.
-    # @return [Hash<String, Object>]
     def sanitized_session_data
-      return if Appsignal.config[:skip_session_data] ||
-          !request.respond_to?(:session)
-      session = request.session
-      return unless session
-
+      return if Appsignal.config[:skip_session_data] || !request.respond_to?(:session)
+      return unless session = request.session
       Appsignal::Utils::ParamsSanitizer.sanitize(session.to_hash)
     end
 
-    # Returns metadata from the environment.
-    #
-    # @return [nil] if no `:metadata` key is present in the {#environment}.
-    # @return [Hash<String, Object>]
     def metadata
-      environment[:metadata]
-    end
-
-    # Returns the environment for a transaction.
-    #
-    # Returns an empty Hash when the {#request} object doesn't listen to the
-    # `#env` method or the `#env` is nil.
-    #
-    # @return [Hash<String, Object>]
-    def environment
-      return {} unless request.respond_to?(:env)
-      return {} unless request.env
-
-      request.env
+      return unless request.env
+      request.env[:metadata]
     end
 
     # Only keep tags if they meet the following criteria:

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '2.0.6'
+  VERSION = '2.1.0.alpha.1'
 end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -3,8 +3,9 @@ if DependencyHelper.capistrano3_present?
   require 'capistrano/deploy'
   require 'appsignal/capistrano'
 
+  include Capistrano::DSL
+
   describe "Capistrano 3 integration" do
-    let(:capistrano) { Class.new.extend(Capistrano::DSL) }
     let(:config) { project_fixture_config }
     let(:out_stream) { std_stream }
     let(:output) { out_stream.read }
@@ -25,7 +26,7 @@ if DependencyHelper.capistrano3_present?
 
     def run
       capture_std_streams(out_stream, out_stream) do
-        capistrano.invoke('appsignal:deploy')
+        invoke('appsignal:deploy')
       end
     end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -22,7 +22,7 @@ describe Appsignal::Transaction do
   before { Timecop.freeze(time) }
   after  { Timecop.return }
 
-  describe "class methods" do
+  context "class methods" do
     describe ".create" do
       it "should add the transaction to thread local" do
         Appsignal::Extension.should_receive(:start_transaction).with('1', 'http_request', 0)
@@ -466,29 +466,21 @@ describe Appsignal::Transaction do
 
     describe "#start_event" do
       it "should start the event in the extension" do
-        expect(transaction.ext).to receive(:start_event).with(0).and_call_original
+        transaction.ext.should_receive(:start_event)
 
         transaction.start_event
       end
     end
 
     describe "#finish_event" do
-      let(:fake_gc_time) { 123 }
-      before do
-        described_class.garbage_collection_profiler
-          .should_receive(:total_time)
-          .at_least(:once)
-          .and_return(fake_gc_time)
-      end
-
       it "should finish the event in the extension" do
         transaction.ext.should_receive(:finish_event).with(
           'name',
           'title',
           'body',
           1,
-          fake_gc_time
-        ).and_call_original
+          0
+        )
 
         transaction.finish_event(
           'name',
@@ -504,8 +496,8 @@ describe Appsignal::Transaction do
           '',
           '',
           0,
-          fake_gc_time
-        ).and_call_original
+          0
+        )
 
         transaction.finish_event(
           'name',
@@ -514,26 +506,25 @@ describe Appsignal::Transaction do
           nil
         )
       end
-    end
 
-    describe "#record_event" do
-      let(:fake_gc_time) { 123 }
-      before do
-        described_class.garbage_collection_profiler
-          .should_receive(:total_time)
-          .at_least(:once)
-          .and_return(fake_gc_time)
+      it "should add garbage collection time" do
+        allow_any_instance_of(Appsignal::GarbageCollectionProfiler)
+          .to receive(:internal_profiler)
+          .and_return(FakeGCProfiler.new(0.12345))
+
+        transaction.finish_event('name', nil, nil, nil)
       end
+    end
 
+    describe "#record_event" do
       it "should record the event in the extension" do
         transaction.ext.should_receive(:record_event).with(
           'name',
           'title',
           'body',
           1000,
-          1,
-          fake_gc_time
-        ).and_call_original
+          1
+        )
 
         transaction.record_event(
           'name',
@@ -550,9 +541,8 @@ describe Appsignal::Transaction do
           '',
           '',
           1000,
-          0,
-          fake_gc_time
-        ).and_call_original
+          0
+        )
 
         transaction.record_event(
           'name',
@@ -609,18 +599,6 @@ describe Appsignal::Transaction do
     describe "#background_queue_start" do
       subject { transaction.send(:background_queue_start) }
 
-      context "when request is nil" do
-        let(:request) { nil }
-
-        it { should eq nil }
-      end
-
-      context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
-
-        it { should eq nil }
-      end
-
       context "when queue start is nil" do
         it { should eq nil }
       end
@@ -638,14 +616,8 @@ describe Appsignal::Transaction do
       subject { transaction.send(:http_queue_start) }
 
       shared_examples "http queue start" do
-        context "when request is nil" do
-          let(:request) { nil }
-
-          it { should be_nil }
-        end
-
         context "when env is nil" do
-          before { expect(transaction.request).to receive(:env).and_return(nil) }
+          before { transaction.request.stub(:env => nil) }
 
           it { should be_nil }
         end
@@ -779,16 +751,8 @@ describe Appsignal::Transaction do
 
       subject { transaction.send(:sanitized_environment) }
 
-      context "when request is nil" do
-        let(:request) { nil }
-
-        it "returns nil" do
-          expect(subject).to be_nil
-        end
-      end
-
       context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
+        before { transaction.request.stub(:env => nil) }
 
         it { should be_nil }
       end
@@ -809,22 +773,14 @@ describe Appsignal::Transaction do
     describe '#sanitized_session_data' do
       subject { transaction.send(:sanitized_session_data) }
 
-      context "when request is nil" do
-        let(:request) { nil }
-
-        it "returns nil" do
-          expect(subject).to be_nil
-        end
-      end
-
-      context "when session is nil" do
-        before { expect(transaction.request).to receive(:session).and_return(nil) }
+      context "when env is nil" do
+        before { transaction.request.stub(:session => nil) }
 
         it { should be_nil }
       end
 
-      context "when session is empty" do
-        before { expect(transaction.request).to receive(:session).and_return({}) }
+      context "when env is empty" do
+        before { transaction.request.stub(:session => {}) }
 
         it { should eq({}) }
       end
@@ -888,14 +844,8 @@ describe Appsignal::Transaction do
     describe "#metadata" do
       subject { transaction.send(:metadata) }
 
-      context "when request is nil" do
-        let(:request) { nil }
-
-        it { should be_nil }
-      end
-
       context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
+        before { transaction.request.stub(:env => nil) }
 
         it { should be_nil }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0.alpha.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -327,9 +327,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2