appsignal 0.8.6.beta.1 → 0.8.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzlhYWQ4OGJmZTVkOWRhYzIzNGQzNmU5YzJlZGRiNTEwMGMzMTZjNw==
+    MTdmNjgwM2IzMDBmNzE0ZGQxM2IwODRhMzdkM2RhZmVlOTIxNWEzMA==
   data.tar.gz: !binary |-
-    NjY2MTUyOWFjMjUyMGRiNWZjYjNhYTc1MDQ1OTk2MjI1NDA4ZmI5OQ==
+    YTA1OWI5NjBmN2FmZmIwOGMxZjRkMmEwODkxODkwMDNiMDliMGI3YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmMwOTdkMjBmM2RjY2M0Y2ViYmFhNzc3NGEwY2IyNzU5YzAyMmMzZWNkNDI2
-    ZTA0MGQzYTk0YzM0YWVjYTJmN2Q3NDMxNmYyNTgwMTVkYWM1ZmYzMWU3MDc2
-    ZmIxYTU1MmZkNTA4NjBiM2M5ZjkxZjcyYTYwYTI3MGUyZWVhNTE=
+    ZWQ2ZTE0Y2I3NjM2MDljZGZmYmFlOWI3NmQ2MGNiNWJiODJhYWNjMWY3MjYx
+    MjQyN2ZlODQ2M2ZkZGI2MmMyZjIwYTcxNGFhZDk3OTFiZDg4NGVjNmFlMDdk
+    MGUxMzliYzdjNjA0YTQ4YWEwMDJjMTk2MzdiMDQ3NzQ4NzZiMzU=
   data.tar.gz: !binary |-
-    NGM3MWMwOTRmN2MxYmRiMWE5NmUyMzE5ODU1MDllOWQxMGZjZWU5YTMzMjcx
-    ZWIzMWNjYTQzZjdiMTg2MmVmNjZmNGMzZDFjNTc5ZWFjNWRkOGM1OTQ4Mzdh
-    ZTQxMmZkNGVjYzgyOWMwZjJiNjViMzY1OTRhZmY4NDdhZWU5NWQ=
+    Y2RjZmEzMDg0ZTJhYWFkMzMwYTQxZTE4ZGI0NzMzYzc5ODFjNjZlN2IzMDFi
+    NjljNTljNmYwMzU1NTFmNGU2ZTE4MWNhMzgzMjA1Y2M3ZGJlODg2NmQwMTAy
+    NzUzZTQ5ZGUzMGQ4ZjNiMDc5YTg4NjRiMWZkMjgwYzYxZjEzZWM=

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # 0.8.6
-* Resque support
+* Resque support (beta)
 * Support tags in Appsignal.send_exception
 * 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 
+* Remove --repository option in CLI
+* Name option in appsignal notify_of_deploy CLI
+* Don't call to_hash on ENV
+* Get error message in CLI when config is not active
 
 # 0.8.5
 * Don't require revision in CLI notify_of_deploy

data/lib/appsignal.rb

@@ -63,7 +63,7 @@ module Appsignal
 
     def send_exception(exception, tags=nil)
       return if is_ignored_exception?(exception)
-      transaction = Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
+      transaction = Appsignal::Transaction.create(SecureRandom.uuid, ENV)
       transaction.add_exception(exception)
       transaction.set_tags(tags) if tags
       transaction.complete!

data/lib/appsignal/cli.rb

@@ -8,10 +8,11 @@ module Appsignal
     AVAILABLE_COMMANDS = %w(notify_of_deploy).freeze
 
     class << self
-      attr_accessor :options, :config
+      attr_accessor :options, :config, :initial_config
 
       def run(argv=ARGV)
         @options = {}
+        @initial_config = {}
         global = global_option_parser
         commands = command_option_parser
         global.order!(argv)
@@ -43,7 +44,7 @@ module Appsignal
         @config ||= Appsignal::Config.new(
           ENV['PWD'],
           options[:environment],
-          {},
+          @initial_config,
           logger
         )
       end
@@ -76,10 +77,6 @@ module Appsignal
               options[:revision] = arg
             end
 
-            o.on '--repository=<repository>', "The location of the main code repository" do |arg|
-              options[:repository] = arg
-            end
-
             o.on '--user=<user>', "The name of the user that's deploying" do |arg|
               options[:user] = arg
             end
@@ -87,18 +84,21 @@ module Appsignal
             o.on '--environment=<rails_env>', "The environment you're deploying to" do |arg|
               options[:environment] = arg
             end
+
+            o.on '--name=<name>', "The name of the app (optional)" do |arg|
+              initial_config[:name] = arg
+            end
           end
         }
       end
 
       def notify_of_deploy
-        validate_config_loaded
+        validate_active_config
         validate_required_options([:revision, :user, :environment])
 
         Appsignal::Marker.new(
           {
             :revision => options[:revision],
-            :repository => options[:repository],
             :user => options[:user]
           },
           config,
@@ -118,8 +118,8 @@ module Appsignal
         end
       end
 
-      def validate_config_loaded
-        unless config.loaded?
+      def validate_active_config
+        unless config.active?
           puts 'Exiting: No config file or push api key env var found'
           exit(1)
         end

data/lib/appsignal/config.rb

@@ -8,6 +8,7 @@ module Appsignal
 
     DEFAULT_CONFIG = {
       :ignore_exceptions => [],
+      :send_params => true,
       :endpoint => 'https://push.appsignal.com/1',
       :slow_request_threshold => 200
     }.freeze

data/lib/appsignal/integrations/delayed_job.rb

@@ -12,7 +12,7 @@ if defined?(::Delayed::Plugin)
 
         def self.invoke_with_instrumentation(job, block)
           begin
-            Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
+            Appsignal::Transaction.create(SecureRandom.uuid, ENV)
             class_name, method_name = job.name.split('#')
             ActiveSupport::Notifications.instrument(
               'perform_job.delayed_job',

data/lib/appsignal/integrations/resque.rb

@@ -6,7 +6,7 @@ if defined?(::Resque)
       module ResquePlugin
 
         def around_perform_resque_plugin(*args)
-          Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
+          Appsignal::Transaction.create(SecureRandom.uuid, ENV)
           ActiveSupport::Notifications.instrument(
             'perform_job.resque',
             :class => self.to_s,

data/lib/appsignal/integrations/sidekiq.rb

@@ -5,7 +5,7 @@ if defined?(::Sidekiq)
     module Integrations
       class SidekiqPlugin
         def call(worker, item, queue)
-          Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
+          Appsignal::Transaction.create(SecureRandom.uuid, ENV)
           ActiveSupport::Notifications.instrument(
             'perform_job.sidekiq',
             :class => item['class'],

data/lib/appsignal/transaction/formatter.rb

@@ -44,6 +44,7 @@ module Appsignal
           o.delete(:class)
           o.delete(:method)
           o.delete(:queue_start)
+          o.delete(:params) unless Appsignal.config[:send_params]
           o[:action] = action
         end
       end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/cli_spec.rb

@@ -9,6 +9,7 @@ describe Appsignal::CLI do
     $stdout = out_stream
     ENV['PWD'] = project_fixture_path
     cli.config = nil
+    cli.initial_config = {}
     cli.options = {:environment => 'production'}
   end
   after do
@@ -61,7 +62,7 @@ describe Appsignal::CLI do
 
   describe "#notify_of_deploy" do
     it "should validate that the config has been loaded and all options have been supplied" do
-      cli.should_receive(:validate_config_loaded)
+      cli.should_receive(:validate_active_config)
       cli.should_receive(:validate_required_options).with(
         [:revision, :user, :environment]
       )
@@ -75,7 +76,6 @@ describe Appsignal::CLI do
       Appsignal::Marker.should_receive(:new).with(
         {
           :revision => 'aaaaa',
-          :repository => 'git@github.com:our/project.git',
           :user => 'thijs'
         },
         kind_of(Appsignal::Config),
@@ -86,18 +86,19 @@ describe Appsignal::CLI do
       cli.run([
         'notify_of_deploy',
         '--revision=aaaaa',
-        '--repository=git@github.com:our/project.git',
         '--user=thijs',
         '--environment=production'
       ])
     end
 
-    it "should notify of a deploy without repository" do
+    it "should notify of a deploy with no config file and a name specified" do
+      ENV['PWD'] = '/nonsense'
+      ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
+
       marker = double
       Appsignal::Marker.should_receive(:new).with(
         {
           :revision => 'aaaaa',
-          :repository => nil,
           :user => 'thijs'
         },
         kind_of(Appsignal::Config),
@@ -107,10 +108,13 @@ describe Appsignal::CLI do
 
       cli.run([
         'notify_of_deploy',
+        '--name=project-production',
         '--revision=aaaaa',
         '--user=thijs',
         '--environment=production'
       ])
+
+      cli.config[:name].should == 'project-production'
     end
   end
 
@@ -161,10 +165,10 @@ describe Appsignal::CLI do
     end
   end
 
-  describe "#validate_config_loaded" do
+  describe "#validate_active_config" do
     context "when config is present" do
       it "should do nothing" do
-        cli.send(:validate_config_loaded)
+        cli.send(:validate_active_config)
         out_stream.string.should be_empty
       end
     end
@@ -174,7 +178,18 @@ describe Appsignal::CLI do
 
       it "should print a message and exit" do
         lambda {
-          cli.send(:validate_config_loaded)
+          cli.send(:validate_active_config)
+        }.should raise_error(SystemExit)
+        out_stream.string.should include('Exiting: No config file or push api key env var found')
+      end
+    end
+
+    context "when config is not active" do
+      before { ENV['PWD'] = '/nonsense' }
+
+      it "should print a message and exit" do
+        lambda {
+          cli.send(:validate_active_config)
         }.should raise_error(SystemExit)
         out_stream.string.should include('Exiting: No config file or push api key env var found')
       end

data/spec/lib/appsignal/config_spec.rb

@@ -17,6 +17,7 @@ describe Appsignal::Config do
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
         :ignore_exceptions => [],
+        :send_params => true,
         :endpoint => 'https://push.appsignal.com/1',
         :slow_request_threshold => 200,
         :push_api_key => 'abc',
@@ -121,6 +122,7 @@ describe Appsignal::Config do
         subject.config_hash.should == {
           :push_api_key => 'push_api_key',
           :ignore_exceptions => [],
+          :send_params => true,
           :endpoint => 'https://push.appsignal.com/1',
           :slow_request_threshold => 200,
           :active => true

data/spec/lib/appsignal/transaction/formatter_spec.rb

@@ -11,8 +11,7 @@ describe Appsignal::Transaction::Formatter do
   before { transaction.stub(:fullpath => '/foo') }
 
   describe "#to_hash" do
-    before { formatter.to_hash }
-    subject { formatter.hash }
+    subject { formatter.to_hash }
 
     context "with a regular request" do
       let(:transaction) { regular_transaction }
@@ -22,19 +21,15 @@ describe Appsignal::Transaction::Formatter do
       its([:request_id]) { should == '1' }
       its([:log_entry]) { should == {
           :action => "BlogPostsController#show",
-          :db_runtime => 500,
           :duration => be_within(0.01).of(100.0),
           :end => 1389783600.1,
           :environment => {},
           :kind => "http_request",
-          :path => "/blog",
-          :request_format => "html",
-          :request_method => "GET",
+          :path => "/foo",
           :session_data => {},
-          :status => "200",
           :time => 1389783600.0,
-          :view_runtime => 500
       } }
+      its([:events]) { should be_nil }
       its([:failed]) { should be_false }
     end
 
@@ -43,7 +38,7 @@ describe Appsignal::Transaction::Formatter do
       before { transaction.truncate! }
 
       context "log_entry content" do
-        subject { formatter.hash[:log_entry] }
+        subject { formatter.to_hash[:log_entry] }
 
         its([:queue_duration]) { should be_within(0.01).of(40.0) }
       end
@@ -57,13 +52,24 @@ describe Appsignal::Transaction::Formatter do
       its([:failed]) { should be_true }
 
       context "log_entry content" do
-        subject { formatter.hash[:log_entry] }
+        subject { formatter.to_hash[:log_entry] }
 
         its([:tags]) { should == {'user_id' => 123} }
+        its([:action]) { should == 'BlogPostsController#show' }
+        its([:params]) { should == {'action' => 'show', 'controller' => 'blog_posts', 'id' => '1'} }
+
+        context "when send_params in the config is false" do
+          before { Appsignal.config.config_hash[:send_params] = false }
+          after { Appsignal.config.config_hash[:send_params] = true }
+
+          it "should not send the params" do
+            subject[:params].should be_nil
+          end
+        end
       end
 
       context "exception content" do
-        subject { formatter.hash[:exception] }
+        subject { formatter.to_hash[:exception] }
 
         its(:keys) { should =~ [:exception, :message, :backtrace] }
         its([:exception]) { should == 'ArgumentError' }
@@ -88,10 +94,39 @@ describe Appsignal::Transaction::Formatter do
 
       its(:keys) { should =~ [:request_id, :log_entry, :failed, :events] }
       its([:request_id]) { should == '1' }
+      its([:log_entry]) { should == {
+          :action => "BlogPostsController#show",
+          :duration => be_within(0.01).of(200.0),
+          :end => 1389783600.200002,
+          :environment => {},
+          :params => {
+            'action' => 'show',
+            'controller' => 'blog_posts',
+            'id' => '1'
+          },
+          :kind => "http_request",
+          :path => "/blog",
+          :session_data => {},
+          :time => 1389783600.0,
+          :db_runtime => 500,
+          :view_runtime => 500,
+          :request_format => 'html',
+          :request_method => 'GET',
+          :status => '200'
+      } }
       its([:failed]) { should be_false }
 
+      context "when send_params in the config is false" do
+        before { Appsignal.config.config_hash[:send_params] = false }
+        after { Appsignal.config.config_hash[:send_params] = true }
+
+        it "should not send the params" do
+          subject[:log_entry][:params].should be_nil
+        end
+      end
+
       context "events content" do
-        subject { formatter.hash[:events] }
+        subject { formatter.to_hash[:events] }
 
         its(:length) { should == 1 }
         its(:first) { should == {
@@ -103,6 +138,11 @@ describe Appsignal::Transaction::Formatter do
             :path => "/blog",
             :action => "show",
             :controller => "BlogPostsController",
+            :params => {
+              'action' => 'show',
+              'controller' => 'blog_posts',
+              'id' => '1'
+            },
             :request_format => "html",
             :request_method => "GET",
             :status => "200",
@@ -116,7 +156,6 @@ describe Appsignal::Transaction::Formatter do
     context "with a background request" do
       let(:payload) { create_background_payload }
       let(:transaction) { background_job_transaction({}, payload) }
-      before { transaction.truncate! }
 
       its(:keys) { should =~ [:request_id, :log_entry, :failed] }
       its([:request_id]) { should == '1' }
@@ -140,7 +179,7 @@ describe Appsignal::Transaction::Formatter do
         let(:payload) { create_background_payload(:queue_start => 0) }
 
         context "log entry" do
-          subject { formatter.hash[:log_entry] }
+          subject { formatter.to_hash[:log_entry] }
 
           its([:queue_duration]) { should be_nil }
         end

data/spec/support/helpers/notification_helpers.rb

@@ -17,6 +17,11 @@ module NotificationHelpers
       :path => '/blog',
       :action => 'show',
       :controller => 'BlogPostsController',
+      :params => {
+        'controller' => 'blog_posts',
+        'action' => 'show',
+        'id' => '1'
+      },
       :request_format => 'html',
       :request_method => "GET",
       :status => '200',

data/spec/support/helpers/transaction_helpers.rb

@@ -12,7 +12,7 @@ module TransactionHelpers
   end
 
   def transaction_with_exception
-    appsignal_transaction.tap do |o|
+    appsignal_transaction(:process_action_event => notification_event).tap do |o|
       o.set_tags('user_id' => 123)
       begin
         raise ArgumentError, 'oh no'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.6.beta.1
+  version: 0.8.6
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -241,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3