appsignal 3.0.15-java → 3.0.19-java

data/CHANGELOG.md

@@ -1,5 +1,62 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.19
+
+### Changed
+
+- [2587eae3](https://github.com/appsignal/appsignal-ruby/commit/2587eae30f17e0f0b5e27cb61982301220cc77b1) patch - Store the extension install report as JSON, instead of YAML. Reduces internal complexity.
+
+### Fixed
+
+- [243c1ed4](https://github.com/appsignal/appsignal-ruby/commit/243c1ed444f3351ca158200a47836673f851cb31) patch - Improve compatibility with the sequel-rails gem by tracking the performed SQL query in instrumentation events.
+
+## 3.0.18
+
+### Added
+
+- [d7bfcdf1](https://github.com/appsignal/appsignal-ruby/commit/d7bfcdf11a66df1ec5f54ac9342e5566062013b5) patch - Add Ruby 3.1.0 support. There was an issue with `YAML.load` arguments when parsing the `appsignal.yml` config file.
+
+## 3.0.17
+
+### Fixed
+
+- [f9d57752](https://github.com/appsignal/appsignal-ruby/commit/f9d5775217400c59a70d98e9aa96e3dcd06cb1f9) patch - Use the `log_level` option for the Ruby gem logger. Previously it only configured the extension and agent loggers. Also fixes the `debug` and `transaction_debug_mode` option if no `log_level` is configured by the app.
+
+## 3.0.16
+
+### Added
+
+- [fe226e99](https://github.com/appsignal/appsignal-ruby/commit/fe226e99f262bfa46e7a7630defe2fe90f8a3a13) patch - Add experimental Span API. This is not loaded by default and we do not recommend using it yet.
+- [84b1ba18](https://github.com/appsignal/appsignal-ruby/commit/84b1ba18e50440e5c71d27319e560c5df180d0df) patch - Add "log_level" config option. This new option allows you to define the kind of messages
+  AppSignal's will log and up. The "debug" option will log all "debug", "info", "warning" and
+  "error" log messages. The default value is: "info"
+  
+  The allowed values are:
+  - error
+  - warning
+  - info
+  - debug
+- [6b2ecca2](https://github.com/appsignal/appsignal-ruby/commit/6b2ecca24603061f1b35800f60b0ee6e9f314998) patch - Clean up index values in error messages from PG index violation errors.
+
+### Changed
+
+- [25bde454](https://github.com/appsignal/appsignal-ruby/commit/25bde454f82776f8d2ea1fd4dbb00a73e414076e) patch - Order the config options alphabetically in diagnose report output.
+- [fe226e99](https://github.com/appsignal/appsignal-ruby/commit/fe226e99f262bfa46e7a7630defe2fe90f8a3a13) patch - Use the `filter_parameters` and `filter_session_data` options to filter out specific parameter keys or session data keys for the experimental Span API. Previously only the (undocumented) `filter_data_keys` config option was available to filter out all kinds of app data.
+- [fe226e99](https://github.com/appsignal/appsignal-ruby/commit/fe226e99f262bfa46e7a7630defe2fe90f8a3a13) patch - Standardize diagnose validation failure message. Explain the diagnose request failed and why.
+- [fe226e99](https://github.com/appsignal/appsignal-ruby/commit/fe226e99f262bfa46e7a7630defe2fe90f8a3a13) patch - Bump agent to v-5b63505
+  
+  - Only filter parameters with the `filter_parameters` config option.
+  - Only filter session data with the `filter_session_data` config option.
+- [3ad95ea5](https://github.com/appsignal/appsignal-ruby/commit/3ad95ea5dd8a9488d293a652231950bd4a721e6c) patch - Bump agent to v-0db01c2
+  
+  - Add `log_level` config option in extension.
+  - Deprecate `debug` and `transaction_debug_mode` option in extension.
+
+### Deprecated
+
+- [84b1ba18](https://github.com/appsignal/appsignal-ruby/commit/84b1ba18e50440e5c71d27319e560c5df180d0df) patch - Deprecate "debug" and "transaction_debug_mode" config options in favor of the new "log_level"
+  config option.
+
 ## 3.0.15
 
 - [b40b3b4f](https://github.com/appsignal/appsignal-ruby/commit/b40b3b4f5264c6b69f9515b53806435258c73086) patch - Print String values in the diagnose report surrounded by quotes. Makes it more clear that it's a String value and not a label we print.

data/appsignal.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../lib/appsignal/version", __FILE__)
 
 Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength

data/build_matrix.yml

@@ -52,7 +52,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: Validate CI setup
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.6
+              value: 2.6.9
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -76,7 +76,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: RuboCop
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.6
+              value: 2.6.9
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -111,7 +111,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: Diagnose
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.6
+              value: 3.0.2
             - name: LANGUAGE
               value: ruby
           commands:
@@ -164,6 +164,8 @@ matrix:
       - "no_dependencies"
       - "rails-5.2"
       - "rails-6.0"
+      - "rails-6.1"
+      - "rails-7.0"
 
   ruby:
     - ruby: "2.0.0-p648"
@@ -184,9 +186,10 @@ matrix:
       gems: "none"
     - ruby: "2.5.8"
       gems: "minimal"
-    - ruby: "2.6.6"
-    - ruby: "2.7.3"
-    - ruby: "3.0.1"
+    - ruby: "2.6.9"
+    - ruby: "2.7.5"
+    - ruby: "3.0.3"
+    - ruby: "3.1.0"
     - ruby: "jruby-9.2.19.0"
       gems: "minimal"
       env_vars:
@@ -204,28 +207,33 @@ matrix:
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.6"
-          - "2.7.3"
-          - "3.0.1"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-4.2"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.6"
-          - "2.7.3"
-          - "3.0.1"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.0"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.1"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.2"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-6.0"
       exclude:
         ruby:
@@ -233,16 +241,36 @@ matrix:
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
+          - "3.1.0"
+    - gem: "rails-6.1"
+      exclude:
+        ruby:
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+    - gem: "rails-7.0"
+      exclude:
+        ruby:
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
+          - "2.6.9"
+          - "jruby-9.2.19.0"
     - gem: "resque-1"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "resque-2"
     - gem: "sequel"
     - gem: "sequel-435"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "sinatra"
     - gem: "webmachine"

data/ext/agent.yml

@@ -3,92 +3,92 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: '09308fb'
+version: 15ee07b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 72e3e84ce59f4b84287f0d72ec567447a28e42fb758eb27dd7676cd7613eb2e9
+      checksum: 59bb7f5aea47ccea89b48cc323371fd87609592945ae8692f36063a635970e22
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 6ad516e25fe140cc8f13ca2e14494d7d8a696ce1344faf71952f6c6f8b972fa5
+      checksum: ce2d489170fdd84be1467d24e5c13782cf97912b3c7dbaaebe9e074d56e711a2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 72e3e84ce59f4b84287f0d72ec567447a28e42fb758eb27dd7676cd7613eb2e9
+      checksum: 59bb7f5aea47ccea89b48cc323371fd87609592945ae8692f36063a635970e22
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 6ad516e25fe140cc8f13ca2e14494d7d8a696ce1344faf71952f6c6f8b972fa5
+      checksum: ce2d489170fdd84be1467d24e5c13782cf97912b3c7dbaaebe9e074d56e711a2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: d14ed2b2ba05b7a0a229eaba8ee710c35ff0c8681084ec5d0650fb53dae7b3d3
+      checksum: 12c5659d5a5d67ee641bdb1c38ef842b7687811fdec1f9edf8e196a2ed596405
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 359e45e9d00d1795e6f1d1d2452350effd24a9baefc72cd3bca3631b09d4abc6
+      checksum: 8301ab5f64af1c185860314682fbfd89027ea5e4850d8beb222613ca5455358a
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 18cd5ef04e547dcc522faa0a462a00bac27e9bd221bd4dd8e6e2e934d4afd5b7
+      checksum: afebd51e26b8d21923a8adcbc8fda7bbd29d4e12573f53895e3a650fcd84ffd5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: e5edeee4c66cb7e1ff372c3d9eddf5832741bc41b237bbddb2dd2e14c07e076d
+      checksum: e0ed425a1d92ad7e9beb83f5b7c896f8606773cc599337a198536a150ba76c51
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 18cd5ef04e547dcc522faa0a462a00bac27e9bd221bd4dd8e6e2e934d4afd5b7
+      checksum: afebd51e26b8d21923a8adcbc8fda7bbd29d4e12573f53895e3a650fcd84ffd5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: e5edeee4c66cb7e1ff372c3d9eddf5832741bc41b237bbddb2dd2e14c07e076d
+      checksum: e0ed425a1d92ad7e9beb83f5b7c896f8606773cc599337a198536a150ba76c51
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 98aaa72590d45b8a6aec3d8222468d1875f8fc798f1d891b6424749102d0b0f0
+      checksum: 563eb5c9daeec67a760ac236b2848aee4ec0e39dca1368150a6d99844d4d665f
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 0ac7ffcb92c56fbc392d82e8242c32d071b62790414ab7b2b4d1ba967acf4520
+      checksum: 74940f06f4c92582262014a9967f298bccee3ca94e3a490ddc40787573c91ed0
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 1e2685775d45299e6f6b7439f44586c87fcb6ae14e3eb4f2ed0034b5ffed4d42
+      checksum: 2ecad2b2bdd362d9d871322eac79370d12314e3d32a53c83be17d054e91f188d
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: be0619c4b49dd201f4e4d3e4445c4d627c1d1f1453a0e1de03cc9933a4f5a26b
+      checksum: 5e4c4096ca7b0c7a97fe03f684c0678396c97f24c2065dc961081d022a8ad2a7
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 7ffd025a7dccca6f6730df2146faeb541fb0a4659fb802e88587471cd625ca94
+      checksum: 2eaa4beeb3322ec3c6007f4a8ec483405f8ade4c372031a068bbedf05da9443d
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: bfa4ca6c793efd081ac6991fae30c470c7edf9a0808726907b607120ba0eb505
+      checksum: 4805995f0b10d4b5183e4a2430af19638372a4f290d95a123a0874b2f3878d8e
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 7ffd025a7dccca6f6730df2146faeb541fb0a4659fb802e88587471cd625ca94
+      checksum: 2eaa4beeb3322ec3c6007f4a8ec483405f8ade4c372031a068bbedf05da9443d
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: bfa4ca6c793efd081ac6991fae30c470c7edf9a0808726907b607120ba0eb505
+      checksum: 4805995f0b10d4b5183e4a2430af19638372a4f290d95a123a0874b2f3878d8e
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/appsignal_extension.c

@@ -19,6 +19,7 @@ VALUE Appsignal;
 VALUE Extension;
 VALUE Transaction;
 VALUE Data;
+VALUE Span;
 
 static VALUE start(VALUE self) {
   appsignal_start();
@@ -545,6 +546,180 @@ static VALUE data_to_s(VALUE self) {
   }
 }
 
+static VALUE root_span_new(VALUE self, VALUE namespace) {
+  appsignal_span_t* span;
+
+  Check_Type(namespace, T_STRING);
+
+  span = appsignal_create_root_span(make_appsignal_string(namespace));
+
+  if (span) {
+    return Data_Wrap_Struct(Span, NULL, appsignal_free_span, span);
+  } else {
+    return Qnil;
+  }
+}
+
+static VALUE child_span_new(VALUE self) {
+  appsignal_span_t* parent;
+  appsignal_span_t* span;
+
+  Data_Get_Struct(self, appsignal_span_t, parent);
+
+  span = appsignal_create_child_span(parent);
+
+  if (span) {
+    return Data_Wrap_Struct(Span, NULL, appsignal_free_span, span);
+  } else {
+    return Qnil;
+  }
+}
+
+static VALUE set_span_name(VALUE self, VALUE name) {
+  appsignal_span_t* span;
+
+  Check_Type(name, T_STRING);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_set_span_name(span, make_appsignal_string(name));
+  return Qnil;
+}
+
+static VALUE add_span_error(VALUE self, VALUE name, VALUE message, VALUE backtrace) {
+  appsignal_span_t* span;
+  appsignal_data_t* backtrace_data;
+
+  Check_Type(name, T_STRING);
+  Check_Type(message, T_STRING);
+  Check_Type(backtrace, RUBY_T_DATA);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+  Data_Get_Struct(backtrace, appsignal_data_t, backtrace_data);
+
+  appsignal_add_span_error(
+      span,
+      make_appsignal_string(name),
+      make_appsignal_string(message),
+      backtrace_data
+  );
+  return Qnil;
+}
+
+static VALUE set_span_sample_data(VALUE self, VALUE key, VALUE payload) {
+  appsignal_span_t* span;
+  appsignal_data_t* payload_data;
+
+  Check_Type(key, T_STRING);
+  Check_Type(payload, RUBY_T_DATA);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+  Data_Get_Struct(payload, appsignal_data_t, payload_data);
+
+  appsignal_set_span_sample_data(
+      span,
+      make_appsignal_string(key),
+      payload_data
+  );
+  return Qnil;
+}
+
+static VALUE set_span_attribute_string(VALUE self, VALUE key, VALUE value) {
+  appsignal_span_t* span;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_STRING);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_set_span_attribute_string(
+    span,
+    make_appsignal_string(key),
+    make_appsignal_string(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE set_span_attribute_int(VALUE self, VALUE key, VALUE value) {
+  appsignal_span_t* span;
+  VALUE value_type = TYPE(value);
+
+  Check_Type(key, T_STRING);
+
+  if (value_type != T_FIXNUM && value_type != T_BIGNUM) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Integer)", rb_obj_classname(value));
+  }
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_set_span_attribute_int(
+    span,
+    make_appsignal_string(key),
+    NUM2LONG(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE set_span_attribute_bool(VALUE self, VALUE key, VALUE value) {
+  appsignal_span_t* span;
+
+  Check_Type(key, T_STRING);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_set_span_attribute_bool(
+    span,
+    make_appsignal_string(key),
+    RTEST(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE set_span_attribute_double(VALUE self, VALUE key, VALUE value) {
+  appsignal_span_t* span;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_set_span_attribute_double(
+    span,
+    make_appsignal_string(key),
+    NUM2DBL(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE span_to_json(VALUE self) {
+  appsignal_span_t* span;
+  appsignal_string_t json;
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  json = appsignal_span_to_json(span);
+
+  if (json.len == 0) {
+    return Qnil;
+  } else {
+    return make_ruby_string(json);
+  }
+}
+
+static VALUE close_span(VALUE self) {
+  appsignal_span_t* span;
+
+  Data_Get_Struct(self, appsignal_span_t, span);
+
+  appsignal_close_span(span);
+
+  return Qnil;
+}
+
 static VALUE set_gauge(VALUE self, VALUE key, VALUE value, VALUE tags) {
   appsignal_data_t* tags_data;
 
@@ -652,6 +827,7 @@ void Init_appsignal_extension(void) {
   Extension = rb_define_class_under(Appsignal, "Extension", rb_cObject);
   Transaction = rb_define_class_under(Extension, "Transaction", rb_cObject);
   Data = rb_define_class_under(Extension, "Data", rb_cObject);
+  Span = rb_define_class_under(Extension, "Span", rb_cObject);
 
   // Starting and stopping
   rb_define_singleton_method(Extension, "start",    start,    0);
@@ -705,6 +881,31 @@ void Init_appsignal_extension(void) {
   // Get JSON content of a data
   rb_define_method(Data, "to_s", data_to_s, 0);
 
+  // Create a span
+  rb_define_singleton_method(Span, "root", root_span_new, 1);
+  rb_define_method(Span, "child", child_span_new, 0);
+
+  // Set span error
+  rb_define_method(Span, "add_error", add_span_error, 3);
+
+  // Set span sample data
+  rb_define_method(Span, "set_sample_data", set_span_sample_data, 2);
+
+  // Span name and namespace
+  rb_define_method(Span, "set_name", set_span_name, 1);
+
+  // Set attributes on a span
+  rb_define_method(Span, "set_attribute_string", set_span_attribute_string, 2);
+  rb_define_method(Span, "set_attribute_int",    set_span_attribute_int,    2);
+  rb_define_method(Span, "set_attribute_bool",   set_span_attribute_bool,   2);
+  rb_define_method(Span, "set_attribute_double", set_span_attribute_double, 2);
+
+  // Span to json
+  rb_define_method(Span, "to_json", span_to_json, 0);
+
+  // Close span
+  rb_define_method(Span, "close", close_span, 0);
+
   // Other helper methods
   rb_define_singleton_method(Extension, "install_allocation_event_hook", install_allocation_event_hook, 0);
   rb_define_singleton_method(Extension, "running_in_container?", running_in_container, 0);

data/ext/base.rb

@@ -2,6 +2,7 @@ require "digest"
 require "fileutils"
 require "open-uri"
 require "zlib"
+require "json"
 require "yaml"
 require "rubygems/package"
 require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
@@ -60,7 +61,7 @@ end
 
 def write_report
   File.open(File.join(EXT_PATH, "install.report"), "w") do |file|
-    file.write YAML.dump(report)
+    file.write JSON.generate(report)
   end
 end
 

data/gemfiles/rails-6.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "net-smtp", require: false
+gem "sidekiq"
+
+gemspec :path => "../"

data/gemfiles/rails-7.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', "~> 7.0.1"
+gem "sidekiq"
+gem "rake", "> 12.2"
+
+gemspec :path => '../'

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

@@ -32,20 +32,6 @@ module Appsignal
 
           IO.binread(path, length, offset)
         end
-
-        def self.parse_yaml(contents)
-          if YAML.respond_to? :safe_load
-            if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-              # Use keyword params for Ruby 2.6 and up
-              YAML.safe_load(contents, :permitted_classes => [Time])
-            else
-              YAML.safe_load(contents, [Time])
-            end
-          else
-            # Support for Ruby versions without YAML.safe_load
-            YAML.load(contents) # rubocop:disable Security/YAMLLoad
-          end
-        end
       end
     end
   end

data/lib/appsignal/cli/diagnose.rb

@@ -352,8 +352,8 @@ module Appsignal
         def fetch_installation_report
           path = File.expand_path("../../../../ext/install.report", __FILE__)
           raw_report = File.read(path)
-          Utils.parse_yaml(raw_report)
-        rescue StandardError, Psych::SyntaxError => e # rubocop:disable Lint/ShadowedException
+          JSON.parse(raw_report)
+        rescue StandardError, JSON::ParserError => e # rubocop:disable Lint/ShadowedException
           {
             "parsing_error" => {
               "error" => "#{e.class}: #{e}",
@@ -411,7 +411,7 @@ module Appsignal
         def print_installation_build_report(report)
           report = report.fetch("build", {})
           puts "  Build details"
-          puts_format "Install time", report["time"].to_s, :level => 2
+          puts_format "Install time", report["time"], :level => 2
           puts_format "Architecture", report["architecture"], :level => 2
           puts_format "Target", report["target"], :level => 2
           puts_format "Musl override", report["musl_override"], :level => 2
@@ -474,7 +474,6 @@ module Appsignal
               :env => config.env_config
             }
           }
-          print_environment(config)
           print_config_options(config)
         end
 
@@ -483,7 +482,7 @@ module Appsignal
           option = :env
           option_sources = sources_for_option(option)
           sources_label = config_sources_label(option, option_sources)
-          print "  Environment: #{format_config_option(env)}"
+          print "  environment: #{format_config_option(env)}"
 
           if env == ""
             message = "    Warning: No environment set, no config loaded!\n" \
@@ -497,10 +496,22 @@ module Appsignal
         end
 
         def print_config_options(config)
-          config.config_hash.each do |key, value|
+          # We add the nullified "environment" key to print it ordered
+          # instead of adding it at the top of the list.
+          ordered_config_options = config
+            .config_hash
+            .merge(:environment => nil)
+            .sort
+
+          ordered_config_options.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}"
+
+            if key == :environment
+              print_environment(config)
+            else
+              puts "  #{key}: #{format_config_option(value)}#{sources_label}"
+            end
           end
 
           puts "\nRead more about how the diagnose config output is rendered\n"\
@@ -566,7 +577,7 @@ module Appsignal
             when "401"
               ["invalid", :red]
             else
-              ["Failed with status #{status}\n#{error.inspect}", :red]
+              ["Failed to validate: status #{status}\n#{error.inspect}", :red]
             end
           data[:validation][:push_api_key] = result
           puts_value "Validating Push API key", colorize(result, color)