appsignal 3.4.2 → 3.4.3

data/spec/lib/appsignal/config_spec.rb

@@ -643,6 +643,7 @@ describe Appsignal::Config do
       expect(ENV.fetch("_APPSIGNAL_FILES_WORLD_ACCESSIBLE", nil)).to eq "true"
       expect(ENV.fetch("_APPSIGNAL_TRANSACTION_DEBUG_MODE", nil)).to eq "true"
       expect(ENV.fetch("_APPSIGNAL_SEND_ENVIRONMENT_METADATA", nil)).to eq "false"
+      expect(ENV.fetch("_APPSIGNAL_STATSD_PORT", nil)).to eq ""
       expect(ENV.fetch("_APPSIGNAL_FILTER_PARAMETERS", nil)).to eq "password,confirm_password"
       expect(ENV.fetch("_APPSIGNAL_FILTER_SESSION_DATA", nil)).to eq "key1,key2"
       expect(ENV.fetch("_APP_REVISION", nil)).to eq "v2.5.1"
@@ -682,6 +683,17 @@ describe Appsignal::Config do
         expect(ENV.fetch("_APPSIGNAL_WORKING_DIRECTORY_PATH", nil)).to eq "/tmp/appsignal2"
       end
     end
+
+    context "with :statsd_port" do
+      before do
+        config[:statsd_port] = "1000"
+        config.write_to_environment
+      end
+
+      it "sets the statsd_port env var" do
+        expect(ENV.fetch("_APPSIGNAL_STATSD_PORT", nil)).to eq "1000"
+      end
+    end
   end
 
   describe "#log_file_path" do

data/spec/lib/puma/appsignal_spec.rb

@@ -106,26 +106,31 @@ RSpec.describe "Puma plugin" do
         end
       end
     end
-    Puma._set_stats = stats_data
     load File.expand_path("../lib/puma/plugin/appsignal.rb", APPSIGNAL_SPEC_DIR)
-
-    @statsd = StatsdServer.new
-    @server_thread = Thread.new { @statsd.start }
-    @server_thread.abort_on_exception = true
   end
   after do
-    @statsd = nil
-
     Object.send(:remove_const, :Puma)
     Object.send(:remove_const, :AppsignalPumaPlugin)
   end
 
-  def run_plugin(plugin, &block)
+  def run_plugin(stats_data, plugin, &block)
+    Puma._set_stats = stats_data
+    @statsd = StatsdServer.new
+    @server_thread = Thread.new { @statsd.start }
+    @server_thread.abort_on_exception = true
     @client_thread = Thread.new { start_plugin(plugin) }
     @client_thread.abort_on_exception = true
     wait_for(:puma_client_wait, &block)
   ensure
-    stop_all
+    Puma._set_stats = nil
+    # Stop all threads in test and stop listening on the UDPSocket
+    @client_thread.kill if defined?(@client_thread) && @client_thread
+    @server_thread.kill if defined?(@server_thread) && @server_thread
+    @client_thread = nil
+    @server_thread = nil
+
+    @statsd.stop if defined?(@statsd) && @statsd
+    @statsd = nil
   end
 
   def appsignal_plugin
@@ -141,15 +146,6 @@ RSpec.describe "Puma plugin" do
     plugin.in_background_block.call
   end
 
-  # Stop all threads in test and stop listening on the UDPSocket
-  def stop_all
-    @client_thread.kill if defined?(@client_thread) && @client_thread
-    @server_thread.kill if defined?(@server_thread) && @server_thread
-    @statsd.stop if defined?(@statsd) && @statsd
-    @client_thread = nil
-    @server_thread = nil
-  end
-
   def logs
     launcher.log_writer.logs
   end
@@ -209,7 +205,7 @@ RSpec.describe "Puma plugin" do
     end
 
     it "collects puma stats as guage metrics with the (summed) worker metrics" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect_gauge(:workers, 2, "type" => "count")
         expect_gauge(:workers, 2, "type" => "booted")
@@ -233,7 +229,7 @@ RSpec.describe "Puma plugin" do
     end
 
     it "calls `puma_gauge` with the (summed) worker metrics" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect_gauge(:connection_backlog, 0)
         expect_gauge(:pool_capacity, 5)
@@ -249,7 +245,7 @@ RSpec.describe "Puma plugin" do
     after { ENV.delete("APPSIGNAL_HOSTNAME") }
 
     it "reports the APPSIGNAL_HOSTNAME as the hostname tag value" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect_gauge(:connection_backlog, 1)
       end
@@ -262,7 +258,7 @@ RSpec.describe "Puma plugin" do
     end
 
     it "fetches metrics from Puma.stats instead" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect(logs).to_not include([kind_of(Symbol), "AppSignal: No Puma stats to report."])
         expect_gauge(:connection_backlog, 1)
@@ -277,7 +273,7 @@ RSpec.describe "Puma plugin" do
     end
 
     it "does not fetch metrics" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect(logs).to include([:debug, "AppSignal: No Puma stats to report."])
         expect(messages).to be_empty
@@ -287,8 +283,7 @@ RSpec.describe "Puma plugin" do
 
   context "without running StatsD server" do
     it "does nothing" do
-      stop_all
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
         expect(messages).to be_empty
       end
@@ -328,7 +323,7 @@ RSpec.describe "Puma plugin" do
     let(:stats_data) { { :max_threads => 5 } }
 
     it "logs messages to the events class" do
-      run_plugin(appsignal_plugin) do
+      run_plugin(stats_data, appsignal_plugin) do
         expect(launcher.events.logs).to_not be_empty
       end
     end

data/spec/support/matchers/contains_log.rb

@@ -1,6 +1,18 @@
 RSpec::Matchers.define :contains_log do |level, message|
+  expected_log_line = "[#{level.upcase}] #{message}"
+
   match do |actual|
-    actual.include?("[#{level.upcase}] #{message}")
+    actual.include?(expected_log_line)
+  end
+
+  failure_message do |actual|
+    <<~MESSAGE
+      Did not contain log line:
+      #{expected_log_line}
+
+      Received logs:
+      #{actual}
+    MESSAGE
   end
 
   diffable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -439,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com