appsignal 3.3.5 → 3.3.7

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.7
+
+### Changed
+
+- [8e67159e](https://github.com/appsignal/appsignal-ruby/commit/8e67159e2a57d3b697a07fadd8eb0e0234db9124) patch - Configure AppSignal with the RACK_ENV or RAILS_ENV environment variable in diagnose CLI, if present. Makes it easier to run the diagnose CLI in production, without having to always specify the environment with the `--environment` CLI option.
+
+### Fixed
+
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Remove trailing comments in SQL queries, ensuring queries are grouped consistently.
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Fix an issue where events longer than forty-eight minutes would be shown as having a zero-second duration.
+
+## 3.3.6
+
+### Changed
+
+- [962d069c](https://github.com/appsignal/appsignal-ruby/commit/962d069ce46fd7bf404a2ce28343e1f650ce3b37) patch - Bump agent to 8d042e2.
+  
+  - Support multiple log formats.
+
 ## 3.3.5
 
 ### Changed

data/build_matrix.yml

@@ -199,9 +199,9 @@ matrix:
       gems: "minimal"
     - ruby: "2.6.9"
     - ruby: "2.7.7"
-    - ruby: "3.0.4"
-    - ruby: "3.1.2"
-    - ruby: "3.2.0"
+    - ruby: "3.0.5"
+    - ruby: "3.1.3"
+    - ruby: "3.2.1"
     - ruby: "jruby-9.3.9.0"
       gems: "minimal"
     - ruby: "jruby-9.4.0.0"
@@ -214,23 +214,23 @@ matrix:
     - gem: "hanami"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "psych-4"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -293,7 +293,7 @@ matrix:
           - "2.5.8"
           - "2.6.9"
           - "2.7.7"
-          - "3.0.4"
+          - "3.0.5"
           - "jruby-9.4.0.0"
     - gem: "rails-6.1"
       only:
@@ -301,17 +301,17 @@ matrix:
           - "2.5.8"
           - "2.6.9"
           - "2.7.7"
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
           - "jruby-9.4.0.0"
     - gem: "rails-7.0"
       only:
         ruby:
           - "2.7.7"
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
           - "jruby-9.4.0.0"
     - gem: "resque-1"
       bundler: "1.17.3"

data/ext/agent.rb

@@ -4,7 +4,7 @@
 # Modifications to this file will be overwritten with the next agent release.
 
 APPSIGNAL_AGENT_CONFIG = {
-  "version" => "0d593d5",
+  "version" => "dee4fcb",
   "mirrors" => [
     "https://appsignal-agent-releases.global.ssl.fastly.net",
     "https://d135dj0rjqvssy.cloudfront.net"
@@ -12,131 +12,131 @@ APPSIGNAL_AGENT_CONFIG = {
   "triples" => {
     "x86_64-darwin" => {
       "static" => {
-        "checksum" => "8e63a3b1ee61165914e6dbb8654c1ad7f096079c77d0559c1733dff15103f4ab",
+        "checksum" => "d45bfc2eb38138c317b501c3156459b8dbbb15a59910f1e2ec3d2d02e461a147",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "21d5e46302d0b35f5514ea5b68c4b90f0748c6e74c75abe670c7d65aad1ccd06",
+        "checksum" => "a126901650046ae1c40affd386ab5dfcda5cb89f9bd05cf0a3087faff1d2d77d",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "universal-darwin" => {
       "static" => {
-        "checksum" => "8e63a3b1ee61165914e6dbb8654c1ad7f096079c77d0559c1733dff15103f4ab",
+        "checksum" => "d45bfc2eb38138c317b501c3156459b8dbbb15a59910f1e2ec3d2d02e461a147",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "21d5e46302d0b35f5514ea5b68c4b90f0748c6e74c75abe670c7d65aad1ccd06",
+        "checksum" => "a126901650046ae1c40affd386ab5dfcda5cb89f9bd05cf0a3087faff1d2d77d",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-darwin" => {
       "static" => {
-        "checksum" => "cdf323d1b411f45084c13dc4a2c0f980599273d64ab91a28cd07bbc48b3293f6",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "2ccc7217f71316a2bc6a47e25db4926e55e854a0ac3d5e99150a7c7c9c46392e",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm64-darwin" => {
       "static" => {
-        "checksum" => "cdf323d1b411f45084c13dc4a2c0f980599273d64ab91a28cd07bbc48b3293f6",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "2ccc7217f71316a2bc6a47e25db4926e55e854a0ac3d5e99150a7c7c9c46392e",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm-darwin" => {
       "static" => {
-        "checksum" => "cdf323d1b411f45084c13dc4a2c0f980599273d64ab91a28cd07bbc48b3293f6",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "2ccc7217f71316a2bc6a47e25db4926e55e854a0ac3d5e99150a7c7c9c46392e",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux" => {
       "static" => {
-        "checksum" => "a6baf7c586722c71c9d5ec885c8ca17da6b9fc9c5d7ab154a7b667f28d082a0f",
+        "checksum" => "72fbfaa1c6ed72defea9eca59679372f53ddeab845a9b2f75d9d165e4983d69e",
         "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "1f2912a078b8e2f5524ecf3353d8216d24a36817956d0e8218702df8bb6a6d21",
+        "checksum" => "bf31b4836c84ceaa87a52aa85f296d40e32cfd784a8aa5b19ec5ca3a4aa5c8eb",
         "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
       }
     },
     "i686-linux" => {
       "static" => {
-        "checksum" => "c102053fe1f68af84d0b362bd892256981bc4a2dec7e12fec27ea57ba0efbda2",
+        "checksum" => "c504a7233512c9285274a7ba0142ab91cf4637c6f5f57c58c6890137ba0f82de",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "88a8c13182c26b9e2396474606202ecce78f22c95f6e378c058a92b216f8c575",
+        "checksum" => "19091f50e98afed547b73bc220770bdafce737e152ab9345dabe03e284219cc1",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86-linux" => {
       "static" => {
-        "checksum" => "c102053fe1f68af84d0b362bd892256981bc4a2dec7e12fec27ea57ba0efbda2",
+        "checksum" => "c504a7233512c9285274a7ba0142ab91cf4637c6f5f57c58c6890137ba0f82de",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "88a8c13182c26b9e2396474606202ecce78f22c95f6e378c058a92b216f8c575",
+        "checksum" => "19091f50e98afed547b73bc220770bdafce737e152ab9345dabe03e284219cc1",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux" => {
       "static" => {
-        "checksum" => "8f3987d22f0fcbd466377e624aa645c5b9b0f4bbc88855ddb7076b09b9a8d42a",
+        "checksum" => "f9e68dbbee7d38b255c5b9bc0cb75226764f79cd51421e4e00a9e7454b0c6ccb",
         "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "a441047dde49b583789bc3d4c8c086337e42d96ea73e5676abd6f3f4db709cf4",
+        "checksum" => "58e3192c87903a2abce6540b893c9d25a69f43e37fd2367df45c2c22c26068ba",
         "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux-musl" => {
       "static" => {
-        "checksum" => "e353e165f828cb788c85199adb1b39f15c26406da948117a34b4944f6eabfabc",
+        "checksum" => "8fa1d110d2544502509cc66ba8ec6685010d8c6d8373f4f14ebe721d4be157e0",
         "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "fed6aa61e0661351a4bae4b2f17b7e4e2f660fd020cd759d10d1ce3d2ddaeb86",
+        "checksum" => "fc46dd29864165968d96bb78fde1c8970903488d80d97056e630636c736cf86f",
         "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux-musl" => {
       "static" => {
-        "checksum" => "b08c5d65fbff05ac6838aa0ed4614b669701f009826652f7d67ab423fede0e44",
+        "checksum" => "a43895183baf017879332885a904208773befc14b9bd628efae6d1513052b782",
         "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "848671a482243083fd7af6f44f35e6169aeb2b415ccd2f86eb1386d73303171b",
+        "checksum" => "7e96b29348be655066cf162ae5c15248bba7d7177663e35e60a6c5ad243937d0",
         "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "x86_64-freebsd" => {
       "static" => {
-        "checksum" => "f516b4c84274b9c56cbcb11c252685a4ef97b68b9fec6c189dde96fd37bbf515",
+        "checksum" => "1b992f770bdbced09f7b5f18d7aa721710218d4a76a131adc7affe44d68684f0",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "17a698650bb8d8d1b031e0ba216217d932c9fe33936c7bdce1e677b257b742f7",
+        "checksum" => "300b718986c10ff65f237e1d74086e9cc0f7079d7b531e3b6f9a64752f1aa6ee",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     },
     "amd64-freebsd" => {
       "static" => {
-        "checksum" => "f516b4c84274b9c56cbcb11c252685a4ef97b68b9fec6c189dde96fd37bbf515",
+        "checksum" => "1b992f770bdbced09f7b5f18d7aa721710218d4a76a131adc7affe44d68684f0",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "17a698650bb8d8d1b031e0ba216217d932c9fe33936c7bdce1e677b257b742f7",
+        "checksum" => "300b718986c10ff65f237e1d74086e9cc0f7079d7b531e3b6f9a64752f1aa6ee",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     }

data/ext/appsignal_extension.c

@@ -720,11 +720,12 @@ static VALUE close_span(VALUE self) {
   return Qnil;
 }
 
-static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE message, VALUE attributes) {
+static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE format, VALUE message, VALUE attributes) {
   appsignal_data_t* attributes_data;
 
   Check_Type(group, T_STRING);
   Check_Type(severity, T_FIXNUM);
+  Check_Type(format, T_FIXNUM);
   Check_Type(message, T_STRING);
   Check_Type(attributes, RUBY_T_DATA);
 
@@ -733,6 +734,7 @@ static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE message, VALUE
   appsignal_log(
       make_appsignal_string(group),
       FIX2INT(severity),
+      FIX2INT(format),
       make_appsignal_string(message),
       attributes_data
    );
@@ -859,7 +861,7 @@ void Init_appsignal_extension(void) {
   // Diagnostics
   rb_define_singleton_method(Extension, "diagnose", diagnose, 0);
   // Logging
-  rb_define_singleton_method(Extension, "log", a_log, 4);
+  rb_define_singleton_method(Extension, "log", a_log, 5);
 
   // Server state
   rb_define_singleton_method(Extension, "get_server_state", get_server_state, 1);

data/lib/appsignal/cli/demo.rb

@@ -35,9 +35,9 @@ module Appsignal
     # @since 2.0.0
     # @see Appsignal::Demo
     # @see Appsignal::CLI::Install
-    # @see http://docs.appsignal.com/ruby/command-line/demo.html
+    # @see https://docs.appsignal.com/ruby/command-line/demo.html
     #   AppSignal demo documentation
-    # @see http://docs.appsignal.com/support/debugging.html
+    # @see https://docs.appsignal.com/support/debugging.html
     #   Debugging AppSignal guide
     # @api private
     class Demo

data/lib/appsignal/cli/diagnose.rb

@@ -196,7 +196,7 @@ module Appsignal
 
           Appsignal.config = Appsignal::Config.new(
             current_path,
-            options[:environment],
+            options.fetch(:environment, ENV.fetch("RACK_ENV", ENV.fetch("RAILS_ENV", nil))),
             initial_config
           )
           Appsignal.config.write_to_environment

data/lib/appsignal/cli/install.rb

@@ -126,7 +126,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/sinatra'"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/sinatra.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/sinatra.html"
           press_any_key
           done_notice
         end
@@ -144,7 +144,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/padrino"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/padrino.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/padrino.html"
           press_any_key
           done_notice
         end
@@ -159,7 +159,7 @@ module Appsignal
 
           puts "Manual Grape configuration needed"
           puts "  See the installation instructions at:"
-          puts "  http://docs.appsignal.com/ruby/integrations/grape.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/grape.html"
           press_any_key
           done_notice
         end
@@ -177,7 +177,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/hanami'"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/hanami.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/hanami.html"
           press_any_key
           done_notice
         end
@@ -234,7 +234,7 @@ module Appsignal
               end
               puts
               puts "  See the documentation for more configuration options:"
-              puts "  http://docs.appsignal.com/gem-settings/configuration.html"
+              puts "  https://docs.appsignal.com/gem-settings/configuration.html"
               press_any_key
               break
             end

data/lib/appsignal/helpers/instrumentation.rb

@@ -197,9 +197,9 @@ module Appsignal
       #   used to send the error.
       # @return [void]
       #
-      # @see http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
       #   Exception handling guide
-      # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
       #   Tagging guide
       # @since 0.6.0
       def send_error(
@@ -296,7 +296,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction#set_error
-      # @see http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
       #   Exception handling guide
       # @since 0.6.6
       def set_error(exception, tags = nil, namespace = nil)
@@ -435,7 +435,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction.set_tags
-      # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
       #   Tagging guide
       def tag_request(tags = {})
         return unless active?
@@ -468,7 +468,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction#add_breadcrumb
-      # @see http://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
       #   Breadcrumb reference
       # @since 2.12.0
       def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
@@ -513,9 +513,9 @@ module Appsignal
       #
       # @see Appsignal::Transaction#instrument
       # @see .instrument_sql
-      # @see http://docs.appsignal.com/ruby/instrumentation/instrumentation.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/instrumentation.html
       #   AppSignal custom instrumentation guide
-      # @see http://docs.appsignal.com/api/event-names.html
+      # @see https://docs.appsignal.com/api/event-names.html
       #   AppSignal event naming guide
       # @since 1.3.0
       def instrument(
@@ -557,9 +557,9 @@ module Appsignal
       # @return [Object] Returns the block's return value.
       #
       # @see .instrument
-      # @see http://docs.appsignal.com/ruby/instrumentation/instrumentation.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/instrumentation.html
       #   AppSignal custom instrumentation guide
-      # @see http://docs.appsignal.com/api/event-names.html
+      # @see https://docs.appsignal.com/api/event-names.html
       #   AppSignal event naming guide
       # @since 2.0.0
       def instrument_sql(name, title = nil, body = nil, &block)

data/lib/appsignal/logger.rb

@@ -6,15 +6,20 @@ require "set"
 module Appsignal
   # Logger that flushes logs to the AppSignal logging service
   class Logger < ::Logger # rubocop:disable Metrics/ClassLength
+    PLAINTEXT = 0
+    LOGFMT = 1
+    JSON = 2
+
     # Create a new logger instance
     #
     # @param group Name of the group for this logger.
     # @param level Log level to filter with
     # @return [void]
-    def initialize(group, level = INFO)
+    def initialize(group, level: INFO, format: PLAINTEXT)
       raise TypeError, "group must be a string" unless group.is_a? String
       @group = group
       @level = level
+      @format = format
     end
 
     # We support the various methods in the Ruby
@@ -51,6 +56,7 @@ module Appsignal
       Appsignal::Extension.log(
         group,
         severity_number,
+        @format,
         message,
         Appsignal::Utils::Data.generate({})
       )
@@ -69,6 +75,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         2,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -86,6 +93,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         3,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -103,6 +111,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         5,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -120,6 +129,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         6,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -137,6 +147,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         7,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )

data/lib/appsignal/marker.rb

@@ -18,7 +18,7 @@ module Appsignal
   #     Set config does not override data set in {#marker_data}.
   #
   # @see Appsignal::CLI::NotifyOfDeploy
-  # @see http://docs.appsignal.com/appsignal/terminology.html#markers
+  # @see https://docs.appsignal.com/appsignal/terminology.html#markers
   #   Terminology: Deploy marker
   # @api private
   class Marker

data/lib/appsignal/transaction.rb

@@ -159,7 +159,7 @@ module Appsignal
     # @return [void]
     #
     # @see Appsignal.tag_request
-    # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+    # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
     #   Tagging guide
     def set_tags(given_tags = {})
       @tags.merge!(given_tags)
@@ -177,7 +177,7 @@ module Appsignal
     # @return [void]
     #
     # @see Appsignal.add_breadcrumb
-    # @see http://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
+    # @see https://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
     #   Breadcrumb reference
     def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
       @breadcrumbs.push(

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.3.5".freeze
+  VERSION = "3.3.7".freeze
 end

data/lib/appsignal.rb

@@ -74,8 +74,8 @@ module Appsignal
     # This is not required for the automatic integrations AppSignal offers, but
     # this is required for all non-automatic integrations and pure Ruby
     # applications. For more information, see our [integrations
-    # list](http://docs.appsignal.com/ruby/integrations/) and our [Integrating
-    # AppSignal](http://docs.appsignal.com/ruby/instrumentation/integrating-appsignal.html)
+    # list](https://docs.appsignal.com/ruby/integrations/) and our [Integrating
+    # AppSignal](https://docs.appsignal.com/ruby/instrumentation/integrating-appsignal.html)
     # guide.
     #
     # To start the logger see {.start_logger}.

data/resources/appsignal.yml.erb

@@ -26,7 +26,7 @@ default: &defaults
   #   - SystemExit
   #   - SystemStackError
 
-  # See http://docs.appsignal.com/ruby/configuration/options.html for
+  # See https://docs.appsignal.com/ruby/configuration/options.html for
   # all configuration options.
 
 # Configuration per environment, leave out an environment or set active

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -802,6 +802,39 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
             end
           end
 
+          context "when the source is the RACK_ENV env variable", :send_report => :no_cli_option do
+            let(:config) { project_fixture_config("rack_env") }
+            let(:options) { {} }
+            before do
+              ENV["RACK_ENV"] = "rack_env"
+              run
+            end
+            after { ENV.delete("RACK_ENV") }
+
+            it "outputs the RACK_ENV variable value" do
+              expect(output).to include(
+                %(environment: "rack_env" (Loaded from: initial)\n)
+              )
+            end
+          end
+
+          context "when the source is the RAILS_ENV env variable", :send_report => :no_cli_option do
+            let(:config) { project_fixture_config("rails_env") }
+            let(:options) { {} }
+            before do
+              ENV.delete("RACK_ENV")
+              ENV["RAILS_ENV"] = "rails_env"
+              run
+            end
+            after { ENV.delete("RAILS_ENV") }
+
+            it "outputs the RAILS_ENV variable value" do
+              expect(output).to include(
+                %(environment: "rails_env" (Loaded from: initial)\n)
+              )
+            end
+          end
+
           context "when the source is multiple sources" do
             let(:options) { { :environment => "development" } }
             before do

data/spec/lib/appsignal/cli/install_spec.rb

@@ -469,7 +469,7 @@ describe Appsignal::CLI::Install do
             "Installing for Sinatra",
             "Sinatra requires some manual configuration.",
             "require 'appsignal/integrations/sinatra'",
-            "http://docs.appsignal.com/ruby/integrations/sinatra.html"
+            "https://docs.appsignal.com/ruby/integrations/sinatra.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -536,7 +536,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Padrino",
             "Padrino requires some manual configuration.",
-            "http://docs.appsignal.com/ruby/integrations/padrino.html"
+            "https://docs.appsignal.com/ruby/integrations/padrino.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -603,7 +603,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Grape",
             "Manual Grape configuration needed",
-            "http://docs.appsignal.com/ruby/integrations/grape.html"
+            "https://docs.appsignal.com/ruby/integrations/grape.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -670,7 +670,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Hanami",
             "Hanami requires some manual configuration.",
-            "http://docs.appsignal.com/ruby/integrations/hanami.html"
+            "https://docs.appsignal.com/ruby/integrations/hanami.html"
           ]
         end
         let(:app_name) { "Test app" }