appsignal 0.11.13 → 0.11.14.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939d3b7a54a4b39ec139e95f135fcd25565fac74
-  data.tar.gz: d186dc6f7a065ae88bff571e3963955dd0bf74a0
+  metadata.gz: 19f6aa00101f3a4629f9d5d7393ddace658ee343
+  data.tar.gz: 22377b463a085c914a89dd38635806f24ec97724
 SHA512:
-  metadata.gz: c8f57aee9899c31b32997a99652702c36f9e3234d35c1e29acfcfc40d19285bd28a1cc244818c0cdbc6fcf804fa3680c770a83929e51765f46c52ae2524807b2
-  data.tar.gz: d5f6ea1bcf79f0c5c23e169baff789e52a5c6ee8f0f75717ed285b3f84aa147694ae403f430a0007e967aae7b706a371c9b00b54174a577176dc77cf65d7a271
+  metadata.gz: 4ee40a6f511ac2bc1e4e3c439a99ac45a1f434538745e96bdd822ac85bdf7272dc5bd9d3458a6e6f3f96264beaa7772f2c995f5f1518376d57fe87a8e4e49413
+  data.tar.gz: d92cc1b8994f031eae4b088853ac59e205c6493e182592d98b25cfc841a968568d41d4b93f8a633079ded8c9ff3e583ea4d956d778ac55211d89844235bcc8b3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.11.14
+* Support ActiveJob wrapped jobs
+* Improve proxy support
+* Improve rake support
+
 # 0.11.13
 * Add Padrino support
 * Add Rake task monitoring

data/lib/appsignal/integrations/rake.rb

@@ -3,6 +3,14 @@ module Rake
     alias_method :invoke_without_appsignal, :invoke
 
     def invoke(*args)
+      if Appsignal.active?
+        invoke_with_appsignal(*args)
+      else
+        invoke_without_appsignal(*args)
+      end
+    end
+
+    def invoke_with_appsignal(*args)
       transaction = Appsignal::Transaction.create(
         SecureRandom.uuid,
         ENV,

data/lib/appsignal/integrations/sidekiq.rb

@@ -15,7 +15,7 @@ if defined?(::Sidekiq)
         def call(worker, item, queue)
           Appsignal.monitor_transaction(
             'perform_job.sidekiq',
-            :class       => item['class'],
+            :class       => item['wrapped'] || item['class'],
             :method      => 'perform',
             :metadata    => formatted_metadata(item),
             :params      => format_args(item['args']),

data/lib/appsignal/params_sanitizer.rb

@@ -25,8 +25,10 @@ module Appsignal
           sanitize_hash(value)
         when Array
           sanitize_array(value)
-        when Fixnum, String, Symbol
+        when Fixnum, String, Symbol, Float
           unmodified(value)
+        when TrueClass, FalseClass
+          stringified(value)
         else
           inspected(value)
         end
@@ -46,6 +48,10 @@ module Appsignal
         target_array
       end
 
+      def stringified(value)
+        value.to_s
+      end
+
       def unmodified(value)
         value
       end

data/lib/appsignal/transmitter.rb

@@ -62,7 +62,13 @@ module Appsignal
     end
 
     def http_client
-      Net::HTTP.new(uri.host, uri.port, proxy_addr, proxy_port).tap do |http|
+      client = if config[:http_proxy]
+        Net::HTTP.new(uri.host, uri.port, proxy_addr, proxy_port)
+      else
+        Net::HTTP.new(uri.host, uri.port)
+      end
+
+      client.tap do |http|
         if uri.scheme == 'https'
           http.use_ssl     = true
           http.ssl_version = :TLSv1

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.13'
+  VERSION = '0.11.14.beta.1'
 end

data/spec/lib/appsignal/integrations/rake_spec.rb

@@ -6,20 +6,35 @@ describe "Rack integration" do
   let(:task) { Rake::Task.new('task', app) }
   before do
     load file
+    task.stub(
+      :name                     => 'task:name',
+      :invoke_without_appsignal => true
+    )
   end
 
   describe "#invoke" do
-    before do
-      task.stub(
-        :name                     => 'task:name',
-        :invoke_without_appsignal => true
-      )
+    before { Appsignal.stub(:active? => true) }
+
+    it "should call with appsignal monitoring" do
+      expect( task ).to receive(:invoke_with_appsignal).with(['foo'])
     end
 
-    it "should create a transaction" do
-      expect( Appsignal::Transaction ).to receive(:create)
+    context "when not active" do
+      before { Appsignal.stub(:active? => false) }
+
+      it "should NOT call with appsignal monitoring" do
+        expect( task ).to_not receive(:invoke_with_appsignal).with(['foo'])
+      end
+
+      it "should call the original task" do
+        expect( task ).to receive(:invoke_without_appsignal).with(['foo'])
+      end
     end
 
+    after { task.invoke(['foo']) }
+  end
+
+  describe "#invoke_with_appsignal" do
     context "with transaction" do
       let!(:transaction) { Appsignal::Transaction.new('123', {}) }
       let!(:agent)       { double('Agent', :send_queue => true) }
@@ -81,6 +96,6 @@ describe "Rack integration" do
       end
     end
 
-    after { task.invoke('foo') rescue VerySpecificError }
+    after { task.invoke_with_appsignal('foo') rescue VerySpecificError }
   end
 end

data/spec/lib/appsignal/integrations/sidekiq_spec.rb

@@ -47,6 +47,23 @@ describe "Sidekiq integration" do
       )
     end
 
+    it "reports the correct job class for a ActiveJob wrapped job" do
+      item['wrapped'] = 'ActiveJobClass'
+      Appsignal.should_receive(:monitor_transaction).with(
+        'perform_job.sidekiq',
+        :class    => 'ActiveJobClass',
+        :method   => 'perform',
+        :metadata => {
+          'retry_count' => "0",
+          'queue'       => 'default',
+          'extra'       => 'data',
+          'wrapped'     => 'ActiveJobClass'
+        },
+        :params      => ['Model', "1"],
+        :queue_start => Time.parse('01-01-2001 10:00:00UTC')
+      )
+    end
+
     after do
       Timecop.freeze(Time.parse('01-01-2001 10:01:00UTC')) do
         Appsignal::Integrations::SidekiqPlugin.new.call(worker, item, queue) do

data/spec/lib/appsignal/params_sanitizer_spec.rb

@@ -17,16 +17,20 @@ describe Appsignal::ParamsSanitizer do
   let(:file) { uploaded_file }
   let(:params) do
     {
-      :text => 'string',
-      :file => file,
-      :hash => {
-        :nested_text => 'string',
+      :text       => 'string',
+      :file       => file,
+      :float      => 0.0,
+      :bool_true  => true,
+      :bool_false => false,
+      :int        => 1,
+      :hash       => {
+        :nested_text  => 'string',
         :nested_array => [
           'something',
           'else',
           file,
           {
-            :key => 'value',
+            :key  => 'value',
             :file => file,
           },
           ErrorOnInspect.new,
@@ -43,9 +47,13 @@ describe Appsignal::ParamsSanitizer do
     before { klass.sanitize!(subject) }
 
     it { should be_instance_of Hash }
-    its([:text]) { should == 'string' }
-    its([:file]) { should be_instance_of String }
-    its([:file]) { should include '::UploadedFile' }
+    its([:text])        { should == 'string' }
+    its([:file])        { should be_instance_of String }
+    its([:file])        { should include '::UploadedFile' }
+    its([:float])       { should == 0.0 }
+    its([:int])         { should == 1 }
+    its([:bool_true])   { should == 'true' }
+    its([:bool_false])  { should == 'false' }
 
     context "hash" do
       subject { params[:hash] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.13
+  version: 0.11.14.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -261,9 +261,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.4.5