appsignal 3.4.0 → 3.4.1

data/build_matrix.yml

@@ -175,7 +175,7 @@ matrix:
     - ruby: "3.0.5"
     - ruby: "3.1.3"
     - ruby: "3.2.1"
-    - ruby: "jruby-9.4.0.0"
+    - ruby: "jruby-9.4.1.0"
       gems: "minimal"
   gems:
     - gem: "no_dependencies"
@@ -208,21 +208,21 @@ matrix:
       only:
         ruby:
           - "3.0.5"
-          - "jruby-9.4.0.0"
+          - "jruby-9.4.1.0"
     - gem: "rails-6.1"
       only:
         ruby:
           - "3.0.5"
           - "3.1.3"
           - "3.2.1"
-          - "jruby-9.4.0.0"
+          - "jruby-9.4.1.0"
     - gem: "rails-7.0"
       only:
         ruby:
           - "3.0.5"
           - "3.1.3"
           - "3.2.1"
-          - "jruby-9.4.0.0"
+          - "jruby-9.4.1.0"
     - gem: "sequel"
     - gem: "sinatra"
     - gem: "webmachine1"

data/ext/Rakefile

@@ -1,4 +1,6 @@
-require File.expand_path("../base.rb", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("base.rb", __dir__)
 
 def local_build?
   File.exist?(ext_path("appsignal-agent")) &&
@@ -10,27 +12,26 @@ def local_build?
 end
 
 task :default do
-  begin
-    fail_install_on_purpose_in_test!
+  fail_install_on_purpose_in_test!
+
+  library_type = "dynamic"
+  report["language"]["implementation"] = "jruby"
+  report["build"]["library_type"] = library_type
+  next unless check_architecture
 
-    library_type = "dynamic"
-    report["language"]["implementation"] = "jruby"
-    report["build"]["library_type"] = library_type
-    next unless check_architecture
+  if local_build?
+    report["build"]["source"] = "local"
+  else
+    archive = download_archive(library_type)
+    next unless archive
+    next unless verify_archive(archive, library_type)
 
-    if local_build?
-      report["build"]["source"] = "local"
-    else
-      archive = download_archive(library_type)
-      next unless archive
-      next unless verify_archive(archive, library_type)
-      unarchive(archive)
-    end
-    successful_installation
-  rescue => error
-    fail_installation_with_error(error)
-  ensure
-    create_dummy_makefile unless installation_succeeded?
-    write_report
+    unarchive(archive)
   end
+  successful_installation
+rescue => e
+  fail_installation_with_error(e)
+ensure
+  create_dummy_makefile unless installation_succeeded?
+  write_report
 end

data/ext/agent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # DO NOT EDIT
 # This is a generated file by the `rake ship` family of tasks in the
 # appsignal-agent repository.

data/ext/base.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require "digest"
 require "fileutils"
 require "open-uri"
 require "zlib"
 require "json"
 require "rubygems/package"
-require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
-require File.expand_path("../../lib/appsignal/system.rb", __FILE__)
+require File.expand_path("../lib/appsignal/version.rb", __dir__)
+require File.expand_path("../lib/appsignal/system.rb", __dir__)
 require_relative "./agent"
 
-EXT_PATH = File.expand_path("..", __FILE__).freeze
+EXT_PATH = File.expand_path(__dir__).freeze
 
 AGENT_PLATFORM = Appsignal::System.agent_platform
 AGENT_ARCHITECTURE = Appsignal::System.agent_architecture
@@ -62,15 +64,11 @@ def report
 end
 
 def write_report
-  File.open(File.join(EXT_PATH, "install.report"), "w") do |file|
-    file.write JSON.generate(report)
-  end
+  File.write(File.join(EXT_PATH, "install.report"), JSON.generate(report))
 end
 
 def create_dummy_makefile
-  File.open(File.join(EXT_PATH, "Makefile"), "w") do |file|
-    file.write "default:\nclean:\ninstall:"
-  end
+  File.write(File.join(EXT_PATH, "Makefile"), "default:\nclean:\ninstall:")
 end
 
 def successful_installation
@@ -104,7 +102,8 @@ def check_architecture
   else
     abort_installation(
       "AppSignal currently does not support your system architecture (#{TARGET_TRIPLE})." \
-        "Please let us know at support@appsignal.com, we aim to support everything our customers run."
+        "Please let us know at support@appsignal.com, we aim to support everything " \
+        "our customers run."
     )
   end
 end
@@ -134,8 +133,8 @@ def download_archive(type)
       proxy, _error = http_proxy
       args = [
         download_url,
-        :ssl_ca_cert => CA_CERT_PATH,
-        :proxy => proxy
+        { :ssl_ca_cert => CA_CERT_PATH,
+          :proxy => proxy }
       ]
       if URI.respond_to?(:open) # rubocop:disable Style/GuardClause
         return URI.open(*args)
@@ -175,9 +174,7 @@ def unarchive(archive)
     tar.each do |entry|
       next unless entry.file?
 
-      File.open(ext_path(entry.full_name), "wb") do |f|
-        f.write(entry.read)
-      end
+      File.binwrite(ext_path(entry.full_name), entry.read)
     end
   end
   store_download_version_on_report
@@ -202,10 +199,10 @@ def http_proxy
     end
   return [proxy, error] if proxy
 
-  proxy = try_http_proxy_value(ENV["http_proxy"])
+  proxy = try_http_proxy_value(ENV.fetch("http_proxy", nil))
   return [proxy, error] if proxy
 
-  proxy = try_http_proxy_value(ENV["HTTP_PROXY"])
+  proxy = try_http_proxy_value(ENV.fetch("HTTP_PROXY", nil))
   return [proxy, error] if proxy
 
   [nil, error]

data/ext/extconf.rb

@@ -1,4 +1,6 @@
-require File.expand_path("../base.rb", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("base.rb", __dir__)
 
 def local_build?
   File.exist?(ext_path("appsignal-agent")) &&
@@ -20,6 +22,7 @@ def install
     archive = download_archive(library_type)
     return unless archive
     return unless verify_archive(archive, library_type)
+
     unarchive(archive)
   end
 

data/lib/appsignal/auth_check.rb

@@ -18,7 +18,7 @@ module Appsignal
   class AuthCheck
     # Path used on the AppSignal Push API
     # https://push.appsignal.com/1/auth
-    ACTION = "auth".freeze
+    ACTION = "auth"
 
     attr_reader :config
 
@@ -55,8 +55,8 @@ module Appsignal
         end
       [status, result]
     rescue => e
-      result = "Something went wrong while trying to "\
-               "authenticate with AppSignal: #{e}"
+      result = "Something went wrong while trying to " \
+        "authenticate with AppSignal: #{e}"
       [nil, result]
     end
   end

data/lib/appsignal/capistrano.rb

@@ -7,7 +7,7 @@ Appsignal::Environment.report_enabled("capistrano")
 
 if defined?(Capistrano::VERSION) && Gem::Version.new(Capistrano::VERSION) >= Gem::Version.new(3)
   # Capistrano 3+
-  load File.expand_path("../integrations/capistrano/appsignal.cap", __FILE__)
+  load File.expand_path("integrations/capistrano/appsignal.cap", __dir__)
 else
   # Capistrano 2
   require "appsignal/integrations/capistrano/capistrano_2_tasks"

data/lib/appsignal/cli/demo.rb

@@ -52,10 +52,13 @@ module Appsignal
           puts "Sending demonstration sample data..."
           if Appsignal::Demo.transmit
             puts "Demonstration sample data sent!"
-            puts "It may take about a minute for the data to appear on https://appsignal.com/accounts"
+            puts "It may take about a minute for the data to appear on " \
+              "https://appsignal.com/accounts"
           else
             puts "\nError: Unable to start the AppSignal agent and send data to AppSignal.com."
-            puts "Please use the diagnose command (https://docs.appsignal.com/ruby/command-line/diagnose.html) to debug your configuration:"
+            puts "Please use the diagnose command " \
+              "(https://docs.appsignal.com/ruby/command-line/diagnose.html) " \
+              "to debug your configuration:"
             puts
             puts "    bundle exec appsignal diagnose --environment=production"
             puts

data/lib/appsignal/cli/diagnose/paths.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   class CLI
     class Diagnose
@@ -55,6 +57,7 @@ module Appsignal
             :exists => File.exist?(path)
           }.tap do |info|
             next unless info[:exists]
+
             stat = File.stat(path)
             info[:type] = stat.directory? ? "directory" : "file"
             info[:mode] = format("%o", stat.mode)
@@ -79,7 +82,7 @@ module Appsignal
         # Returns the AppSignal gem installation path. The root directory of
         # this gem.
         def gem_path
-          File.expand_path("../../../../../", __FILE__)
+          File.expand_path("../../../..", __dir__)
         end
       end
     end

data/lib/appsignal/cli/diagnose/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   class CLI
     class Diagnose
@@ -5,15 +7,17 @@ module Appsignal
         def self.username_for_uid(uid)
           passwd_struct = Etc.getpwuid(uid)
           return unless passwd_struct
+
           passwd_struct.name
-        rescue ArgumentError # rubocop:disable Lint/HandleExceptions
+        rescue ArgumentError # rubocop:disable Lint/SuppressedException
         end
 
         def self.group_for_gid(gid)
           passwd_struct = Etc.getgrgid(gid)
           return unless passwd_struct
+
           passwd_struct.name
-        rescue ArgumentError # rubocop:disable Lint/HandleExceptions
+        rescue ArgumentError # rubocop:disable Lint/SuppressedException
         end
 
         def self.read_file_content(path, bytes_to_read)
@@ -30,7 +34,7 @@ module Appsignal
             offset = file_size - bytes_to_read
           end
 
-          IO.binread(path, length, offset)
+          File.binread(path, length, offset)
         end
       end
     end

data/lib/appsignal/cli/diagnose.rb

@@ -47,7 +47,7 @@ module Appsignal
     class Diagnose
       extend CLI::Helpers
 
-      DIAGNOSE_ENDPOINT = "https://appsignal.com/diag".freeze
+      DIAGNOSE_ENDPOINT = "https://appsignal.com/diag"
 
       module Data
         def data
@@ -149,7 +149,7 @@ module Appsignal
           response = transmitter.transmit(:diagnose => data)
 
           unless response.code == "200"
-            puts "  Error: Something went wrong while submitting the report "\
+            puts "  Error: Something went wrong while submitting the report " \
               "to AppSignal."
             puts "  Response code: #{response.code}"
             puts "  Response body:\n#{response.body}"
@@ -350,7 +350,7 @@ module Appsignal
         end
 
         def fetch_installation_report
-          path = File.expand_path("../../../../ext/install.report", __FILE__)
+          path = File.expand_path("../../../ext/install.report", __dir__)
           raw_report = File.read(path)
           JSON.parse(raw_report)
         rescue StandardError, JSON::ParserError => e # rubocop:disable Lint/ShadowedException
@@ -444,7 +444,8 @@ module Appsignal
             puts_value "Operating System", os_label
 
             distribution_file = "/etc/os-release"
-            save :os_distribution, File.exist?(distribution_file) ? File.read(distribution_file) : ""
+            save :os_distribution,
+              File.exist?(distribution_file) ? File.read(distribution_file) : ""
 
             language_version = "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
             save :language_version, language_version
@@ -518,7 +519,7 @@ module Appsignal
             end
           end
 
-          puts "\nRead more about how the diagnose config output is rendered\n"\
+          puts "\nRead more about how the diagnose config output is rendered\n" \
             "https://docs.appsignal.com/ruby/command-line/diagnose.html"
         end
 
@@ -533,6 +534,7 @@ module Appsignal
 
         def config_sources_label(option, sources)
           return if sources == [:default]
+
           if sources.length == 1
             " (Loaded from: #{sources.join(", ")})"
           elsif sources.any?

data/lib/appsignal/cli/helpers.rb

@@ -16,16 +16,13 @@ module Appsignal
         :default => 0
       }.freeze
 
-      def ruby_2_6_or_up?
-        Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-      end
-
       def coloring=(value)
         @coloring = value
       end
 
       def coloring?
         return true unless defined?(@coloring)
+
         @coloring
       end
 

data/lib/appsignal/cli/install.rb

@@ -67,8 +67,8 @@ module Appsignal
             install_for_sinatra(config)
           else
             print colorize "Warning:", :red
-            puts " We could not detect which framework you are using. "\
-              "We'd be very grateful if you email us on support@appsignal.com "\
+            puts " We could not detect which framework you are using. " \
+              "We'd be very grateful if you email us on support@appsignal.com " \
               "with information about your setup."
             puts
             done_notice
@@ -229,9 +229,7 @@ module Appsignal
               puts
               puts "Add the following environment variables to configure AppSignal:"
               puts "  export APPSIGNAL_PUSH_API_KEY=#{config[:push_api_key]}"
-              if name_overwritten
-                puts "  export APPSIGNAL_APP_NAME=#{config[:name]}"
-              end
+              puts "  export APPSIGNAL_APP_NAME=#{config[:name]}" if name_overwritten
               puts
               puts "  See the documentation for more configuration options:"
               puts "  https://docs.appsignal.com/gem-settings/configuration.html"
@@ -299,11 +297,7 @@ module Appsignal
             "../../../resources/appsignal.yml.erb"
           )
           file_contents = File.read(filename)
-          template = if ruby_2_6_or_up?
-                       ERB.new(file_contents, :trim_mode => "-")
-                     else
-                       ERB.new(file_contents, nil, "-")
-                     end
+          template = ERB.new(file_contents, :trim_mode => "-")
           config = template.result(OpenStruct.new(data).instance_eval { binding })
 
           FileUtils.mkdir_p(File.join(Dir.pwd, "config"))

data/lib/appsignal/cli.rb

@@ -34,7 +34,7 @@ module Appsignal
               Appsignal::CLI::Install.run(argv.shift, options)
             end
           else
-            puts "Command '#{command}' does not exist, run appsignal -h to "\
+            puts "Command '#{command}' does not exist, run appsignal -h to " \
               "see the help"
             exit(1)
           end
@@ -79,7 +79,8 @@ module Appsignal
             o.on "--environment=<app_env>", "The environment to diagnose" do |arg|
               options[:environment] = arg
             end
-            o.on "--[no-]send-report", "Confirm sending the report to AppSignal automatically" do |arg|
+            o.on "--[no-]send-report",
+              "Confirm sending the report to AppSignal automatically" do |arg|
               options[:send_report] = arg
             end
             o.on "--[no-]color", "Colorize the output of the diagnose command" do |arg|