appsignal 0.10.0.beta.0 → 0.10.0

data/CHANGELOG.md

@@ -6,7 +6,12 @@
 * Use Appsignal.monitor_transaction to instrument and log errors for
   custom actions
 * Add option to ignore a specific action
-* Use a Mutex in agent instead of Thread.exclusive
+
+# 0.9.6
+* Convert to primitives before sending through pipe
+
+# 0.9.5
+Yanked
 
 # 0.9.4
 * Log Rails and Sinatra version
@@ -66,7 +71,7 @@ Yanked
 * Alias tag_request to tag_job, for background jobs
 * Skip sanitization of env if env is nil
 * Small bugfix in forking logic
-* Don't send params if send_params is off in config 
+* Don't send params if send_params is off in config
 * Remove --repository option in CLI
 * Name option in appsignal notify_of_deploy CLI
 * Don't call to_hash on ENV

data/lib/appsignal/agent.rb

@@ -2,8 +2,8 @@ module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
 
-    attr_accessor :aggregator, :mutex, :thread, :master_pid, :pid, :active,
-                  :sleep_time, :transmitter, :subscriber, :paused
+    attr_accessor :aggregator, :thread, :master_pid, :pid, :active, :sleep_time,
+                  :transmitter, :subscriber, :paused
 
     def initialize
       return unless Appsignal.active?
@@ -16,7 +16,6 @@ module Appsignal
       @pid = @master_pid
       @aggregator = Aggregator.new
       @transmitter = Transmitter.new(ACTION)
-      @mutex = Mutex.new
       subscribe
       start_thread
       Appsignal.logger.info('Started Appsignal agent')
@@ -94,7 +93,7 @@ module Appsignal
       # Replace aggregator while making sure no thread
       # is adding to it's queue
       aggregator_to_be_sent = nil
-      mutex.synchronize do
+      Thread.exclusive do
         aggregator_to_be_sent = aggregator
         @aggregator = Aggregator.new
       end
@@ -113,7 +112,7 @@ module Appsignal
       Appsignal.logger.debug('Clearing queue')
       # Replace aggregator while making sure no thread
       # is adding to it's queue
-      mutex.synchronize do
+      Thread.exclusive do
         @aggregator = Aggregator.new
       end
     end
@@ -121,7 +120,7 @@ module Appsignal
     def forked!
       Appsignal.logger.info('Forked worker process')
       @pid = Process.pid
-      mutex.synchronize do
+      Thread.exclusive do
         @aggregator = Aggregator.new
       end
       resubscribe
@@ -131,7 +130,7 @@ module Appsignal
     def shutdown(send_current_queue=false, reason=nil)
       Appsignal.logger.info("Shutting down agent (#{reason})")
       unsubscribe
-      Thread.kill(thread) if thread
+      stop_thread
       send_queue if send_current_queue && @aggregator.has_transactions?
     end
 

data/lib/appsignal/transaction.rb

@@ -85,7 +85,7 @@
     end
 
     def exception?
-      !!exception
+      !! exception
     end
 
     def slow_request?
@@ -98,20 +98,32 @@
     end
 
     def truncate!
+      return if truncated?
       process_action_event.payload.clear
       events.clear
       tags.clear
       sanitized_environment.clear
       sanitized_session_data.clear
       @env = nil
+      @truncated = true
+    end
+
+    def truncated?
+      !! @truncated
     end
 
     def convert_values_to_primitives!
+      return if have_values_been_converted_to_primitives?
       Appsignal::Transaction::ParamsSanitizer.sanitize!(@process_action_event.payload) if @process_action_event
       @events.map do |o|
         Appsignal::Transaction::ParamsSanitizer.sanitize(o.payload)
       end
       add_sanitized_context!
+      @have_values_been_converted_to_primitives = true
+    end
+
+    def have_values_been_converted_to_primitives?
+      !! @have_values_been_converted_to_primitives
     end
 
     def type
@@ -129,6 +141,7 @@
       Appsignal.transactions.delete(@request_id)
       if process_action_event || exception?
         if Appsignal::Pipe.current
+          convert_values_to_primitives!
           Appsignal.logger.debug("Writing transaction to pipe: #{@request_id}")
           Appsignal::Pipe.current.write(self)
         else

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.10.0.beta.0'
+  VERSION = '0.10.0'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -10,12 +10,6 @@ describe Appsignal::Agent do
 
   let(:transaction) { regular_transaction }
 
-  context "supporting objects" do
-    its(:mutex) { should be_a(Mutex) }
-    its(:aggregator) { should be_a(Appsignal::Aggregator) }
-    its(:transmitter) { should be_a(Appsignal::Transmitter) }
-  end
-
   context "pid" do
     its(:master_pid) { should == Process.pid }
     its(:pid) { should == Process.pid }
@@ -61,7 +55,7 @@ describe Appsignal::Agent do
         subject.should_receive(:send_queue).at_least(:twice)
 
         subject.start_thread
-        sleep 1
+        sleep 2
       end
     end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -234,6 +234,15 @@ describe Appsignal::Transaction do
         subject.process_action_event.payload.should be_empty
         subject.events.should be_empty
         subject.tags.should be_empty
+        subject.truncated?.should be_true
+      end
+
+      it "should not truncate twice" do
+        subject.process_action_event.payload.should_receive(:clear).once
+        subject.events.should_receive(:clear).once
+
+        subject.truncate!
+        subject.truncate!
       end
     end
 
@@ -282,6 +291,14 @@ describe Appsignal::Transaction do
           subject
           event_payload.should == before
         end
+
+        it "should not covert to primitives twice" do
+          transaction.convert_values_to_primitives!
+          transaction.have_values_been_converted_to_primitives?.should be_true
+
+          Appsignal::Transaction::ParamsSanitizer.should_not_receive(:sanitize!)
+          transaction.convert_values_to_primitives!
+        end
       end
     end
 
@@ -355,12 +372,20 @@ describe Appsignal::Transaction do
 
       context 'when using pipes' do
         let(:pipe) { double }
-        before { Appsignal::Pipe.stub(:current => pipe) }
+        before do
+          Appsignal::Pipe.stub(:current => pipe)
+          pipe.stub(:write => true)
+          transaction.stub(:convert_values_to_primitives! => true)
+        end
 
         it "should send itself trough the pipe" do
           pipe.should_receive(:write).with(transaction)
         end
 
+        it "should convert itself to primitives" do
+          transaction.should_receive(:convert_values_to_primitives!)
+        end
+
         after { transaction.complete! }
       end
     end

data/spec/lib/appsignal/transmitter_spec.rb

@@ -40,25 +40,18 @@ describe Appsignal::Transmitter do
   end
 
   describe "#http_post" do
-    it "calls Net::HTTP.post_form with the correct params" do
-      post = double(:post)
-      post.should_receive(:[]=).with(
-        'Content-Type',
-        'application/json; charset=UTF-8'
-      )
-      post.should_receive(:[]=).with(
-        'Content-Encoding',
-        'gzip'
-      )
-      post.should_receive(:body=).with(
-        Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED)
-      )
+    before do
       Socket.stub(:gethostname => 'app1.local')
+    end
+
+    subject { instance.send(:http_post, 'the' => 'payload') }
+
+    its(:body) { should == Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED) }
+    its(:path) { should == instance.uri.request_uri }
 
-      Net::HTTP::Post.should_receive(:new).with(
-        instance.uri.request_uri
-      ).and_return(post)
-      instance.send(:http_post, :the => :payload)
+    it "should have the correct headers" do
+      subject['Content-Type'].should == 'application/json; charset=UTF-8'
+      subject['Content-Encoding'].should == 'gzip'
     end
   end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta.0
+  version: 0.10.0
+  prerelease: 
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,104 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -120,8 +135,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -224,26 +239,27 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: eaaf7d6c75bf0cacbef11b40c1931a2cca2c9121
-  data.tar.gz: 1b7b1151ffbde430bc17267d93c7272a224c105d
-SHA512:
-  metadata.gz: 050ba5e12ac07e9f160e6be7711395f18424e4ba7a9ebb4a28cff887db5483d3762a9e70dc693d3bd7be8501663024f5e1f7e01fb67caf338976300d44acd95b
-  data.tar.gz: 05cd41d9e8f821244902433f910be5c42be51174f3d7e42572d84524beefee4e9e2a40bf85a28d876bbe338c89daa0a87e809d18b44a6e17abff406c3585c2b4