appsignal 2.8.0.alpha.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbf3f5ed33439ee3dc6064386cb6cd890d9cf92c7e0eec933eb4614d3a3fdb6
-  data.tar.gz: facbbd23780eb8ae0858e416a48345849a0cd4342c3e403fe0768940f2193602
+  metadata.gz: 44c65af079aaf661799b20d076f1c5f11eb6bdb47ccdc6aa58dc85781c46d8c7
+  data.tar.gz: 3448422ae801b26eb40ba300016331a85e233fa33e5332971c1529b95fe934d6
 SHA512:
-  metadata.gz: 35d0b062ac15881ca9a27750ed36da8430e2f1f8c2e01d1ec9ee4e62ca6d939982233e49c8b7fa8045c4dc807aef6c5e1b9d2ebc5a28bbca1d1aa318107055fb
-  data.tar.gz: 2babcf1d9922648c79be50668e2ed6ce7e6e2563f24e2d75187f49960d790500fcc7a7bba38bcd6cb9bec6ac6bf89985dd2996a21b75f02cd61e47b60505426b
+  metadata.gz: 610f635119df8b05bdaa3b01cd646594235dd51addde01d96d9433caac12b3c347518e70d941a3a14b594623698952501e09758c9207984aa1209af0bdd8032f
+  data.tar.gz: 4995bd83545cc983821c90e9f1dae888bf6199a703e98a8026b4e8771ec7cf326f8344c2cd9328482c2ca78e785a0ed11f085f63832430cb6c92247056cc6655

data/.travis.yml

@@ -12,11 +12,9 @@ cache:
 
 rvm:
   - "2.0.0"
-  - "2.1.8"
-  - "2.2.4"
-  - "2.3.0"
-  - "2.4.0"
-  - "2.5.1"
+  - "2.3.8"
+  - "2.4.5"
+  - "2.5.3"
   - "jruby-19mode"
 
 gemfile:
@@ -41,32 +39,33 @@ gemfile:
 matrix:
   fast_finish: true
   include:
-    - rvm: "2.3.0"
+    - rvm: "2.1.8"
+      gemfile: "gemfiles/no_dependencies.gemfile"
+    - rvm: "2.2.4"
+      gemfile: "gemfiles/no_dependencies.gemfile"
+    - rvm: "2.5.3"
       gemfile: "gemfiles/no_dependencies.gemfile"
       script: "bundle exec rubocop"
   exclude:
     # Rails 5 doesn't support Ruby < 2.2
     - rvm: "2.0.0"
       gemfile: "gemfiles/rails-5.0.gemfile"
-    - rvm: "2.1.8"
-      gemfile: "gemfiles/rails-5.0.gemfile"
     - rvm: "2.0.0"
       gemfile: "gemfiles/rails-5.1.gemfile"
-    - rvm: "2.1.8"
-      gemfile: "gemfiles/rails-5.1.gemfile"
-    - rvm: "2.5.1"
+    - rvm: "2.5.3"
       gemfile: "gemfiles/rails-4.0.gemfile"
-    - rvm: "2.5.1"
+    - rvm: "2.5.3"
       gemfile: "gemfiles/rails-4.1.gemfile"
 
   allow_failures:
-    - rvm: "2.4.0"
+    - rvm: "2.4.5"
       gemfile: "gemfiles/rails-4.0.gemfile"
-    - rvm: "2.4.0"
+    - rvm: "2.4.5"
       gemfile: "gemfiles/rails-4.1.gemfile"
 
 env:
   global:
+    - "RUNNING_IN_CI=true"
     - "RAILS_ENV=test"
     - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
 

data/CHANGELOG.md

@@ -1,9 +1,31 @@
-# 2.8.0 (unreleased)
-- Support memory host metrics collection for containers. PR #428
-
-# 2.7.1 (unreleased)
+# 2.8.0
+- Group extension and agent tests in diagnose output. PR #437
+- Add diagnose --[no-]send-report option. PR #438
+- Print deprecation warnings to STDOUT as well. PR #439
+- Diagnose command starts the AppSignal logger. PR #440
+- Send appsignal.log file contents with diagnose report. PR #442
+- Track source of config option for diagnose report. PR #444
+- Link back to AppSignal diagnose report page. Claim you reports. PR #445
+- Print only last 10 lines of files in diagnose report output. PR #442 & #447
+- Support container memory host metrics better. PR #448
+- Build dynamic musl extension library. Supports JRuby for musl builds. PR #448
+- Change `files_world_accessible` permissions to not make files executable.
+  PR #448
+- Make agent debug logging for disk IO metrics more robust. PR #448
+
+# 2.7.3 Beta
+- Add user and group context to diagnose report. PR #436
+- Add user and group context to agent logs. PR #436
+- Fixes for running with multiple users
+
+# 2.7.2
+- Change the order of instructions in the install script for Rails. PR #433
+- Fix linking issues on multi-stage build setups. PR #434
+
+# 2.7.1
 - Improve error log on unsupported architecture and build combination on
   install. PR #426
+- Improve performance when garbage collection profiling is disabled. PR #429
 
 # 2.7.0
 - Detect Kubernetes containers as containers for `running_in_container`
@@ -522,7 +544,7 @@ Yanked
 * Debug log about missing name in config
 
 # 0.10.4
-* Add REQUEST_URI and PATH_INFO to env params whitelist
+* Add REQUEST_URI and PATH_INFO to env params allowlist
 
 # 0.10.3
 * Shut down all operations when agent is not active

data/ext/agent.yml

@@ -1,64 +1,67 @@
 ---
-version: 01362a4
+version: 86b6269
 triples:
   x86_64-darwin:
     static:
-      checksum: a33aa14ae9b8c58c379667e7f79807bdc843354baf635abc334a14c3b984114d
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: e253a63c279747c52013e7d0a9b402c879a345d5ab9c06c6f50314b6211d9e4e
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 9956fc35234bbd0f01095ee9032dbf3631d424bdf51536b50c59e8f765834ce1
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: 321b5e96fcafc3016858ae6588916613009cfe5c1ace288773c868151252dd6a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: a33aa14ae9b8c58c379667e7f79807bdc843354baf635abc334a14c3b984114d
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: e253a63c279747c52013e7d0a9b402c879a345d5ab9c06c6f50314b6211d9e4e
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 9956fc35234bbd0f01095ee9032dbf3631d424bdf51536b50c59e8f765834ce1
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: 321b5e96fcafc3016858ae6588916613009cfe5c1ace288773c868151252dd6a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 44d729dd8b3c6bf3041ee32dee1c155bfd19b5309cbf6ef95959fc026819915c
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-all-static.tar.gz
+      checksum: 11bf57ab3f845e41d90d4cf78fc727103c3a214dcbc18aecde9aa5f9bd0a105f
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 30fa55577862addebe16b0fddfdd73c6613f321d769606f15bbd14be8850aa68
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: bca8626460eab556fac29d64e97f3a521aa82fb0e2323f9970c5e840c676d35d
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 44d729dd8b3c6bf3041ee32dee1c155bfd19b5309cbf6ef95959fc026819915c
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-all-static.tar.gz
+      checksum: 11bf57ab3f845e41d90d4cf78fc727103c3a214dcbc18aecde9aa5f9bd0a105f
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 30fa55577862addebe16b0fddfdd73c6613f321d769606f15bbd14be8850aa68
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: bca8626460eab556fac29d64e97f3a521aa82fb0e2323f9970c5e840c676d35d
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 0bb69e60781db9bd0867ccece63a029706cf0d5a26d34d70668bc2264b531ce4
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: fed88ea2a0a0885fd98e3f52a48b925aaca3946d39150dd9897af0b2a934660a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 0bb69e60781db9bd0867ccece63a029706cf0d5a26d34d70668bc2264b531ce4
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: fed88ea2a0a0885fd98e3f52a48b925aaca3946d39150dd9897af0b2a934660a
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: 92b3662722978b39176c9d2e986fb8cc527772470dd0d9d7a8ea808cd4780b70
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-linux-all-static.tar.gz
+      checksum: 6d80a9d03c905926c14ba6ffd5d0d4c736a8d065c9055d8dd6d85e114f2a4d8e
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 3a9af3a4280b9842702d8af6cc4af84acc452b910fc8d753ee5907807de8f58c
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-linux-all-dynamic.tar.gz
+      checksum: 3678f0d2b05af9173c333eb4994b316678648d12df9a4cbe685eaedd8a190f3b
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 41624a50b603eeb4f875ee19dde41bb0877a0a039f6f2f560a9efc3d6b73a195
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-linux-musl-all-static.tar.gz
+      checksum: ecde0cc6349b68bf57a632f19a1e2f9fcdc42e8a9ce646fb1bd651837b06d01b
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-linux-musl-all-static.tar.gz
+    dynamic:
+      checksum: 2c3c123e854bb284f0df536d796826fa5403fddc7d67f1556634fa331e0b7729
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 14cdca07045a53b2c69647f1255cbc2f9fe322ddf6040c2e1a6ba36aa482cdf2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 4c880e9ef3f1a6da8cd9914ee2346422e6fb927772bd1586c4afbcf990023a69
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 0433b4cd9e0af92b8b4efdb797de43129f754b71a04c2313786d571866092675
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 70f9b378afa50d04d14aa9e8bbc4cbee99f9755c9e09bcdfc7c70f82ca5825ea
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 14cdca07045a53b2c69647f1255cbc2f9fe322ddf6040c2e1a6ba36aa482cdf2
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 4c880e9ef3f1a6da8cd9914ee2346422e6fb927772bd1586c4afbcf990023a69
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 0433b4cd9e0af92b8b4efdb797de43129f754b71a04c2313786d571866092675
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/01362a4/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 70f9b378afa50d04d14aa9e8bbc4cbee99f9755c9e09bcdfc7c70f82ca5825ea
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/86b6269/appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/extconf.rb

@@ -23,6 +23,18 @@ def install
   elsif !find_executable("appsignal-agent", EXT_PATH)
     installation_failed "Aborting installation, appsignal-agent not found"
   else
+    with_static_link = [
+      Appsignal::System::LINUX_TARGET,
+      Appsignal::System::MUSL_TARGET
+    ].include?(PLATFORM)
+    if with_static_link
+      # Statically link libgcc and libgcc_s libraries.
+      # Dependencies of the libappsignal extension library.
+      # If the gem is installed on a host with build tools installed, but is
+      # run on one that isn't the missing libraries will cause the extension
+      # to fail on start.
+      $LDFLAGS += " -static-libgcc" # rubocop:disable Style/GlobalVars
+    end
     create_makefile "appsignal_extension"
     logger.info "Successfully created Makefile for appsignal extension"
   end

data/lib/appsignal/cli.rb

@@ -82,6 +82,9 @@ 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|
+              options[:send_report] = arg
+            end
           end,
           "install" => OptionParser.new,
           "notify_of_deploy" => OptionParser.new do |o|

data/lib/appsignal/cli/diagnose.rb

@@ -4,6 +4,8 @@ require "rbconfig"
 require "bundler/cli"
 require "bundler/cli/common"
 require "etc"
+require "appsignal/cli/diagnose/utils"
+require "appsignal/cli/diagnose/paths"
 
 module Appsignal
   class CLI
@@ -34,8 +36,14 @@ module Appsignal
     # @example With a specific environment
     #   appsignal diagnose --environment=production
     #
-    # @see http://docs.appsignal.com/support/debugging.html Debugging AppSignal
-    # @see http://docs.appsignal.com/ruby/command-line/diagnose.html
+    # @example Automatically send the diagnose report without prompting
+    #   appsignal diagnose --send-report
+    #
+    # @example Don't prompt about sending the report and don't sent it
+    #   appsignal diagnose --no-send-report
+    #
+    # @see https://docs.appsignal.com/support/debugging.html Debugging AppSignal
+    # @see https://docs.appsignal.com/ruby/command-line/diagnose.html
     #   AppSignal diagnose documentation
     # @since 1.1.0
     class Diagnose
@@ -73,44 +81,58 @@ module Appsignal
         def run(options = {})
           $stdout.sync = true
           header
-          empty_line
+          print_empty_line
 
           library_information
-          empty_line
+          print_empty_line
 
           host_information
-          empty_line
+          print_empty_line
 
           configure_appsignal(options)
           run_agent_diagnose_mode
-          empty_line
+          print_empty_line
 
-          config
-          empty_line
+          print_config_section
+          print_empty_line
 
           check_api_key
-          empty_line
+          print_empty_line
 
-          paths_section
-          empty_line
+          data[:process] = process_user
 
-          log_files
+          paths_report = Paths.new
+          data[:paths] = paths_report.report
+          print_paths_section(paths_report)
+          print_empty_line
 
-          transmit_report_to_appsignal if send_report_to_appsignal?
+          transmit_report_to_appsignal if send_report_to_appsignal?(options)
         end
 
         private
 
-        def send_report_to_appsignal?
+        def send_report_to_appsignal?(options)
           puts "\nDiagnostics report"
           puts "  Do you want to send this diagnostics report to AppSignal?"
-          puts "  If you share this diagnostics report you will be given\n" \
-            "  a support token you can use to refer to your diagnotics \n" \
-            "  report when you contact us at support@appsignal.com\n\n"
-          send_diagnostics = yes_or_no(
-            "  Send diagnostics report to AppSignal? (Y/n): ",
-            :default => "y"
-          )
+          puts "  If you share this report you will be given a link to \n" \
+            "  AppSignal.com to validate the report.\n" \
+            "  You can also contact us at support@appsignal.com\n" \
+            "  with your support token.\n\n"
+          send_diagnostics =
+            if options.key?(:send_report)
+              if options[:send_report]
+                puts "  Confirmed sending report using --send-report option."
+                true
+              else
+                puts "  Not sending report. (Specified with the --no-send-report option.)"
+                false
+              end
+            else
+              yes_or_no(
+                "  Send diagnostics report to AppSignal? (Y/n): ",
+                :default => "y"
+              )
+            end
           unless send_diagnostics
             puts "  Not sending diagnostics information to AppSignal."
             return false
@@ -119,7 +141,7 @@ module Appsignal
         end
 
         def transmit_report_to_appsignal
-          puts "\n  Transmitting diagnostics report"
+          puts "  Transmitting diagnostics report"
           transmitter = Transmitter.new(
             DIAGNOSE_ENDPOINT,
             Appsignal.config
@@ -134,11 +156,10 @@ module Appsignal
             return
           end
 
-          puts "  Please email us at support@appsignal.com with the following"
-          puts "  support token."
           begin
             response_data = JSON.parse(response.body)
-            puts "  Your support token: #{response_data["token"]}"
+            puts "\n  Your support token: #{response_data["token"]}"
+            puts "  View this report:   https://appsignal.com/diagnose/#{response_data["token"]}"
           rescue JSON::ParserError
             puts "  Error: Couldn't decode server response."
             puts "  #{response.body}"
@@ -171,6 +192,8 @@ module Appsignal
             initial_config
           )
           Appsignal.config.write_to_environment
+          Appsignal.start_logger
+          Appsignal.logger.info("Starting AppSignal diagnose")
         end
 
         def run_agent_diagnose_mode
@@ -205,11 +228,12 @@ module Appsignal
             return
           end
 
-          agent_diagnostic_test_definition.each do |part, categories|
-            categories.each do |category, tests|
+          agent_diagnostic_test_definition.each do |component, component_definition|
+            puts "  #{component_definition[:label]}"
+            component_definition[:tests].each do |category, tests|
               tests.each do |test_name, test_definition|
                 test_report = report
-                  .fetch(part, {})
+                  .fetch(component, {})
                   .fetch(category, {})
                   .fetch(test_name, {})
 
@@ -224,47 +248,63 @@ module Appsignal
           error = test["error"]
           output = test["output"]
 
-          print "  #{definition[:label]}: "
-          display_value = definition[:values][value]
+          print "    #{definition[:label]}: "
+          display_value =
+            definition[:values] ? definition[:values][value] : value
           print display_value.nil? ? "-" : display_value
-          print "\n    Error: #{error}" if error
-          print "\n    Output: #{output}" if output
+          print "\n      Error: #{error}" if error
+          print "\n      Output: #{output}" if output
           print "\n"
         end
 
         def agent_diagnostic_test_definition
           {
             "extension" => {
-              "config" => {
-                "valid" => {
-                  :label => "Extension config",
-                  :values => { true => "valid", false => "invalid" }
+              :label => "Extension tests",
+              :tests => {
+                "config" => {
+                  "valid" => {
+                    :label => "Configuration",
+                    :values => { true => "valid", false => "invalid" }
+                  }
                 }
               }
             },
             "agent" => {
-              "boot" => {
-                "started" => {
-                  :label => "Agent started",
-                  :values => { true => "started", false => "not started" }
-                }
-              },
-              "config" => {
-                "valid" => {
-                  :label => "Agent config",
-                  :values => { true => "valid", false => "invalid" }
-                }
-              },
-              "logger" => {
-                "started" => {
-                  :label => "Agent logger",
-                  :values => { true => "started", false => "not started" }
-                }
-              },
-              "lock_path" => {
-                "created" => {
-                  :label => "Agent lock path",
-                  :values => { true => "writable", false => "not writable" }
+              :label => "Agent tests",
+              :tests => {
+                "boot" => {
+                  "started" => {
+                    :label => "Started",
+                    :values => { true => "started", false => "not started" }
+                  }
+                },
+                "host" => {
+                  "uid" => { :label => "Process user id" },
+                  "gid" => { :label => "Process user group id" }
+                },
+                "config" => {
+                  "valid" => {
+                    :label => "Configuration",
+                    :values => { true => "valid", false => "invalid" }
+                  }
+                },
+                "logger" => {
+                  "started" => {
+                    :label => "Logger",
+                    :values => { true => "started", false => "not started" }
+                  }
+                },
+                "working_directory_stat" => {
+                  "uid" => { :label => "Working directory user id" },
+                  "gid" => { :label => "Working directory user group id" },
+                  "mode" => { :label => "Working directory permissions" }
+                },
+                "lock_path" => {
+                  "created" => {
+                    :label => "Lock path",
+                    :values => { true => "writable", false => "not writable" }
+                  }
                 }
               }
             }
@@ -276,7 +316,7 @@ module Appsignal
           puts "=" * 80
           puts "Use this information to debug your configuration."
           puts "More information is available on the documentation site."
-          puts "http://docs.appsignal.com/"
+          puts "https://docs.appsignal.com/"
           puts "Send this output to support@appsignal.com if you need help."
           puts "=" * 80
         end
@@ -289,7 +329,6 @@ module Appsignal
             puts_and_save :agent_version, "Agent version", Appsignal::Extension.agent_version
             puts_and_save :agent_architecture, "Agent architecture",
               Appsignal::System.installed_agent_architecture
-            puts_and_save :package_install_path, "Gem install path", gem_path
             puts_and_save :extension_loaded, "Extension loaded", Appsignal.extension_loaded
           end
         end
@@ -319,75 +358,87 @@ module Appsignal
           end
         end
 
-        def config
+        def print_config_section
           puts "Configuration"
-          data_section :config do
-            puts_environment
-
-            Appsignal.config.config_hash.each do |key, value|
-              puts_and_save key, key, value
-            end
+          config = Appsignal.config
+          data[:config] = {
+            :options => config.config_hash.merge(:env => config.env),
+            :sources => {
+              :default => Appsignal::Config::DEFAULT_CONFIG,
+              :system => config.system_config,
+              :initial => config.initial_config,
+              :file => config.file_config,
+              :env => config.env_config
+            }
+          }
+          print_environment(config)
+          print_config_options(config)
+        end
+
+        def print_environment(config)
+          env = config.env
+          option = :env
+          option_sources = sources_for_option(option)
+          sources_label = config_sources_label(option, option_sources)
+          print "  Environment: #{format_config_option(env)}"
+
+          if env == ""
+            puts "\n    Warning: No environment set, no config loaded!"
+            puts "    Please make sure appsignal diagnose is run within your "
+            puts "    project directory with an environment."
+            puts "      appsignal diagnose --environment=production"
+          else
+            puts sources_label
           end
         end
 
-        def puts_environment
-          env = Appsignal.config.env
-          puts_and_save :env, "Environment", env
+        def print_config_options(config)
+          config.config_hash.each do |key, value|
+            option_sources = sources_for_option(key)
+            sources_label = config_sources_label(key, option_sources)
+            puts "  #{key}: #{format_config_option(value)}#{sources_label}"
+          end
 
-          return unless env == ""
-          puts "    Warning: No environment set, no config loaded!"
-          puts "    Please make sure appsignal diagnose is run within your "
-          puts "    project directory with an environment."
-          puts "      appsignal diagnose --environment=production"
+          puts "\nRead more about how the diagnose config output is rendered\n"\
+            "https://docs.appsignal.com/ruby/command-line/diagnose.html"
         end
 
-        def paths_section
-          puts "Paths"
-          data[:process] = process_user
-          data_section :paths do
-            appsignal_paths.each do |name, path|
-              path_info = {
-                :path => path,
-                :configured => !path.nil?,
-                :exists => false,
-                :writable => false
-              }
-              save name, path_info
-
-              puts_value name, path.to_s.inspect
+        def sources_for_option(option)
+          config_sources = data[:config][:sources]
+          [].tap do |option_sources|
+            config_sources.each do |source, c|
+              option_sources << source if c.key?(option)
+            end
+          end
+        end
 
-              unless path_info[:configured]
-                puts_value "Configured?", "false", :level => 2
-                next
-              end
-              unless File.exist?(path)
-                puts_value "Exists?", "false", :level => 2
-                next
+        def config_sources_label(option, sources)
+          return if sources == [:default]
+          if sources.length == 1
+            " (Loaded from: #{sources.join(", ")})"
+          elsif sources.any?
+            ["\n    Sources:"].tap do |a|
+              max_source_length = sources.map(&:length).max + 1 # 1 is for ":"
+              sources.each do |source|
+                source_label = "#{source}:".ljust(max_source_length)
+                value = data[:config][:sources][source][option]
+                a << "      #{source_label} #{format_config_option(value)}"
               end
-
-              path_info[:exists] = true
-              path_info[:writable] = File.writable?(path)
-              puts_value "Writable?", path_info[:writable], :level => 2
-
-              file_owner = path_ownership(path)
-              path_info[:ownership] = file_owner
-              save name, path_info
-
-              owned = process_user[:uid] == file_owner[:uid]
-              owner = "#{owned} " \
-                "(file: #{file_owner[:user]}:#{file_owner[:uid]}, " \
-                "process: #{process_user[:user]}:#{process_user[:uid]})"
-              puts_value "Ownership?", owner, :level => 2
-            end
+            end.join("\n")
+          else
+            " (Not configured)"
           end
         end
 
-        def path_ownership(path)
-          file_uid = File.stat(path).uid
-          {
-            :uid => file_uid,
-            :user => username_for_uid(file_uid)
-          }
+        def format_config_option(value)
+          case value
+          when NilClass
+            "nil"
+          when String
+            value.inspect
+          else
+            value
+          end
         end
 
         def process_user
@@ -396,18 +447,7 @@ module Appsignal
           process_uid = Process.uid
           @process_user = {
             :uid => process_uid,
-            :user => username_for_uid(process_uid)
-          }
-        end
-
-        def appsignal_paths
-          config = Appsignal.config
-          log_file_path = config.log_file_path
-          {
-            :working_dir => Dir.pwd,
-            :root_path => config.root_path,
-            :log_dir_path => log_file_path ? File.dirname(log_file_path) : "",
-            :log_file_path => log_file_path
+            :user => Utils.username_for_uid(process_uid)
           }
         end
 
@@ -429,58 +469,37 @@ module Appsignal
           end
         end
 
-        def log_files
-          puts "Log files"
-          data_section :logs do
-            install_log
-            empty_line
-            mkmf_log
+        def print_paths_section(report)
+          puts "Paths"
+          report_paths = report.paths
+          data[:paths].each do |name, file|
+            print_path_details report_paths[name][:label], file
           end
         end
 
-        def install_log
-          puts "  Extension install log"
-          filename = File.join("ext", "install.log")
-          log_info = log_file_info(File.join(gem_path, filename))
-          save filename, log_info
-          puts_log_file log_info
-        end
-
-        def mkmf_log
-          puts "  Makefile install log"
-          filename = File.join("ext", "mkmf.log")
-          log_info = log_file_info(File.join(gem_path, filename))
-          save filename, log_info
-          puts_log_file log_info
-        end
+        def print_path_details(name, path)
+          puts "  #{name}"
+          puts_value "Path", path[:path].to_s.inspect, :level => 2
 
-        def log_file_info(log_file)
-          {
-            :path => log_file,
-            :exists => File.exist?(log_file)
-          }.tap do |info|
-            next unless info[:exists]
-            info[:content] = File.read(log_file).split("\n")
+          unless path[:exists]
+            puts_value "Exists?", path[:exists], :level => 2
+            return
           end
-        end
 
-        def puts_log_file(log_info)
-          puts_value "Path", log_info[:path].to_s.inspect, :level => 2
-          if log_info[:exists]
-            puts "    Contents:"
-            puts log_info[:content].join("\n")
-          else
-            puts "    File not found."
-          end
-        end
+          puts_value "Writable?", path[:writable], :level => 2
 
-        def username_for_uid(uid)
-          passwd_struct = Etc.getpwuid(uid)
-          return unless passwd_struct
-          passwd_struct.name
+          ownership = path[:ownership]
+          owned = process_user[:uid] == ownership[:uid]
+          owner = "#{owned} " \
+            "(file: #{ownership[:user]}:#{ownership[:uid]}, " \
+            "process: #{process_user[:user]}:#{process_user[:uid]})"
+          puts_value "Ownership?", owner, :level => 2
+          return unless path.key?(:content)
+          puts "    Contents (last 10 lines):"
+          puts path[:content].last(10)
         end
 
-        def empty_line
+        def print_empty_line
           puts "\n"
         end
 
@@ -491,11 +510,6 @@ module Appsignal
         rescue LoadError
           false
         end
-
-        def gem_path
-          @gem_path ||= \
-            Bundler::CLI::Common.select_spec("appsignal").full_gem_path.strip
-        end
       end
     end
   end