appsignal 0.11.4.beta.0 → 0.11.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4c8ab8dd23da24db4847a9f58aa98010d54a15ea
+  data.tar.gz: 043115dbfa42457092430ea5aa7f4378f39f81ea
+SHA512:
+  metadata.gz: c5f91a18470ba264264e86a1f9bdffd2bb555e654d2228fc24413876e7bfb0c17f00a52d1ee9056dfa875184159a49c4438bf2740fe0c3d93041cde07df3a6a8
+  data.tar.gz: dc58b2e4361a927b3e274968746f9d155e1c0e33ebe4e5fc2d5fe173bd7bac5e1155458183a8eec0feec3b4b80d2bca9e3de17f378ada9f5a9580032497456f7

data/CHANGELOG.md

@@ -1,5 +1,5 @@
 # 0.11.4
-* Set SSL version to TLSv1 explicitely
+* Make `without_instrumentation` thread safe
 
 # 0.11.3
 * Support Ruby 1.9 and up instead of 1.9.3 and up

data/lib/appsignal.rb

@@ -175,10 +175,10 @@ module Appsignal
     #
     # @since 0.8.7
     def without_instrumentation
-      agent.paused = true if agent
+      Appsignal::Transaction.current.pause! if Appsignal::Transaction.current
       yield
     ensure
-      agent.paused = false if agent
+      Appsignal::Transaction.current.resume! if Appsignal::Transaction.current
     end
   end
 end

data/lib/appsignal/agent.rb

@@ -73,7 +73,7 @@ module Appsignal
           elsif event.name.start_with?('perform_job')
             Appsignal::Transaction.current.set_perform_job_event(event)
           end
-          Appsignal::Transaction.current.add_event(event) unless paused
+          Appsignal::Transaction.current.add_event(event)
         end
       end
     end

data/lib/appsignal/transaction.rb

@@ -31,7 +31,7 @@ module Appsignal
     end
 
     attr_reader :request_id, :events, :process_action_event, :action, :exception,
-                :env, :fullpath, :time, :tags, :kind, :queue_start
+                :env, :fullpath, :time, :tags, :kind, :queue_start, :paused
 
     def initialize(request_id, env)
       Appsignal.transactions[request_id] = self
@@ -41,6 +41,7 @@ module Appsignal
       @exception = nil
       @env = env
       @tags = {}
+      @paused = false
     end
 
     def sanitized_environment
@@ -59,6 +60,14 @@ module Appsignal
       @tags.merge!(given_tags)
     end
 
+    def pause!
+      @paused = true
+    end
+
+    def resume!
+      @paused = false
+    end
+
     def set_process_action_event(event)
       return unless event && event.payload
       @process_action_event = event.dup
@@ -76,7 +85,7 @@ module Appsignal
     end
 
     def add_event(event)
-      @events << event
+      @events << event unless @paused == true
     end
 
     def add_exception(ex)

data/lib/appsignal/transmitter.rb

@@ -62,10 +62,9 @@ module Appsignal
     def http_client
       Net::HTTP.new(uri.host, uri.port).tap do |http|
         if uri.scheme == 'https'
-          http.use_ssl     = true
+          http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          http.ssl_version = :TLSv1
-          http.ca_file     = CA_FILE_PATH
+          http.ca_file = CA_FILE_PATH
         end
       end
     end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/agent_spec.rb

@@ -189,16 +189,6 @@ describe Appsignal::Agent do
         ActiveSupport::Notifications.instrument 'render_template'
       end
 
-      context "when paused" do
-        it "should add a normal event" do
-          Appsignal::Transaction.current.should_not_receive(:add_event)
-
-          Appsignal.without_instrumentation do
-            ActiveSupport::Notifications.instrument 'moo'
-          end
-        end
-      end
-
       it "should add and set a process action event" do
         Appsignal::Transaction.current.should_receive(:set_process_action_event).with(
           kind_of(ActiveSupport::Notifications::Event)

data/spec/lib/appsignal/transaction_spec.rb

@@ -147,6 +147,34 @@ describe Appsignal::Transaction do
           transaction.add_event(event)
         }.to change(transaction, :events).to([event])
       end
+
+      context "when paused" do
+        before { transaction.pause! }
+
+        it 'should add an event' do
+          expect {
+            transaction.add_event(event)
+          }.to_not change(transaction, :events)
+        end
+      end
+    end
+
+    describe "#pause!" do
+      it "should change the pause flag to true" do
+        expect{
+          transaction.pause!
+        }.to change(transaction, :paused).from(false).to(true)
+      end
+    end
+
+    describe "#resume!" do
+      before { transaction.pause! }
+
+      it "should change the pause flag to false" do
+        expect{
+          transaction.resume!
+        }.to change(transaction, :paused).from(true).to(false)
+      end
     end
 
     context "using exceptions" do

data/spec/lib/appsignal_spec.rb

@@ -484,18 +484,16 @@ describe Appsignal do
     end
 
     describe ".without_instrumentation" do
-      let(:agent) { double }
-      before do
-        Appsignal.stub(:agent => agent)
-      end
+      let(:transaction) { double }
+      before { Appsignal::Transaction.stub(:current => transaction) }
 
-      it "should pause and unpause the agent around the block" do
-        agent.should_receive(:paused=).with(true)
-        agent.should_receive(:paused=).with(false)
+      it "should pause and unpause the transaction around the block" do
+        transaction.should_receive(:pause!)
+        transaction.should_receive(:resume!)
       end
 
-      context "without agent" do
-        let(:agent) { nil }
+      context "without transaction" do
+        let(:transaction) { nil }
 
         it "should not crash" do
           # just execute the after block

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.4.beta.0
-  prerelease: 7
+  version: 0.11.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,118 +12,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-05 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
@@ -135,9 +120,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -247,27 +232,26 @@ 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'
 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: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb