appsignal 1.1.4 → 1.1.5.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7960630ace02b918e79bdf0f96f6ede375f55ca5
-  data.tar.gz: cab86c9d17a56711d27f5381b5a2a3b94dd4c297
+  metadata.gz: cfdc08fdd42809a6cffc841c28a20596d2db3f3d
+  data.tar.gz: 9f892def0286d4b5cbcb247c31132cee44b69def
 SHA512:
-  metadata.gz: 6035b7e1754f58813908c1249ab1a0c6e5714d1ef6554f138ab4287ac01ff1a7ccef40cf5c23c697058eee493c2bb79a9d83df07512e240f41b993b0e898fa86
-  data.tar.gz: a659b1e90e25bfab546a70013a16b084fb12c364120d986dd6b0b8bff4039c73098fb1782d779eae870508ab8f6fe69757c7fb1c9f4fa6cb6aa903a0777284f4
+  metadata.gz: fed1598d4d05ec88e9eeb400eb53b94af578b3c0d7184ecb3213d1c517250f53b44fe3cee4ef63c1b9a2a8d509f66439f10ba8c2c089da7cdee84922493d70d7
+  data.tar.gz: 1ea337a28fbc4817b820aa0cd78d9767f9f8a1cf77dccaa1ffd56cb8a4106a880b0c8ef05c5ae7a49f877869597205a1da44f41e98ad60f1757a690826d6f518

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.5
+* Support for null in sql sanitization
+* Add require to deploy.rb if present on installation
+* Warn when overwriting already existing transaction
+* Support for x86-linux
+
 # 1.1.4
 * Better debug logging for agent issues
 * Fix for exception with nil messages

data/ext/agent.yml

@@ -1,15 +1,19 @@
 ---
-version: 9cf5b1c
+version: 1776f03
 triples:
   x86_64-linux:
-    checksum: e98ae2281a1b27d623dbd48105d9953f4cfbaaa4df3a24c4b87a6c04978da650
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9cf5b1c/appsignal-agent-x86_64-linux-static.tar.gz
+    checksum: e7762cef292e9449e4d86f833ee7a80651845c3847122b4d4d995fb171462697
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/1776f03/appsignal-agent-x86_64-linux-static.tar.gz
     lib_filename: libappsignal.a
   i686-linux:
-    checksum: a8532d937900c17ab7f262eaceb66cb97722a615135ba5d43d0c17433e5573c0
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9cf5b1c/appsignal-agent-i686-linux-static.tar.gz
+    checksum: 0407af36bc2d417a6fa5533f75f442489b71c4df7dc744421e199b2949d57d1f
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/1776f03/appsignal-agent-i686-linux-static.tar.gz
+    lib_filename: libappsignal.a
+  x86-linux:
+    checksum: 0407af36bc2d417a6fa5533f75f442489b71c4df7dc744421e199b2949d57d1f
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/1776f03/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86_64-darwin:
-    checksum: 7df7bbb218fe6f62e2d5e3b6919f1ae0aa8a37fa05912a027d0bced07ade8676
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9cf5b1c/appsignal-agent-x86_64-darwin-static.tar.gz
+    checksum: 5438333a6402ca07a606387086e4206a7fd7b5d884a291ccf44f9dffd39bd7c3
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/1776f03/appsignal-agent-x86_64-darwin-static.tar.gz
     lib_filename: libappsignal.a

data/lib/appsignal/cli/install.rb

@@ -187,6 +187,17 @@ module Appsignal
         end
 
         def configure(config, environments, name_overwritten)
+          deploy_rb_file = File.join(ENV['PWD'], 'config/deploy.rb')
+          if File.exists?(deploy_rb_file) && (File.read(deploy_rb_file) =~ /require (\'|\").\/appsignal\/capistrano/).nil?
+            print 'Adding AppSignal integration to deploy.rb'
+            File.open(deploy_rb_file, 'a') do |f|
+              f.write "\nrequire 'appsignal/capistrano'\n"
+            end
+            periods
+            puts
+            puts
+          end
+
           puts "How do you want to configure AppSignal?"
           puts "  (1) a config file"
           puts "  (2) environment variables"

data/lib/appsignal/transaction.rb

@@ -17,7 +17,19 @@ module Appsignal
 
     class << self
       def create(id, namespace, request, options={})
-        Thread.current[:appsignal_transaction] = Appsignal::Transaction.new(id, namespace, request, options)
+        # Check if we already have a running transaction
+        if Thread.current[:appsignal_transaction] != nil
+
+          # Log the issue and return the current transaction
+          Appsignal.logger.debug("Trying to start new transaction #{id} but #{current.transaction_id} is already running. Using #{current.transaction_id}")
+
+          # Return the current (running) transaction
+          current
+
+        # Otherwise, start a new transaction
+        else
+          Thread.current[:appsignal_transaction] = Appsignal::Transaction.new(id, namespace, request, options)
+        end
       end
 
       def current

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.1.4'
+  VERSION = '1.1.5.beta.1'
 end

data/spec/lib/appsignal/cli/install_spec.rb

@@ -374,6 +374,27 @@ describe Appsignal::CLI::Install do
         out_stream.string.should include("Config file written to config/appsignal.yml")
       end
     end
+
+    context "when deploy.rb is present" do
+      let(:config_dir) { File.join(tmp_dir, 'config') }
+      let(:deploy_rb_file) { File.join(tmp_dir, 'config/deploy.rb') }
+      before do
+        ENV['PWD'] = tmp_dir
+        FileUtils.mkdir_p(config_dir)
+        FileUtils.touch(deploy_rb_file)
+        cli.should_receive(:gets).once.and_return('2')
+      end
+      after do
+        FileUtils.rm_rf(config_dir)
+      end
+
+      it "should add a require to deploy.rb" do
+        cli.configure(config, [], false)
+
+        out_stream.string.should include 'Adding AppSignal integration to deploy.rb'
+        File.read(deploy_rb_file).should include "require 'appsignal/capistrano'"
+      end
+    end
   end
 
   describe ".done_notice" do

data/spec/lib/appsignal/transaction_spec.rb

@@ -17,33 +17,56 @@ describe Appsignal::Transaction do
   let(:merged_env)  { http_request_env_with_data(env) }
   let(:options)     { {} }
   let(:request)     { Rack::Request.new(merged_env) }
-  let(:transaction) { Appsignal::Transaction.create('1', namespace, request, options) }
+  let(:transaction) { Appsignal::Transaction.new('1', namespace, request, options) }
 
   before { Timecop.freeze(time) }
   after  { Timecop.return }
 
   context "class methods" do
     describe ".create" do
-      subject { transaction }
 
       it "should add the transaction to thread local" do
         Appsignal::Extension.should_receive(:start_transaction).with('1', 'http_request')
-        subject
-        Thread.current[:appsignal_transaction].should == subject
+
+        created_transaction = Appsignal::Transaction.create('1', namespace, request, options)
+
+        Thread.current[:appsignal_transaction].should == created_transaction
       end
 
       it "should create a transaction" do
-        subject.should be_a Appsignal::Transaction
-        subject.transaction_id.should == '1'
-        subject.namespace.should == 'http_request'
+        created_transaction = Appsignal::Transaction.create('1', namespace, request, options)
+
+        created_transaction.should be_a Appsignal::Transaction
+        created_transaction.transaction_id.should == '1'
+        created_transaction.namespace.should == 'http_request'
+      end
+
+      context "when a transaction is already running" do
+        let(:running_transaction) { double(:transaction_id => 2) }
+        before { Thread.current[:appsignal_transaction] = running_transaction }
+
+        it "should not create a new transaction" do
+          expect(
+            Appsignal::Transaction.create('1', namespace, request, options)
+          ).to eq(running_transaction)
+        end
+
+        it "should output a debug message" do
+          expect( Appsignal.logger ).to receive(:debug)
+            .with("Trying to start new transaction 1 but 2 is already running. Using 2")
+
+          Appsignal::Transaction.create('1', namespace, request, options)
+        end
       end
     end
 
     describe '.current' do
+      before { Thread.current[:appsignal_transaction] = transaction }
+
       subject { Appsignal::Transaction.current }
 
       context "if there is a transaction" do
-        before { transaction }
+        before { Appsignal::Transaction.create('1', namespace, request, options) }
 
         it "should return the correct transaction" do
           should == transaction

data/spec/spec_helper.rb

@@ -128,6 +128,10 @@ RSpec.configure do |config|
     FileUtils.mkdir_p(tmp_dir)
   end
 
+  config.after do
+    Thread.current[:appsignal_transaction] = nil
+  end
+
   config.before do
     ENV['PWD'] = File.expand_path(File.join(File.dirname(__FILE__), '../'))
     ENV['RAILS_ENV'] = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -291,9 +291,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