appsignal 3.0.15-java → 3.0.16-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17405da02c2ea9322d8d6687841d717a4cd968349a60c9ff9d11c8d7734bdf84
-  data.tar.gz: a752315ee55123a5f1eb8ff018947462183b06229ae353316bc7d0f6d4b30999
+  metadata.gz: 61a15fcd31446aaa4f813957c6480260938926b5aeaa737529e168bc79b5ea9b
+  data.tar.gz: 3a0f796a71985048fac24343f92a79d041069470280fb78f7a51121f934397b2
 SHA512:
-  metadata.gz: 56b4c11e66949d2a4e6037f4520a523d104105c62f483a5e6b966ec358e44bd3a094747fd2548969304e50e8dffd2494d65da17c6897eda432c5ab4b7a127bb5
-  data.tar.gz: 6f0547e932253c53e0fb05d81ca0e8dae41d1e7789c849daf8a475c74df8b230ceba4a952869578902383be9d3620f66f14ee4b31e5449e2ec9340551dc9f53d
+  metadata.gz: 9e4764dab62e7dcb8e166d29c9b2264e47cd9285abc2b06affa8898232fa6f9ef3e734de67e3a361b01bb981acec1fdfcde4ec945162a583572a8834c68f23a6
+  data.tar.gz: 74d11d47c32a02ffdc5da5f42aaed1c113188bb780123304492516c4aecf0b1f14fb65b8c2a3dc711dc0dd43892598b960c3a4f1b61ccbe55cc1b979ac0e8ce1

data/.semaphore/semaphore.yml

@@ -113,7 +113,7 @@ blocks:
     - name: Diagnose
       env_vars:
       - name: RUBY_VERSION
-        value: 2.6.6
+        value: 3.0.2
       - name: LANGUAGE
         value: ruby
       commands:

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # AppSignal for Ruby gem Changelog
 
+## 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/build_matrix.yml

@@ -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:

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: 0db01c2
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 72e3e84ce59f4b84287f0d72ec567447a28e42fb758eb27dd7676cd7613eb2e9
+      checksum: 8a7cf35f8c9aa98e7778b720f33b38bfbdedcdedb0047035259ab187517be971
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 6ad516e25fe140cc8f13ca2e14494d7d8a696ce1344faf71952f6c6f8b972fa5
+      checksum: 4330f83a44db6f092b3f437d942204e9bf7f7022ae2cc24ade4e7b4137905d03
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 72e3e84ce59f4b84287f0d72ec567447a28e42fb758eb27dd7676cd7613eb2e9
+      checksum: 8a7cf35f8c9aa98e7778b720f33b38bfbdedcdedb0047035259ab187517be971
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 6ad516e25fe140cc8f13ca2e14494d7d8a696ce1344faf71952f6c6f8b972fa5
+      checksum: 4330f83a44db6f092b3f437d942204e9bf7f7022ae2cc24ade4e7b4137905d03
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 446da8ea04b9a23de970332fb30fa7aa44b5aa3da371a8bacc240b3c8dfef3df
+      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 86d3bffeaa1329628c3dc540c6dcde735e58e2593c769a29f373e38c20657c70
+      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: d14ed2b2ba05b7a0a229eaba8ee710c35ff0c8681084ec5d0650fb53dae7b3d3
+      checksum: edf43f1a6b340c0afa07c7b71963def9bb68bd8d62d17cb64a7f7a36f84a4517
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 359e45e9d00d1795e6f1d1d2452350effd24a9baefc72cd3bca3631b09d4abc6
+      checksum: 8390561e1a41e4b8bba8e4f92b9b49f957650eca21d281589143b9c3764f504e
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 18cd5ef04e547dcc522faa0a462a00bac27e9bd221bd4dd8e6e2e934d4afd5b7
+      checksum: 4179334f88dc32e00ce62aa196b3e47b4258b12ec48dd3cf722d4f6eeb4dc2c0
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: e5edeee4c66cb7e1ff372c3d9eddf5832741bc41b237bbddb2dd2e14c07e076d
+      checksum: 7c6bcc88e5d218c1986d1a9f1c9ad728c72e68a440656b2e9228d432ba300f86
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 18cd5ef04e547dcc522faa0a462a00bac27e9bd221bd4dd8e6e2e934d4afd5b7
+      checksum: 4179334f88dc32e00ce62aa196b3e47b4258b12ec48dd3cf722d4f6eeb4dc2c0
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: e5edeee4c66cb7e1ff372c3d9eddf5832741bc41b237bbddb2dd2e14c07e076d
+      checksum: 7c6bcc88e5d218c1986d1a9f1c9ad728c72e68a440656b2e9228d432ba300f86
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 98aaa72590d45b8a6aec3d8222468d1875f8fc798f1d891b6424749102d0b0f0
+      checksum: d602823277cac752bdea742d928112cef457bc61ee05b960b316fc052f0cc714
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 0ac7ffcb92c56fbc392d82e8242c32d071b62790414ab7b2b4d1ba967acf4520
+      checksum: 2e9e955672dec266b408770638c0503a072410e03526b1eef2170326b083a42f
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 1e2685775d45299e6f6b7439f44586c87fcb6ae14e3eb4f2ed0034b5ffed4d42
+      checksum: dfbdff116339b99613fff6ed4092b772e58f0d3e667b7de347b4215fb7ea9d62
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: be0619c4b49dd201f4e4d3e4445c4d627c1d1f1453a0e1de03cc9933a4f5a26b
+      checksum: 560835ec657b471d50c765a932385cd0e3b6bdca54d2a5e28b4203e43869cf3d
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 7ffd025a7dccca6f6730df2146faeb541fb0a4659fb802e88587471cd625ca94
+      checksum: e31a7d89798193857247bd3590a554782fcff64b65d3da86d9c451d3147e961a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: bfa4ca6c793efd081ac6991fae30c470c7edf9a0808726907b607120ba0eb505
+      checksum: e7f007cc385a23977ca93b58439dc720d703b7cc5929ef52a7acd59f74703b92
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 7ffd025a7dccca6f6730df2146faeb541fb0a4659fb802e88587471cd625ca94
+      checksum: e31a7d89798193857247bd3590a554782fcff64b65d3da86d9c451d3147e961a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: bfa4ca6c793efd081ac6991fae30c470c7edf9a0808726907b607120ba0eb505
+      checksum: e7f007cc385a23977ca93b58439dc720d703b7cc5929ef52a7acd59f74703b92
       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/lib/appsignal/cli/diagnose.rb

@@ -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)

data/lib/appsignal/config.rb

@@ -11,15 +11,26 @@ module Appsignal
     include Appsignal::Utils::DeprecationMessage
 
     DEFAULT_CONFIG = {
+      :ca_file_path                   => File.expand_path(File.join("../../../resources/cacert.pem"), __FILE__),
       :debug                          => false,
-      :log                            => "file",
+      :dns_servers                    => [],
+      :enable_allocation_tracking     => true,
+      :enable_gc_instrumentation      => false,
+      :enable_host_metrics            => true,
+      :enable_minutely_probes         => true,
+      :enable_statsd                  => true,
+      :endpoint                       => "https://push.appsignal.com",
+      :files_world_accessible         => true,
+      :filter_parameters              => [],
+      :filter_session_data            => [],
       :ignore_actions                 => [],
       :ignore_errors                  => [],
       :ignore_namespaces              => [],
-      :filter_parameters              => [],
-      :filter_session_data            => [],
-      :send_environment_metadata      => true,
-      :send_params                    => true,
+      :instrument_net_http            => true,
+      :instrument_redis               => true,
+      :instrument_sequel              => true,
+      :log                            => "file",
+      :log_level                      => "info",
       :request_headers                => %w[
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_CONNECTION
@@ -27,56 +38,47 @@ module Appsignal
         REQUEST_METHOD REQUEST_URI SERVER_NAME SERVER_PORT
         SERVER_PROTOCOL
       ],
-      :endpoint                       => "https://push.appsignal.com",
-      :instrument_net_http            => true,
-      :instrument_redis               => true,
-      :instrument_sequel              => true,
+      :send_environment_metadata      => true,
+      :send_params                    => true,
       :skip_session_data              => false,
-      :enable_allocation_tracking     => true,
-      :enable_gc_instrumentation      => false,
-      :enable_host_metrics            => true,
-      :enable_minutely_probes         => true,
-      :enable_statsd                  => true,
-      :ca_file_path                   => File.expand_path(File.join("../../../resources/cacert.pem"), __FILE__),
-      :dns_servers                    => [],
-      :files_world_accessible         => true,
       :transaction_debug_mode         => false
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
       "APPSIGNAL_ACTIVE"                         => :active,
-      "APPSIGNAL_PUSH_API_KEY"                   => :push_api_key,
       "APPSIGNAL_APP_NAME"                       => :name,
-      "APPSIGNAL_PUSH_API_ENDPOINT"              => :endpoint,
+      "APPSIGNAL_CA_FILE_PATH"                   => :ca_file_path,
       "APPSIGNAL_DEBUG"                          => :debug,
-      "APPSIGNAL_LOG"                            => :log,
-      "APPSIGNAL_LOG_PATH"                       => :log_path,
-      "APPSIGNAL_INSTRUMENT_NET_HTTP"            => :instrument_net_http,
-      "APPSIGNAL_INSTRUMENT_REDIS"               => :instrument_redis,
-      "APPSIGNAL_INSTRUMENT_SEQUEL"              => :instrument_sequel,
-      "APPSIGNAL_SKIP_SESSION_DATA"              => :skip_session_data,
-      "APPSIGNAL_IGNORE_ACTIONS"                 => :ignore_actions,
-      "APPSIGNAL_IGNORE_ERRORS"                  => :ignore_errors,
-      "APPSIGNAL_IGNORE_NAMESPACES"              => :ignore_namespaces,
-      "APPSIGNAL_FILTER_PARAMETERS"              => :filter_parameters,
-      "APPSIGNAL_FILTER_SESSION_DATA"            => :filter_session_data,
-      "APPSIGNAL_SEND_ENVIRONMENT_METADATA"      => :send_environment_metadata,
-      "APPSIGNAL_SEND_PARAMS"                    => :send_params,
-      "APPSIGNAL_HTTP_PROXY"                     => :http_proxy,
+      "APPSIGNAL_DNS_SERVERS"                    => :dns_servers,
       "APPSIGNAL_ENABLE_ALLOCATION_TRACKING"     => :enable_allocation_tracking,
       "APPSIGNAL_ENABLE_GC_INSTRUMENTATION"      => :enable_gc_instrumentation,
-      "APPSIGNAL_RUNNING_IN_CONTAINER"           => :running_in_container,
-      "APPSIGNAL_WORKING_DIR_PATH"               => :working_dir_path,
-      "APPSIGNAL_WORKING_DIRECTORY_PATH"         => :working_directory_path,
       "APPSIGNAL_ENABLE_HOST_METRICS"            => :enable_host_metrics,
       "APPSIGNAL_ENABLE_MINUTELY_PROBES"         => :enable_minutely_probes,
       "APPSIGNAL_ENABLE_STATSD"                  => :enable_statsd,
-      "APPSIGNAL_HOSTNAME"                       => :hostname,
-      "APPSIGNAL_CA_FILE_PATH"                   => :ca_file_path,
-      "APPSIGNAL_DNS_SERVERS"                    => :dns_servers,
       "APPSIGNAL_FILES_WORLD_ACCESSIBLE"         => :files_world_accessible,
+      "APPSIGNAL_FILTER_PARAMETERS"              => :filter_parameters,
+      "APPSIGNAL_FILTER_SESSION_DATA"            => :filter_session_data,
+      "APPSIGNAL_HOSTNAME"                       => :hostname,
+      "APPSIGNAL_HTTP_PROXY"                     => :http_proxy,
+      "APPSIGNAL_IGNORE_ACTIONS"                 => :ignore_actions,
+      "APPSIGNAL_IGNORE_ERRORS"                  => :ignore_errors,
+      "APPSIGNAL_IGNORE_NAMESPACES"              => :ignore_namespaces,
+      "APPSIGNAL_INSTRUMENT_NET_HTTP"            => :instrument_net_http,
+      "APPSIGNAL_INSTRUMENT_REDIS"               => :instrument_redis,
+      "APPSIGNAL_INSTRUMENT_SEQUEL"              => :instrument_sequel,
+      "APPSIGNAL_LOG"                            => :log,
+      "APPSIGNAL_LOG_LEVEL"                      => :log_level,
+      "APPSIGNAL_LOG_PATH"                       => :log_path,
+      "APPSIGNAL_PUSH_API_ENDPOINT"              => :endpoint,
+      "APPSIGNAL_PUSH_API_KEY"                   => :push_api_key,
       "APPSIGNAL_REQUEST_HEADERS"                => :request_headers,
+      "APPSIGNAL_RUNNING_IN_CONTAINER"           => :running_in_container,
+      "APPSIGNAL_SEND_ENVIRONMENT_METADATA"      => :send_environment_metadata,
+      "APPSIGNAL_SEND_PARAMS"                    => :send_params,
+      "APPSIGNAL_SKIP_SESSION_DATA"              => :skip_session_data,
       "APPSIGNAL_TRANSACTION_DEBUG_MODE"         => :transaction_debug_mode,
+      "APPSIGNAL_WORKING_DIRECTORY_PATH"         => :working_directory_path,
+      "APPSIGNAL_WORKING_DIR_PATH"               => :working_dir_path,
       "APP_REVISION"                             => :revision
     }.freeze
     # @api private
@@ -86,6 +88,7 @@ module Appsignal
       APPSIGNAL_HOSTNAME
       APPSIGNAL_HTTP_PROXY
       APPSIGNAL_LOG
+      APPSIGNAL_LOG_LEVEL
       APPSIGNAL_LOG_PATH
       APPSIGNAL_PUSH_API_ENDPOINT
       APPSIGNAL_PUSH_API_KEY
@@ -268,32 +271,35 @@ module Appsignal
 
     def write_to_environment # rubocop:disable Metrics/AbcSize
       ENV["_APPSIGNAL_ACTIVE"]                       = active?.to_s
-      ENV["_APPSIGNAL_APP_PATH"]                     = root_path.to_s
       ENV["_APPSIGNAL_AGENT_PATH"]                   = File.expand_path("../../../ext", __FILE__).to_s
+      ENV["_APPSIGNAL_APP_NAME"]                     = config_hash[:name]
+      ENV["_APPSIGNAL_APP_PATH"]                     = root_path.to_s
+      ENV["_APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
+      ENV["_APPSIGNAL_DEBUG_LOGGING"]                = config_hash[:debug].to_s
+      ENV["_APPSIGNAL_DNS_SERVERS"]                  = config_hash[:dns_servers].join(",")
+      ENV["_APPSIGNAL_ENABLE_HOST_METRICS"]          = config_hash[:enable_host_metrics].to_s
+      ENV["_APPSIGNAL_ENABLE_STATSD"]                = config_hash[:enable_statsd].to_s
       ENV["_APPSIGNAL_ENVIRONMENT"]                  = env
+      ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]       = config_hash[:files_world_accessible].to_s
+      ENV["_APPSIGNAL_FILTER_PARAMETERS"]            = config_hash[:filter_parameters].join(",")
+      ENV["_APPSIGNAL_FILTER_SESSION_DATA"]          = config_hash[:filter_session_data].join(",")
+      ENV["_APPSIGNAL_HOSTNAME"]                     = config_hash[:hostname].to_s
+      ENV["_APPSIGNAL_HTTP_PROXY"]                   = config_hash[:http_proxy]
+      ENV["_APPSIGNAL_IGNORE_ACTIONS"]               = config_hash[:ignore_actions].join(",")
+      ENV["_APPSIGNAL_IGNORE_ERRORS"]                = config_hash[:ignore_errors].join(",")
+      ENV["_APPSIGNAL_IGNORE_NAMESPACES"]            = config_hash[:ignore_namespaces].join(",")
       ENV["_APPSIGNAL_LANGUAGE_INTEGRATION_VERSION"] = "ruby-#{Appsignal::VERSION}"
-      ENV["_APPSIGNAL_DEBUG_LOGGING"]                = config_hash[:debug].to_s
       ENV["_APPSIGNAL_LOG"]                          = config_hash[:log]
+      ENV["_APPSIGNAL_LOG_LEVEL"]                    = config_hash[:log_level]
       ENV["_APPSIGNAL_LOG_FILE_PATH"]                = log_file_path.to_s if log_file_path
+      ENV["_APPSIGNAL_PROCESS_NAME"]                 = $PROGRAM_NAME
       ENV["_APPSIGNAL_PUSH_API_ENDPOINT"]            = config_hash[:endpoint]
       ENV["_APPSIGNAL_PUSH_API_KEY"]                 = config_hash[:push_api_key]
-      ENV["_APPSIGNAL_APP_NAME"]                     = config_hash[:name]
-      ENV["_APPSIGNAL_HTTP_PROXY"]                   = config_hash[:http_proxy]
-      ENV["_APPSIGNAL_IGNORE_ACTIONS"]               = config_hash[:ignore_actions].join(",")
-      ENV["_APPSIGNAL_IGNORE_ERRORS"]                = config_hash[:ignore_errors].join(",")
-      ENV["_APPSIGNAL_IGNORE_NAMESPACES"]            = config_hash[:ignore_namespaces].join(",")
       ENV["_APPSIGNAL_RUNNING_IN_CONTAINER"]         = config_hash[:running_in_container].to_s
-      ENV["_APPSIGNAL_WORKING_DIR_PATH"]             = config_hash[:working_dir_path] if config_hash[:working_dir_path]
-      ENV["_APPSIGNAL_WORKING_DIRECTORY_PATH"]       = config_hash[:working_directory_path] if config_hash[:working_directory_path]
-      ENV["_APPSIGNAL_ENABLE_HOST_METRICS"]          = config_hash[:enable_host_metrics].to_s
-      ENV["_APPSIGNAL_HOSTNAME"]                     = config_hash[:hostname].to_s
-      ENV["_APPSIGNAL_PROCESS_NAME"]                 = $PROGRAM_NAME
-      ENV["_APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
-      ENV["_APPSIGNAL_DNS_SERVERS"]                  = config_hash[:dns_servers].join(",")
-      ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]       = config_hash[:files_world_accessible].to_s
-      ENV["_APPSIGNAL_TRANSACTION_DEBUG_MODE"]       = config_hash[:transaction_debug_mode].to_s
       ENV["_APPSIGNAL_SEND_ENVIRONMENT_METADATA"]    = config_hash[:send_environment_metadata].to_s
-      ENV["_APPSIGNAL_ENABLE_STATSD"]                = config_hash[:enable_statsd].to_s
+      ENV["_APPSIGNAL_TRANSACTION_DEBUG_MODE"]       = config_hash[:transaction_debug_mode].to_s
+      ENV["_APPSIGNAL_WORKING_DIRECTORY_PATH"]       = config_hash[:working_directory_path] if config_hash[:working_directory_path]
+      ENV["_APPSIGNAL_WORKING_DIR_PATH"]             = config_hash[:working_dir_path] if config_hash[:working_dir_path]
       ENV["_APP_REVISION"]                           = config_hash[:revision].to_s
     end