appsignal 3.1.4-java → 3.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a83cde5a5fd83b9e14f1429d5a9f695d080ffc2ac729a02f83f3b891b812c3
-  data.tar.gz: 53743646f5cf821ab45559817cf65c2bf9ed483184725fca2413b3606fad6e1e
+  metadata.gz: 20749c0f3826167272d727c37dd1e881502a9654f8b499d4f3fcdf40dd386178
+  data.tar.gz: 90ddbe20ee5243338aefdfbefbb1989bbe1df5cc57a56a4f277bcfa789086b41
 SHA512:
-  metadata.gz: 3e56000d21fc9cb56edc28ef15ad22d8ab493d081e8e88d8e112c592b7a8bf93c3ac2d0a24b2ea97b7cc85f26fe2fdbdf751894c4fb156f3189bc962504f93d5
-  data.tar.gz: b03a309a6c8649397e6f5d9b62a65324e4b4e39a3a1eee77b6cb60280758838212e2de7ca3eb28c8f10b3b59cb5b02ca7d88347cc9f3995be0308bf5249cae70
+  metadata.gz: c9f2133fe6f929ebbbee6b9c8f47f85bd3c895b518daf6a69b5ad8a2e9a29ebcd72ca1c25a7aef8512a8493f8941ab711fda9b0f16fff30cac73c40701376a47
+  data.tar.gz: bfe585b6c6ce5f8cc5e470c9a164e6690fc1834e40bb4bd27491f719cbdaf6ebd4b92d1f1ba2bc3001e157f5c35786f12143b29d9908e9ce73d9ca9712c7c5ef

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.1.5
+
+### Changed
+
+- [4035c3c2](https://github.com/appsignal/appsignal-ruby/commit/4035c3c2d5c0b002119054014daddd193bd820f0) patch - Bump agent to version 813a59b
+  
+  - Fix http proxy config option parsing for port 80.
+  - Fix the return value for appsignal_import_opentelemetry_span extension
+    function in `appsignal.h`.
+
+### Fixed
+
+- [feb60fb8](https://github.com/appsignal/appsignal-ruby/commit/feb60fb877a2b264e587fe3d5d546e40d86c9c38) patch - Fix NoMethodError for AppSignal Puma plugin for Puma 6. Puma 5 is also still supported.
+
 ## 3.1.4
 
 ### Added

data/ext/agent.yml

@@ -3,99 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: '06391fb'
+version: 813a59b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
+      checksum: c73b6e9de849a40290a0d90eaad43ea41a9a0293ba4b8bf99f69965c45c85514
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
+      checksum: 90226eefe2e2f66833ca3e31c69ce70763ed57916bd0b5c1809bd99d61ff3429
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
+      checksum: 8355b017093db606014023cc617d84d6375d503d7ffa54f62c7b3dc56fb64ead
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
+      checksum: 7c239a7ffe18cb173120bd67fb96563f4a81f0744bbbb47082f077a38ccbe5f1
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
+      checksum: e9d98ed23b872dbf1e67a081473918cf88c4af775b1caadbfd93deda2635d9f8
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 609d59376d6633652015e838eb649229fe2523d443a5471232b869f48eb99640
+      checksum: 5538172a95dfca1a4cf8e111ba61eab5e9c16314fa902259711cb9e8e0d2f85e
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   aarch64-linux-musl:
     static:
-      checksum: e90ca19bf61596be022ba04897e8902b3401add58f351a40a3d3a7af241d0bbb
+      checksum: 0fb3eacfb8c8bc01c4acc8916327626720de376bcdd95104be71bb11a4ff9215
       filename: appsignal-aarch64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: afb66c65fb82b672887bc6b6e82d82f09d9855a5497a7abb06b438dadea97aca
+      checksum: b87bcedaa2aa886acf3a93ce6e32762a843f3bee1ca7a8f9e0d17ca32f7a7d39
       filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/padrino.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'padrino', "~> 0.15"
-gem 'rack'
+gem 'rack', "~> 2"
+gem 'sinatra', "~> 2"
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'que'
+gem 'que', "~> 1.0"
 
 gemspec :path => '../'

data/lib/appsignal/version.rb

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

data/lib/puma/plugin/appsignal.rb

@@ -11,9 +11,9 @@ require "json"
 Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
   def start(launcher)
     @launcher = launcher
-    @launcher.events.debug "AppSignal: Puma plugin start."
+    log_debug "AppSignal: Puma plugin start."
     in_background do
-      @launcher.events.debug "AppSignal: Start Puma stats collection loop."
+      log_debug "AppSignal: Start Puma stats collection loop."
       plugin = AppsignalPumaPlugin.new
 
       loop do
@@ -24,12 +24,12 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
           # metrics.
           sleep sleep_time
 
-          @launcher.events.debug "AppSignal: Collecting Puma stats."
+          log_debug "AppSignal: Collecting Puma stats."
           stats = fetch_puma_stats
           if stats
             plugin.call(stats)
           else
-            @launcher.events.log "AppSignal: No Puma stats to report."
+            log_debug "AppSignal: No Puma stats to report."
           end
         rescue StandardError => error
           log_error "Error while processing metrics.", error
@@ -44,8 +44,20 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
     60 # seconds
   end
 
+  def logger
+    if @launcher.respond_to? :log_writer
+      @launcher.log_writer
+    else
+      @launcher.events
+    end
+  end
+
+  def log_debug(message)
+    logger.debug message
+  end
+
   def log_error(message, error)
-    @launcher.events.log "AppSignal: #{message}\n" \
+    logger.error "AppSignal: #{message}\n" \
       "#{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
   end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -683,43 +683,36 @@ describe Appsignal::Transaction do
     end
 
     describe "#sample_data" do
-      it "should sample data" do
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "environment",
-          Appsignal::Utils::Data.generate(
-            "CONTENT_LENGTH" => "0",
-            "REQUEST_METHOD" => "GET",
-            "SERVER_NAME" => "example.org",
-            "SERVER_PORT" => "80",
-            "PATH_INFO" => "/blog"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "session_data",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "params",
-          Appsignal::Utils::Data.generate(
-            "controller" => "blog_posts",
-            "action" => "show",
-            "id" => "1"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "metadata",
-          Appsignal::Utils::Data.generate("key" => "value")
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "tags",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "breadcrumbs",
-          Appsignal::Utils::Data.generate([])
-        ).once
+      let(:env) { { "rack.session" => { "session" => "value" } } }
 
+      it "sets sample data" do
+        transaction.set_tags "tag" => "value"
+        transaction.add_breadcrumb "category", "action", "message", "key" => "value"
         transaction.sample_data
+
+        sample_data = transaction.to_h["sample_data"]
+        expect(sample_data["environment"]).to include(
+          "CONTENT_LENGTH" => "0",
+          "REQUEST_METHOD" => "GET",
+          "SERVER_NAME" => "example.org",
+          "SERVER_PORT" => "80",
+          "PATH_INFO" => "/blog"
+        )
+        expect(sample_data["session_data"]).to eq("session" => "value")
+        expect(sample_data["params"]).to eq(
+          "controller" => "blog_posts",
+          "action" => "show",
+          "id" => "1"
+        )
+        expect(sample_data["metadata"]).to eq("key" => "value")
+        expect(sample_data["tags"]).to eq("tag" => "value")
+        expect(sample_data["breadcrumbs"]).to contain_exactly(
+          "action" => "action",
+          "category" => "category",
+          "message" => "message",
+          "metadata" => { "key" => "value" },
+          "time" => kind_of(Integer)
+        )
       end
     end
 

data/spec/lib/appsignal_spec.rb

@@ -77,7 +77,7 @@ describe Appsignal do
         end
 
         it "should not install the allocation event hook" do
-          expect(Appsignal::Minutely).not_to receive(:install_allocation_event_hook)
+          expect(Appsignal::Extension).not_to receive(:install_allocation_event_hook)
           Appsignal.start
           expect_not_environment_metadata("ruby_allocation_tracking_enabled")
         end

data/spec/lib/puma/appsignal_spec.rb

@@ -2,14 +2,14 @@ RSpec.describe "Puma plugin" do
   include WaitForHelper
 
   class MockPumaLauncher
-    def events
-      return @events if defined?(@events)
+    def log_writer
+      return @log_writer if defined?(@log_writer)
 
-      @events = MockPumaEvents.new
+      @log_writer = MockPumaLogWriter.new
     end
   end
 
-  class MockPumaEvents
+  class MockPumaLogWriter
     attr_reader :logs
 
     def initialize
@@ -153,7 +153,7 @@ RSpec.describe "Puma plugin" do
   end
 
   def logs
-    launcher.events.logs
+    launcher.log_writer.logs
   end
 
   def messages
@@ -281,7 +281,7 @@ RSpec.describe "Puma plugin" do
     it "does not fetch metrics" do
       run_plugin(appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
-        expect(logs).to include([:log, "AppSignal: No Puma stats to report."])
+        expect(logs).to include([:debug, "AppSignal: No Puma stats to report."])
         expect(messages).to be_empty
       end
     end
@@ -296,4 +296,43 @@ RSpec.describe "Puma plugin" do
       end
     end
   end
+
+  context "with Puma < 6 Events class" do
+    class MockPumaEvents
+      attr_reader :logs
+
+      def initialize
+        @logs = []
+      end
+
+      def log(message)
+        @logs << [:log, message]
+      end
+
+      def debug(message)
+        @logs << [:debug, message]
+      end
+
+      def error(message)
+        @logs << [:error, message]
+      end
+    end
+
+    let(:launcher) do
+      Class.new do
+        def events
+          return @events if defined?(@events)
+
+          @events = MockPumaEvents.new
+        end
+      end.new
+    end
+    let(:stats_data) { { :max_threads => 5 } }
+
+    it "logs messages to the events class" do
+      run_plugin(appsignal_plugin) do
+        expect(launcher.events.logs).to_not be_empty
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -441,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com