appsignal 2.4.3 → 2.5.0.alpha.1

data/lib/appsignal/hooks/sidekiq.rb

@@ -22,10 +22,10 @@ module Appsignal
     class SidekiqPlugin
       include Appsignal::Hooks::Helpers
 
-      JOB_KEYS = %w(
+      JOB_KEYS = %w[
         args backtrace class created_at enqueued_at error_backtrace error_class
         error_message failed_at jid retried_at retry wrapped
-      ).freeze
+      ].freeze
 
       def call(_worker, item, _queue)
         transaction = Appsignal::Transaction.create(
@@ -90,7 +90,7 @@ module Appsignal
           end
         when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
           job_class = job["wrapped"] || args[0]
-          if "ActionMailer::DeliveryJob" == job_class
+          if job_class == "ActionMailer::DeliveryJob"
             # MailerClass#mailer_method
             args[0]["arguments"][0..1].join("#")
           else
@@ -112,7 +112,7 @@ module Appsignal
         when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
           is_wrapped = job["wrapped"]
           job_args = is_wrapped ? args[0]["arguments"] : []
-          if "ActionMailer::DeliveryJob" == (is_wrapped || args[0])
+          if (is_wrapped || args[0]) == "ActionMailer::DeliveryJob"
             # Remove MailerClass, mailer_method and "deliver_now"
             job_args.drop(3)
           else

data/lib/appsignal/integrations/capistrano/appsignal.cap

@@ -7,9 +7,14 @@ namespace :appsignal do
     appsignal_config = Appsignal::Config.new(
       ENV["PWD"],
       appsignal_env,
-      fetch(:appsignal_config, {}),
+      {},
       Logger.new(StringIO.new)
-    )
+    ).tap do |c|
+      fetch(:appsignal_config, {}).each do |key, value|
+        c[key] = value
+      end
+      c.validate
+    end
 
     if appsignal_config && appsignal_config.active?
       marker_data = {

data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb

@@ -3,7 +3,7 @@ module Appsignal
   # @api private
   class Capistrano
     def self.tasks(config)
-      config.load do
+      config.load do # rubocop:disable Metrics/BlockLength
         after "deploy", "appsignal:deploy"
         after "deploy:migrations", "appsignal:deploy"
 
@@ -16,9 +16,14 @@ module Appsignal
             appsignal_config = Appsignal::Config.new(
               ENV["PWD"],
               env,
-              fetch(:appsignal_config, {}),
+              {},
               Logger.new(StringIO.new)
-            )
+            ).tap do |c|
+              fetch(:appsignal_config, {}).each do |key, value|
+                c[key] = value
+              end
+              c.validate
+            end
 
             if appsignal_config && appsignal_config.active?
               marker_data = {

data/lib/appsignal/system.rb

@@ -40,7 +40,18 @@ module Appsignal
     def self.agent_platform
       return MUSL_TARGET if ENV["APPSIGNAL_BUILD_FOR_MUSL"]
 
-      local_os = Gem::Platform.local.os
+      host_os = RbConfig::CONFIG["host_os"].downcase
+      local_os =
+        case host_os
+        when /linux/
+          "linux"
+        when /darwin/
+          "darwin"
+        when /freebsd/
+          "freebsd"
+        else
+          host_os
+        end
       if local_os =~ /linux/
         ldd_output = ldd_version_output
         return MUSL_TARGET if ldd_output.include? "musl"
@@ -62,5 +73,9 @@ module Appsignal
     def self.ldd_version_output
       `ldd --version 2>&1`
     end
+
+    def self.jruby?
+      RUBY_PLATFORM == "java"
+    end
   end
 end

data/lib/appsignal/transaction.rb

@@ -9,7 +9,7 @@ module Appsignal
     BLANK          = "".freeze
 
     # Based on what Rails uses + some variables we'd like to show
-    ENV_METHODS = %w(
+    ENV_METHODS = %w[
       CONTENT_LENGTH AUTH_TYPE GATEWAY_INTERFACE
       PATH_TRANSLATED REMOTE_HOST REMOTE_IDENT REMOTE_USER REMOTE_ADDR
       REQUEST_METHOD SERVER_NAME SERVER_PORT SERVER_PROTOCOL REQUEST_URI
@@ -21,7 +21,7 @@ module Appsignal
       HTTP_CACHE_CONTROL HTTP_CONNECTION HTTP_USER_AGENT HTTP_FROM
       HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR
       HTTP_CLIENT_IP HTTP_RANGE
-    ).freeze
+    ].freeze
 
     class << self
       def create(id, namespace, request, options = {})

data/lib/appsignal/utils.rb

@@ -104,7 +104,9 @@ module Appsignal
           when Numeric, NilClass, TrueClass, FalseClass
             value
           when Hash
-            Hash[value.map { |k, v| [jsonify(k), jsonify(v)] }]
+            value.each_with_object({}) do |(k, v), hash|
+              hash[jsonify(k)] = jsonify(v)
+            end
           when Array
             value.map { |v| jsonify(v) }
           else

data/lib/appsignal/version.rb

@@ -1,5 +1,3 @@
-require "yaml"
-
 module Appsignal
-  VERSION = "2.4.3".freeze
+  VERSION = "2.5.0.alpha.1".freeze
 end

data/spec/.rubocop.yml

@@ -1,4 +1,7 @@
 inherit_from: ../.rubocop.yml
 
+Metrics/BlockLength:
+  Enabled: false
+
 # Metrics/LineLength:
 #   Max: 100

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -25,7 +25,7 @@ if DependencyHelper.capistrano2_present?
       end
     end
 
-    it "should have a deploy task" do
+    it "has a deploy task" do
       expect(capistrano_config.find_task("appsignal:deploy")).to_not be_nil
     end
 
@@ -40,27 +40,25 @@ if DependencyHelper.capistrano2_present?
           capistrano_config.dry_run = true
         end
 
-        it "should be instantiated with the right params" do
-          expect(Appsignal::Config).to receive(:new).with(
-            project_fixture_path,
-            "production",
-            {},
-            kind_of(Logger)
-          )
-        end
-
         context "when appsignal_config is available" do
           before do
-            capistrano_config.set(:appsignal_config, :name => "AppName")
+            capistrano_config.set(
+              :appsignal_config,
+              :name => "AppName",
+              :active => true,
+              :push_api_key => "abc"
+            )
           end
 
-          it "should be instantiated with the right params" do
-            expect(Appsignal::Config).to receive(:new).with(
-              project_fixture_path,
-              "production",
-              { :name => "AppName" },
-              kind_of(Logger)
-            )
+          it "overrides the default config with the custom appsignal_config" do
+            original_new = Appsignal::Marker.method(:new)
+
+            expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+              expect(given_config[:name]).to eq("AppName")
+              original_new.call(data, given_config)
+            end
+
+            run
           end
 
           context "when rack_env is used instead of rails_env" do
@@ -69,13 +67,15 @@ if DependencyHelper.capistrano2_present?
               capistrano_config.set(:rack_env, "rack_production")
             end
 
-            it "should be instantiated with the right params" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "rack_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
+            it "uses the rack_env as the env" do
+              original_new = Appsignal::Marker.method(:new)
+
+              expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+                expect(given_config.env).to eq("rack_production")
+                original_new.call(data, given_config)
+              end
+
+              run
             end
           end
 
@@ -85,13 +85,15 @@ if DependencyHelper.capistrano2_present?
               capistrano_config.set(:stage, "stage_production")
             end
 
-            it "should be instantiated with the right params" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "stage_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
+            it "uses the stage as the env" do
+              original_new = Appsignal::Marker.method(:new)
+
+              expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+                expect(given_config.env).to eq("stage_production")
+                original_new.call(data, given_config)
+              end
+
+              run
             end
           end
 
@@ -102,18 +104,30 @@ if DependencyHelper.capistrano2_present?
               capistrano_config.set(:appsignal_env, "appsignal_production")
             end
 
-            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "appsignal_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
+            it "uses the appsignal_env as the env" do
+              original_new = Appsignal::Marker.method(:new)
+
+              expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+                expect(given_config.env).to eq("appsignal_production")
+                original_new.call(data, given_config)
+              end
+
+              run
             end
           end
-        end
 
-        after { run }
+          context "with invalid config" do
+            before do
+              capistrano_config.set(:appsignal_config, :push_api_key => nil)
+            end
+
+            it "does not continue with invalid config" do
+              run
+              expect(output).to include \
+                "Not notifying of deploy, config is not active for environment: production"
+            end
+          end
+        end
       end
 
       describe "markers" do

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -21,6 +21,12 @@ if DependencyHelper.capistrano3_present?
         c.set(:current_revision, "503ce0923ed177a3ce000005")
       end
     end
+    let(:marker_data) do
+      {
+        :revision => "503ce0923ed177a3ce000005",
+        :user => "batman"
+      }
+    end
     before { Rake::Task["appsignal:deploy"].reenable }
 
     def run
@@ -40,94 +46,110 @@ if DependencyHelper.capistrano3_present?
       end
 
       context "config" do
-        it "should be instantiated with the right params" do
-          expect(Appsignal::Config).to receive(:new).with(
-            project_fixture_path,
-            "production",
-            {},
-            kind_of(Logger)
+        let(:env) { "production" }
+        before do
+          capistrano_config.set(
+            :appsignal_config,
+            :name => "AppName",
+            :active => true,
+            :push_api_key => "abc"
           )
+          config[:name] = "AppName"
+          config.instance_variable_set(:@env, env)
+          stub_marker_request.to_return(:status => 200)
         end
 
-        context "when appsignal_config is available" do
+        context "when rack_env is the only env set" do
+          let(:env) { "rack_production" }
           before do
-            capistrano_config.set(:appsignal_config, :name => "AppName")
+            capistrano_config.delete(:rails_env)
+            capistrano_config.set(:rack_env, env)
           end
 
-          it "should be instantiated with the right params" do
-            expect(Appsignal::Config).to receive(:new).with(
-              project_fixture_path,
-              "production",
-              { :name => "AppName" },
-              kind_of(Logger)
-            )
-          end
+          it "uses the rack_env as the env" do
+            original_new = Appsignal::Marker.method(:new)
 
-          context "when rack_env is the only env set" do
-            before do
-              capistrano_config.delete(:rails_env)
-              capistrano_config.set(:rack_env, "rack_production")
+            expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+              expect(given_config.env).to eq("rack_production")
+              original_new.call(data, given_config)
             end
 
-            it "should be instantiated with the rack env" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "rack_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
-            end
+            run
           end
+        end
 
-          context "when stage is set" do
-            before do
-              capistrano_config.set(:rack_env, "rack_production")
-              capistrano_config.set(:stage, "stage_production")
+        context "when stage is set" do
+          let(:env) { "stage_production" }
+          before do
+            capistrano_config.set(:rack_env, "rack_production")
+            capistrano_config.set(:stage, env)
+          end
+
+          it "prefers the Capistrano stage rather than rails_env and rack_env" do
+            original_new = Appsignal::Marker.method(:new)
+
+            expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+              expect(given_config.env).to eq("stage_production")
+              original_new.call(data, given_config)
             end
 
-            it "should prefer the stage rather than rails_env and rack_env" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "stage_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
+            run
+          end
+        end
+
+        context "when `appsignal_config` is set" do
+          before do
+            ENV["APPSIGNAL_APP_NAME"] = "EnvName"
+            capistrano_config.set(:appsignal_config, :name => "AppName")
+            config[:name] = "AppName"
+          end
+
+          it "overrides the default config with the custom appsignal_config" do
+            original_new = Appsignal::Marker.method(:new)
+
+            expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+              expect(given_config[:name]).to eq("AppName")
+              original_new.call(data, given_config)
             end
+
+            run
           end
 
-          context "when appsignal_env is set" do
+          context "with invalid config" do
             before do
-              capistrano_config.set(:rack_env, "rack_production")
-              capistrano_config.set(:stage, "stage_production")
-              capistrano_config.set(:appsignal_env, "appsignal_production")
+              capistrano_config.set(:appsignal_config, :push_api_key => nil)
             end
 
-            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
-              expect(Appsignal::Config).to receive(:new).with(
-                project_fixture_path,
-                "appsignal_production",
-                { :name => "AppName" },
-                kind_of(Logger)
-              )
+            it "does not continue with invalid config" do
+              run
+              expect(output).to include \
+                "Not notifying of deploy, config is not active for environment: production"
             end
           end
         end
 
-        after { run }
-      end
+        context "when `appsignal_env` is set" do
+          let(:env) { "appsignal_production" }
+          before do
+            capistrano_config.set(:rack_env, "rack_production")
+            capistrano_config.set(:stage, "stage_production")
+            capistrano_config.set(:appsignal_env, env)
+          end
 
-      describe "markers" do
-        def stub_marker_request(data = {})
-          stub_api_request config, "markers", marker_data.merge(data)
-        end
+          it "prefers the appsignal_env rather than stage, rails_env and rack_env" do
+            original_new = Appsignal::Marker.method(:new)
+
+            expect(Appsignal::Marker).to receive(:new) do |data, given_config|
+              expect(given_config.env).to eq("appsignal_production")
+              original_new.call(data, given_config)
+            end
 
-        let(:marker_data) do
-          {
-            :revision => "503ce0923ed177a3ce000005",
-            :user => "batman"
-          }
+            run
+          end
         end
+      end
 
+      describe "markers" do
         context "when active for this environment" do
           it "transmits marker" do
             stub_marker_request.to_return(:status => 200)
@@ -208,4 +230,8 @@ if DependencyHelper.capistrano3_present?
       end
     end
   end
+
+  def stub_marker_request(data = {})
+    stub_api_request config, "markers", marker_data.merge(data)
+  end
 end