appsignal 2.3.3.beta.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c81c8fca61d2e1b863cfd7a0f7ef76ffaf1ece7
-  data.tar.gz: c5c8afff62d786d175a749a277b2353ab0221559
+  metadata.gz: 35d677b53c12a5761308ea3158780deea694d4b7
+  data.tar.gz: 0dcbadafab0f964c27814aa38f365eb922d327e0
 SHA512:
-  metadata.gz: 88a02cb602057052b92b148390437eda089f1c7499062957a9c53e1d3adccffc6b9f1da85726b150bd9378f5e4806541c916e517313d3a553325a0793fb3fb1f
-  data.tar.gz: f27550ecb0f924f5a59e92c40618e1ff434b28af6beba5a7cf1ad82c09eb62dbd1e48960eb4364d4c199faaed0dc5f412fd0a431d735055832ebd860c2b23852
+  metadata.gz: 244d06180b82d6188f9f7bd4bd100c89772e2eb1ed826dea3605d897436ed070def86a94c593da9fb826aee173880b8b2b69414f82f0c3f16c10a8664454e919
+  data.tar.gz: 63683d63c2e268146b652bdf4b0bb7946368c8db76ebed184bbc643918e3604ad74459d8b43a8e08f9d0acef06af131c923da9606ba8d778748f1ff2a0a3cb29

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Unreleased version
+
+# 2.3.3
 * Accept mixed case env variable values for the `true` value. PR #333
 * Don't record sensitive HTTP_X_AUTH_TOKEN header. PR #334
-* Agent and extension update. Commit e75d2f9b520d46f6cd0266b484b2c26c3bdc8882
+* Support dry run option for Capistrano 3.5.0 and higher. PR #339
+* Agent and extension update. Improve agent connection handling. Commit
+  e75d2f9b520d46f6cd0266b484b2c26c3bdc8882
 
 # 2.3.2
 * Improve Rake argument handling. Allow for more detailed view of which

data/gemfiles/capistrano3.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'capistrano', '3.4.0'
+gem 'capistrano', '~> 3.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
 

data/lib/appsignal/config.rb

@@ -27,7 +27,8 @@ module Appsignal
       :enable_minutely_probes         => false,
       :hostname                       => ::Socket.gethostname,
       :ca_file_path                   => File.expand_path(File.join("../../../resources/cacert.pem"), __FILE__),
-      :dns_servers                    => []
+      :dns_servers                    => [],
+      :files_world_accessible         => true
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -58,7 +59,8 @@ module Appsignal
       "APPSIGNAL_ENABLE_MINUTELY_PROBES"         => :enable_minutely_probes,
       "APPSIGNAL_HOSTNAME"                       => :hostname,
       "APPSIGNAL_CA_FILE_PATH"                   => :ca_file_path,
-      "APPSIGNAL_DNS_SERVERS"                    => :dns_servers
+      "APPSIGNAL_DNS_SERVERS"                    => :dns_servers,
+      "APPSIGNAL_FILES_WORLD_ACCESSIBLE"         => :files_world_accessible
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -156,6 +158,7 @@ module Appsignal
       ENV["_APPSIGNAL_PROCESS_NAME"]                 = $PROGRAM_NAME
       ENV["_APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
       ENV["_APPSIGNAL_DNS_SERVERS"]                  = config_hash[:dns_servers].join(",")
+      ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]       = config_hash[:files_world_accessible].to_s
     end
 
     private
@@ -216,7 +219,8 @@ module Appsignal
          APPSIGNAL_SKIP_SESSION_DATA APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING
          APPSIGNAL_ENABLE_ALLOCATION_TRACKING APPSIGNAL_ENABLE_GC_INSTRUMENTATION
          APPSIGNAL_RUNNING_IN_CONTAINER APPSIGNAL_ENABLE_HOST_METRICS
-         APPSIGNAL_SEND_PARAMS APPSIGNAL_ENABLE_MINUTELY_PROBES).each do |var|
+         APPSIGNAL_SEND_PARAMS APPSIGNAL_ENABLE_MINUTELY_PROBES
+         APPSIGNAL_FILES_WORLD_ACCESSIBLE).each do |var|
         env_var = ENV[var]
         next unless env_var
         config[ENV_TO_KEY_MAPPING[var]] = env_var.casecmp("true").zero?

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

@@ -1,12 +1,12 @@
 namespace :appsignal do
   task :deploy do
-    env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
+    appsignal_env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
     user = ENV["USER"] || ENV["USERNAME"]
     revision = fetch(:appsignal_revision, fetch(:current_revision))
 
     appsignal_config = Appsignal::Config.new(
       ENV["PWD"],
-      env,
+      appsignal_env,
       fetch(:appsignal_config, {}),
       Logger.new(StringIO.new)
     )
@@ -18,9 +18,15 @@ namespace :appsignal do
       }
 
       marker = Appsignal::Marker.new(marker_data, appsignal_config)
-      marker.transmit
+      # {#dry_run?} helper was added in Capistrano 3.5.0
+      # https://github.com/capistrano/capistrano/commit/38d8d6d2c8485f1b5643857465b16ff01da57aff
+      if respond_to?(:dry_run?) && dry_run?
+        puts "Dry run: AppSignal deploy marker not actually sent."
+      else
+        marker.transmit
+      end
     else
-      puts "Not notifying of deploy, config is not active for environment: #{env}"
+      puts "Not notifying of deploy, config is not active for environment: #{appsignal_env}"
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require "yaml"
 
 module Appsignal
-  VERSION = "2.3.3.beta.1".freeze
+  VERSION = "2.3.3".freeze
 end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -152,6 +152,19 @@ if DependencyHelper.capistrano3_present?
             end
           end
 
+          if Gem::Version.new(Capistrano::VERSION) >= Gem::Version.new("3.5.0")
+            context "when dry run" do
+              before do
+                expect(capistrano_config).to receive(:dry_run?).and_return(true)
+                run
+              end
+
+              it "does not transmit the marker" do
+                expect(output).to include "Dry run: AppSignal deploy marker not actually sent."
+              end
+            end
+          end
+
           context "with failed request" do
             before do
               stub_marker_request.to_return(:status => 500)

data/spec/lib/appsignal/config_spec.rb

@@ -105,7 +105,8 @@ describe Appsignal::Config do
         :enable_minutely_probes         => false,
         :hostname                       => Socket.gethostname,
         :ca_file_path                   => File.join(resources_dir, "cacert.pem"),
-        :dns_servers                    => []
+        :dns_servers                    => [],
+        :files_world_accessible         => true
       )
     end
 
@@ -274,17 +275,18 @@ describe Appsignal::Config do
       )
     end
     before do
-      ENV["APPSIGNAL_RUNNING_IN_CONTAINER"] = "true"
-      ENV["APPSIGNAL_PUSH_API_KEY"]         = "aaa-bbb-ccc"
-      ENV["APPSIGNAL_ACTIVE"]               = "true"
-      ENV["APPSIGNAL_APP_NAME"]             = "App name"
-      ENV["APPSIGNAL_DEBUG"]                = "true"
-      ENV["APPSIGNAL_IGNORE_ACTIONS"]       = "action1,action2"
-      ENV["APPSIGNAL_IGNORE_ERRORS"]        = "VerySpecificError,AnotherError"
-      ENV["APPSIGNAL_IGNORE_NAMESPACES"]    = "admin,private_namespace"
-      ENV["APPSIGNAL_INSTRUMENT_NET_HTTP"]  = "false"
-      ENV["APPSIGNAL_INSTRUMENT_REDIS"]     = "false"
-      ENV["APPSIGNAL_INSTRUMENT_SEQUEL"]    = "false"
+      ENV["APPSIGNAL_RUNNING_IN_CONTAINER"]    = "true"
+      ENV["APPSIGNAL_PUSH_API_KEY"]            = "aaa-bbb-ccc"
+      ENV["APPSIGNAL_ACTIVE"]                  = "true"
+      ENV["APPSIGNAL_APP_NAME"]                = "App name"
+      ENV["APPSIGNAL_DEBUG"]                   = "true"
+      ENV["APPSIGNAL_IGNORE_ACTIONS"]          = "action1,action2"
+      ENV["APPSIGNAL_IGNORE_ERRORS"]           = "VerySpecificError,AnotherError"
+      ENV["APPSIGNAL_IGNORE_NAMESPACES"]       = "admin,private_namespace"
+      ENV["APPSIGNAL_INSTRUMENT_NET_HTTP"]     = "false"
+      ENV["APPSIGNAL_INSTRUMENT_REDIS"]        = "false"
+      ENV["APPSIGNAL_INSTRUMENT_SEQUEL"]       = "false"
+      ENV["APPSIGNAL_FILES_WORLD_ACCESSIBLE"]  = "false"
     end
 
     it "overrides config with environment values" do
@@ -302,6 +304,7 @@ describe Appsignal::Config do
       expect(config[:instrument_net_http]).to eq(false)
       expect(config[:instrument_redis]).to eq(false)
       expect(config[:instrument_sequel]).to eq(false)
+      expect(config[:files_world_accessible]).to eq(false)
     end
 
     context "with mixed case `true` env variables values" do
@@ -419,6 +422,7 @@ describe Appsignal::Config do
       expect(ENV["_APPSIGNAL_PROCESS_NAME"]).to                 include "rspec"
       expect(ENV["_APPSIGNAL_CA_FILE_PATH"]).to                 eq File.join(resources_dir, "cacert.pem")
       expect(ENV["_APPSIGNAL_DNS_SERVERS"]).to                  eq "8.8.8.8,8.8.4.4"
+      expect(ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]).to       eq "true"
       expect(ENV).to_not                                        have_key("_APPSIGNAL_WORKING_DIR_PATH")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.3.3.beta.1
+  version: 2.3.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -347,9 +347,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12