appsignal 3.1.5-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20749c0f3826167272d727c37dd1e881502a9654f8b499d4f3fcdf40dd386178
-  data.tar.gz: 90ddbe20ee5243338aefdfbefbb1989bbe1df5cc57a56a4f277bcfa789086b41
+  metadata.gz: 6ba59271103947144c9d29a741b03d602449f20e0603e53d775d7a18f7959aaf
+  data.tar.gz: ab9233cb944b2f35eaf7639a918306ceac42c4de57a337295eeb72d3249043dc
 SHA512:
-  metadata.gz: c9f2133fe6f929ebbbee6b9c8f47f85bd3c895b518daf6a69b5ad8a2e9a29ebcd72ca1c25a7aef8512a8493f8941ab711fda9b0f16fff30cac73c40701376a47
-  data.tar.gz: bfe585b6c6ce5f8cc5e470c9a164e6690fc1834e40bb4bd27491f719cbdaf6ebd4b92d1f1ba2bc3001e157f5c35786f12143b29d9908e9ce73d9ca9712c7c5ef
+  metadata.gz: a7f9e30219e7a1178a13fcc1c3595731a5ebe8734b762f8a10465e644428d9b21482dceff1a984af846f1a947a6444d03450600ba71afd63c4973d177c8629f4
+  data.tar.gz: 64477a38482899aed37b742fa3b8d76b9c562edb46973881bb2881a2eaa3d469ea390516d3ab90f02e2675d27df492b0b516d5679feec9690f167d6b6a983c7f

data/.semaphore/semaphore.yml

@@ -570,6 +570,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.6.9 for http5
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.6.9
+      - name: GEMSET
+        value: http5
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/http5.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 2.6.9 for padrino
       env_vars:
       - *2
@@ -923,6 +941,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.7.5 for http5
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.7.5
+      - name: GEMSET
+        value: http5
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/http5.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 2.7.5 for padrino
       env_vars:
       - *2
@@ -1294,6 +1330,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.3 for http5
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.3
+      - name: GEMSET
+        value: http5
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/http5.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.0.3 for padrino
       env_vars:
       - *2
@@ -1611,6 +1665,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.1 for http5
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.1
+      - name: GEMSET
+        value: http5
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/http5.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.1.1 for padrino
       env_vars:
       - *2
@@ -1910,6 +1982,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.0-preview1 for http5
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.0-preview1
+      - name: GEMSET
+        value: http5
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/http5.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.2.0-preview1 for padrino
       env_vars:
       - *2

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.2.0
+
+### Added
+
+- [199d05c0](https://github.com/appsignal/appsignal-ruby/commit/199d05c0f95be7f2496ddcd05613eb816e9ad4e4) minor - Support the http.rb gem. Any outgoing requests will be tracked as events on the incident event timeline. This instrumentation is activated automatically, but can be disable by setting the `instrumentation_http_rb` option to `false`.
+- [9bcd107d](https://github.com/appsignal/appsignal-ruby/commit/9bcd107de955e557744434fc9f953588a9c7bc49) minor - Support log collection from Ruby apps using the new AppSignal Logging feature. Learn more about [AppSignal's Logging on our docs](https://docs.appsignal.com/logging/platforms/integrations/ruby.html).
+
+## 3.1.6
+
+### Fixed
+
+- [a03b7246](https://github.com/appsignal/appsignal-ruby/commit/a03b72461f5f3b047ca81368cf2bdbeadf078e08) patch - Support Sidekiq 7 in the Sidekiq minutely probe. It will now report metrics to Sidekiq magic dashboard for Sidekiq version 7 and newer.
+
 ## 3.1.5
 
 ### Changed

data/README.md

@@ -232,6 +232,7 @@ configurations you need to run the spec suite with a specific Gemfile.
 BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/grape.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/http5.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/padrino.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/que.gemfile bundle exec rspec

data/build_matrix.yml

@@ -212,6 +212,7 @@ matrix:
     - gem: "capistrano2"
     - gem: "capistrano3"
     - gem: "grape"
+    - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
       only:

data/ext/agent.yml

@@ -3,99 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: 813a59b
+version: 9b62288
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
+      checksum: 5ff2ec4f16f5089e15188670b2c43866c76ab5db2ac07d72878a9816e63171ca
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
+      checksum: c7b1ddd0efbd5fb5c48e7124ab13202c7b5fa2624354db66ebc2673d7196ce31
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
+      checksum: 5ff2ec4f16f5089e15188670b2c43866c76ab5db2ac07d72878a9816e63171ca
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
+      checksum: c7b1ddd0efbd5fb5c48e7124ab13202c7b5fa2624354db66ebc2673d7196ce31
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
+      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
+      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
+      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
+      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
+      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
+      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: c73b6e9de849a40290a0d90eaad43ea41a9a0293ba4b8bf99f69965c45c85514
+      checksum: 0e5d89aeda1e883c912ff069bb76029a1e3cad69f493865d877ffaffa2b45142
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 90226eefe2e2f66833ca3e31c69ce70763ed57916bd0b5c1809bd99d61ff3429
+      checksum: 58b09bf6ca7761a4d68cd9de87a0bb45b3465ace90b62a88d9fe77f629c26d7d
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
+      checksum: ff3cffb1204afd846ba0bb33c50b03f8ada8305527a5908ccfebed6fdcce0e61
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
+      checksum: '0895a85c3df276864807f7b2572c96ea8c8cd3cc770b7cf02656c6bd01981b59'
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
+      checksum: ff3cffb1204afd846ba0bb33c50b03f8ada8305527a5908ccfebed6fdcce0e61
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
+      checksum: '0895a85c3df276864807f7b2572c96ea8c8cd3cc770b7cf02656c6bd01981b59'
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 8355b017093db606014023cc617d84d6375d503d7ffa54f62c7b3dc56fb64ead
+      checksum: 0b6fe4b343461a1a906fc73edb44bc5b12c75214d21fc81ed26d3eb88588003e
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 7c239a7ffe18cb173120bd67fb96563f4a81f0744bbbb47082f077a38ccbe5f1
+      checksum: 82117daf3e1c550526f74f4ec66c403bed22aa8600459b749858814589ed688b
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: e9d98ed23b872dbf1e67a081473918cf88c4af775b1caadbfd93deda2635d9f8
+      checksum: b3f52d7a7a1f4ae8095dd5b1207270dc1797766820d925aca0d09133983c9163
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 5538172a95dfca1a4cf8e111ba61eab5e9c16314fa902259711cb9e8e0d2f85e
+      checksum: 5de9ddc90fc5beb308eadd5381ac0360692cb32e58dcaf0b0d7ecd3dabf44499
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   aarch64-linux-musl:
     static:
-      checksum: 0fb3eacfb8c8bc01c4acc8916327626720de376bcdd95104be71bb11a4ff9215
+      checksum: d306c50cc9f1bc8ea3339b4185b2a60a1c27f17d9067a529b1889d74c6c0a8d6
       filename: appsignal-aarch64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: b87bcedaa2aa886acf3a93ce6e32762a843f3bee1ca7a8f9e0d17ca32f7a7d39
+      checksum: e3015e05a807ef5027ea8929a917873bcdaf714138ab5d6d028e3c855b3a61d3
       filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
+      checksum: 135d2ff898f30b15721eca36569d1a0a5deaaee7b4787937d0888ed49f25019b
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
+      checksum: 873aea3c808b7de431881f2f4b4dae686b20b309e76e3eefbb71e399ebea5284
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
+      checksum: 135d2ff898f30b15721eca36569d1a0a5deaaee7b4787937d0888ed49f25019b
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
+      checksum: 873aea3c808b7de431881f2f4b4dae686b20b309e76e3eefbb71e399ebea5284
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/appsignal_extension.c

@@ -720,6 +720,26 @@ static VALUE close_span(VALUE self) {
   return Qnil;
 }
 
+static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE message, VALUE attributes) {
+  appsignal_data_t* attributes_data;
+
+  Check_Type(group, T_STRING);
+  Check_Type(severity, T_FIXNUM);
+  Check_Type(message, T_STRING);
+  Check_Type(attributes, RUBY_T_DATA);
+
+  Data_Get_Struct(attributes, appsignal_data_t, attributes_data);
+
+  appsignal_log(
+      make_appsignal_string(group),
+      FIX2INT(severity),
+      make_appsignal_string(message),
+      attributes_data
+   );
+
+  return Qnil;
+}
+
 static VALUE set_gauge(VALUE self, VALUE key, VALUE value, VALUE tags) {
   appsignal_data_t* tags_data;
 
@@ -834,6 +854,8 @@ void Init_appsignal_extension(void) {
   rb_define_singleton_method(Extension, "stop",     stop,     0);
   // Diagnostics
   rb_define_singleton_method(Extension, "diagnose", diagnose, 0);
+  // Logging
+  rb_define_singleton_method(Extension, "log", a_log, 4);
 
   // Server state
   rb_define_singleton_method(Extension, "get_server_state", get_server_state, 1);

data/gemfiles/http5.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'http', '~> 5.0'
+
+gemspec :path => '../'

data/lib/appsignal/config.rb

@@ -25,10 +25,12 @@ module Appsignal
       :ignore_actions                 => [],
       :ignore_errors                  => [],
       :ignore_namespaces              => [],
+      :instrument_http_rb             => true,
       :instrument_net_http            => true,
       :instrument_redis               => true,
       :instrument_sequel              => true,
       :log                            => "file",
+      :logging_endpoint               => "https://appsignal-endpoint.net",
       :request_headers                => %w[
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_CONNECTION
@@ -42,17 +44,17 @@ module Appsignal
     }.freeze
 
     # @api private
-    DEFAULT_LOG_LEVEL = Logger::INFO
+    DEFAULT_LOG_LEVEL = ::Logger::INFO
     # Map from the `log_level` config option to Ruby's Logger level value.
     #
     # The trace level doesn't exist in the Ruby logger so it's mapped to debug.
     # @api private
     LOG_LEVEL_MAP = {
-      "error" => Logger::ERROR,
-      "warn" => Logger::WARN,
-      "info" => Logger::INFO,
-      "debug" => Logger::DEBUG,
-      "trace" => Logger::DEBUG
+      "error" => ::Logger::ERROR,
+      "warn" => ::Logger::WARN,
+      "info" => ::Logger::INFO,
+      "debug" => ::Logger::DEBUG,
+      "trace" => ::Logger::DEBUG
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -73,12 +75,14 @@ module Appsignal
       "APPSIGNAL_IGNORE_ACTIONS"                 => :ignore_actions,
       "APPSIGNAL_IGNORE_ERRORS"                  => :ignore_errors,
       "APPSIGNAL_IGNORE_NAMESPACES"              => :ignore_namespaces,
+      "APPSIGNAL_INSTRUMENT_HTTP_RB"             => :instrument_http_rb,
       "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_LOGGING_ENDPOINT"               => :logging_endpoint,
       "APPSIGNAL_PUSH_API_ENDPOINT"              => :endpoint,
       "APPSIGNAL_PUSH_API_KEY"                   => :push_api_key,
       "APPSIGNAL_REQUEST_HEADERS"                => :request_headers,
@@ -101,6 +105,7 @@ module Appsignal
       APPSIGNAL_LOG
       APPSIGNAL_LOG_LEVEL
       APPSIGNAL_LOG_PATH
+      APPSIGNAL_LOGGING_ENDPOINT
       APPSIGNAL_PUSH_API_ENDPOINT
       APPSIGNAL_PUSH_API_KEY
       APPSIGNAL_WORKING_DIRECTORY_PATH
@@ -116,6 +121,7 @@ module Appsignal
       APPSIGNAL_ENABLE_MINUTELY_PROBES
       APPSIGNAL_ENABLE_STATSD
       APPSIGNAL_FILES_WORLD_ACCESSIBLE
+      APPSIGNAL_INSTRUMENT_HTTP_RB
       APPSIGNAL_INSTRUMENT_NET_HTTP
       APPSIGNAL_INSTRUMENT_REDIS
       APPSIGNAL_INSTRUMENT_SEQUEL
@@ -260,7 +266,7 @@ module Appsignal
 
     def log_level
       if config_hash[:debug] || config_hash[:transaction_debug_mode]
-        level = Logger::DEBUG
+        level = ::Logger::DEBUG
       end
       option = config_hash[:log_level]
       if option
@@ -320,6 +326,7 @@ module Appsignal
       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_LOGGING_ENDPOINT"]             = config_hash[:logging_endpoint]
       ENV["_APPSIGNAL_PROCESS_NAME"]                 = $PROGRAM_NAME
       ENV["_APPSIGNAL_PUSH_API_ENDPOINT"]            = config_hash[:endpoint]
       ENV["_APPSIGNAL_PUSH_API_KEY"]                 = config_hash[:push_api_key]

data/lib/appsignal/extension/jruby.rb

@@ -81,6 +81,11 @@ module Appsignal
           [:appsignal_string, :double, :pointer],
           :void
 
+        # Logging methods
+        attach_function :appsignal_log,
+          [:appsignal_string, :int32, :appsignal_string, :pointer],
+          :void
+
         # Transaction methods
         attach_function :appsignal_free_transaction,
           [:pointer],
@@ -264,6 +269,15 @@ module Appsignal
         make_ruby_string state if state[:len] > 0
       end
 
+      def log(group, level, message, attributes)
+        appsignal_log(
+          make_appsignal_string(group),
+          level,
+          make_appsignal_string(message),
+          attributes.pointer
+        )
+      end
+
       def start_transaction(transaction_id, namespace, gc_duration_ms)
         transaction = appsignal_start_transaction(
           make_appsignal_string(transaction_id),

data/lib/appsignal/hooks/http.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class Hooks
+    # @api private
+    class HttpHook < Appsignal::Hooks::Hook
+      register :http_rb
+
+      def dependencies_present?
+        defined?(HTTP::Client) && Appsignal.config && Appsignal.config[:instrument_http_rb]
+      end
+
+      def install
+        require "appsignal/integrations/http"
+        HTTP::Client.send(:prepend, Appsignal::Integrations::HttpIntegration)
+
+        Appsignal::Environment.report_enabled("http_rb")
+      end
+    end
+  end
+end

data/lib/appsignal/hooks.rb

@@ -94,6 +94,7 @@ require "appsignal/hooks/active_job"
 require "appsignal/hooks/active_support_notifications"
 require "appsignal/hooks/celluloid"
 require "appsignal/hooks/delayed_job"
+require "appsignal/hooks/http"
 require "appsignal/hooks/mri"
 require "appsignal/hooks/net_http"
 require "appsignal/hooks/passenger"

data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb

@@ -19,7 +19,7 @@ module Appsignal
               ENV["PWD"],
               env,
               {},
-              Logger.new(StringIO.new)
+              Appsignal::Utils::IntegrationLogger.new(StringIO.new)
             ).tap do |c|
               fetch(:appsignal_config, {}).each do |key, value|
                 c[key] = value

data/lib/appsignal/integrations/http.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Appsignal
+  module Integrations
+    module HttpIntegration
+      def request(verb, uri, opts = {})
+        parsed_request_uri = URI.parse(uri)
+        request_uri = "#{parsed_request_uri.scheme}://#{parsed_request_uri.host}"
+
+        begin
+          Appsignal.instrument("request.http_rb", "#{verb.upcase} #{request_uri}") do
+            super
+          end
+        rescue Exception => error # rubocop:disable Lint/RescueException
+          Appsignal.set_error(error)
+          raise error
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/logger.rb

@@ -3,20 +3,137 @@
 require "logger"
 require "set"
 
-# Subclass of logger with method to only log a warning once
-# prevents the log from filling up with repeated messages.
 module Appsignal
+  # Logger that flushes logs to the AppSignal logging service
   class Logger < ::Logger
-    def seen_keys
-      @seen_keys ||= Set.new
+    # 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)
+      raise TypeError, "group must be a string" unless group.is_a? String
+      @group = group
+      @level = level
     end
 
-    def warn_once_then_debug(key, message)
-      if !seen_keys.add?(key).nil?
-        warn message
-      else
-        debug message
+    # We support the various methods in the Ruby
+    # logger class by supplying this method.
+    # @api private
+    def add(severity, message = nil, group = nil)
+      severity ||= UNKNOWN
+      return true if severity < level
+      group = @group if group.nil?
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          group = @group
+        end
       end
+      return if message.nil?
+      severity_number = case severity
+                        when DEBUG
+                          2
+                        when INFO
+                          3
+                        when WARN
+                          5
+                        when ERROR
+                          6
+                        when FATAL
+                          7
+                        else
+                          0
+                        end
+      Appsignal::Extension.log(
+        group,
+        severity_number,
+        message,
+        Appsignal::Utils::Data.generate({})
+      )
+    end
+    alias log add
+
+    # Log a debug level message
+    # @param message Mesage to log
+    # @param attributes Attributes to tag the log with
+    # @return [void]
+    def debug(message = nil, attributes = {})
+      return if DEBUG < level
+      message = yield if message.nil? && block_given?
+      return if message.nil?
+      Appsignal::Extension.log(
+        @group,
+        2,
+        message,
+        Appsignal::Utils::Data.generate(attributes)
+      )
+    end
+
+    # Log an info level message
+    # @param message Mesage to log
+    # @param attributes Attributes to tag the log with
+    # @return [void]
+    def info(message = nil, attributes = {})
+      return if INFO < level
+      message = yield if message.nil? && block_given?
+      return if message.nil?
+      Appsignal::Extension.log(
+        @group,
+        3,
+        message,
+        Appsignal::Utils::Data.generate(attributes)
+      )
+    end
+
+    # Log a warn level message
+    # @param message Mesage to log
+    # @param attributes Attributes to tag the log with
+    # @return [void]
+    def warn(message = nil, attributes = {})
+      return if WARN < level
+      message = yield if message.nil? && block_given?
+      return if message.nil?
+      Appsignal::Extension.log(
+        @group,
+        5,
+        message,
+        Appsignal::Utils::Data.generate(attributes)
+      )
+    end
+
+    # Log an error level message
+    # @param message Mesage to log
+    # @param attributes Attributes to tag the log with
+    # @return [void]
+    def error(message = nil, attributes = {})
+      return if ERROR < level
+      message = yield if message.nil? && block_given?
+      return if message.nil?
+      Appsignal::Extension.log(
+        @group,
+        6,
+        message,
+        Appsignal::Utils::Data.generate(attributes)
+      )
+    end
+
+    # Log a fatal level message
+    # @param message Mesage to log
+    # @param attributes Attributes to tag the log with
+    # @return [void]
+    def fatal(message = nil, attributes = {})
+      return if FATAL < level
+      message = yield if message.nil? && block_given?
+      return if message.nil?
+      Appsignal::Extension.log(
+        @group,
+        7,
+        message,
+        Appsignal::Utils::Data.generate(attributes)
+      )
     end
   end
 end