appsignal 4.0.3-java → 4.0.5-java

data/spec/lib/appsignal/transmitter_spec.rb

@@ -52,13 +52,41 @@ describe Appsignal::Transmitter do
         }
       ).to_return(:status => 200)
     end
-    let(:response) { instance.transmit(:the => :payload) }
+
+    let(:response) { instance.transmit({ :the => :payload }) }
 
     it "returns Net::HTTP response" do
       expect(response).to be_kind_of(Net::HTTPResponse)
       expect(response.code).to eq "200"
     end
 
+    describe "with :ndjson format" do
+      before do
+        stub_request(:post, "https://push.appsignal.com/1/action").with(
+          :query => {
+            :api_key => "abc",
+            :environment => "production",
+            :gem_version => Appsignal::VERSION,
+            :hostname => config[:hostname],
+            :name => "TestApp"
+          },
+          :body => "{\"the\":\"payload\"}\n{\"part\":\"two\"}",
+          :headers => {
+            "Content-Type" => "application/x-ndjson; charset=UTF-8"
+          }
+        ).to_return(:status => 200)
+      end
+
+      let(:response) do
+        instance.transmit([{ :the => :payload }, { :part => :two }], :format => :ndjson)
+      end
+
+      it "returns Net::HTTP response" do
+        expect(response).to be_kind_of(Net::HTTPResponse)
+        expect(response.code).to eq "200"
+      end
+    end
+
     context "with ca_file_path config option set" do
       context "when file does not exist" do
         before do
@@ -106,7 +134,7 @@ describe Appsignal::Transmitter do
   end
 
   describe "#http_post" do
-    subject { instance.send(:http_post, "the" => "payload") }
+    subject { instance.send(:http_post, { "the" => "payload" }, :format => :json) }
 
     it "sets the path" do
       expect(subject.path).to eq instance.uri.request_uri
@@ -115,6 +143,24 @@ describe Appsignal::Transmitter do
     it "sets the correct headers" do
       expect(subject["Content-Type"]).to eq "application/json; charset=UTF-8"
     end
+
+    it "serialises the payload to JSON" do
+      expect(subject.body).to eq "{\"the\":\"payload\"}"
+    end
+
+    describe "with :ndjson format" do
+      subject do
+        instance.send(:http_post, [{ "the" => "payload" }, { "part" => "two" }], :format => :ndjson)
+      end
+
+      it "sets the correct headers" do
+        expect(subject["Content-Type"]).to eq "application/x-ndjson; charset=UTF-8"
+      end
+
+      it "serialises the payload to NDJSON" do
+        expect(subject.body).to eq "{\"the\":\"payload\"}\n{\"part\":\"two\"}"
+      end
+    end
   end
 
   describe "#http_client" do

data/spec/lib/appsignal_spec.rb

@@ -581,6 +581,11 @@ describe Appsignal do
         expect(Appsignal.active?).to be_falsy
       end
     end
+
+    it "calls stop on the check-in scheduler" do
+      expect(Appsignal::CheckIn.scheduler).to receive(:stop)
+      Appsignal.stop
+    end
   end
 
   describe ".started?" do

data/spec/spec_helper.rb

@@ -168,13 +168,6 @@ RSpec.configure do |config|
   end
 
   def stop_minutely_probes
-    thread =
-      begin
-        Appsignal::Probes.class_variable_get(:@@thread) # Fetch old thread
-      rescue NameError
-        nil
-      end
     Appsignal::Probes.stop
-    thread&.join # Wait for old thread to exit
   end
 end

data/spec/support/helpers/config_helpers.rb

@@ -46,7 +46,7 @@ module ConfigHelpers
   end
   module_function :build_config
 
-  def start_agent(env: "production", options: {})
+  def start_agent(env: "production", options: {}, internal_logger: nil)
     env = "production" if env == :default
     env ||= "production"
     Appsignal.configure(env, :root_path => project_fixture_path) do |config|
@@ -55,6 +55,7 @@ module ConfigHelpers
       end
     end
     Appsignal.start
+    Appsignal.internal_logger = internal_logger if internal_logger
   end
 
   def clear_integration_env_vars!

data/spec/support/helpers/take_at_most_helper.rb

@@ -0,0 +1,21 @@
+module TakeAtMostHelper
+  # Assert that it takes at most a certain amount of time to run a block.
+  #
+  # @example
+  #  # Assert that it takes at most 1 second to run the block
+  #  take_at_most(1) { sleep 0.5 }
+  #
+  # @param time [Integer, Float] The maximum amount of time the block is allowed to
+  #  run in seconds.
+  # @yield Block to run.
+  # @raise [StandardError] Raises error if the block takes longer than the
+  #  specified time to run.
+  def take_at_most(time)
+    start = Time.now
+    yield
+    elapsed = Time.now - start
+    return if elapsed <= time
+
+    raise "Expected block to take at most #{time} seconds, but took #{elapsed}"
+  end
+end

data/spec/support/matchers/contains_log.rb

@@ -1,14 +1,21 @@
 RSpec::Matchers.define :contains_log do |level, message|
-  expected_log_line = "[#{level.upcase}] #{message}"
+  log_level_prefix = level.upcase
 
   match do |actual|
-    actual.include?(expected_log_line)
+    case message
+    when Regexp
+      /\[#{log_level_prefix}\] #{message}/.match?(actual)
+    else
+      expected_log_line = "[#{log_level_prefix}] #{message}"
+      actual.include?(expected_log_line)
+    end
   end
 
   failure_message do |actual|
     <<~MESSAGE
       Did not contain log line:
-      #{expected_log_line}
+      Log level: #{log_level_prefix}
+      Message: #{message}
 
       Received logs:
       #{actual}

data/spec/support/mocks/hash_like.rb

@@ -0,0 +1,10 @@
+class HashLike < Hash
+  def initialize(value)
+    super
+    @value = value
+  end
+
+  def to_h
+    @value
+  end
+end

data/spec/support/mocks/puma_mock.rb

@@ -0,0 +1,43 @@
+class PumaMock
+  module MiniSSL
+    class SSLError < StandardError
+      def self.to_s
+        "Puma::MiniSSL::SSLError"
+      end
+    end
+  end
+
+  class HttpParserError < StandardError
+    def self.to_s
+      "Puma::HttpParserError"
+    end
+  end
+
+  class HttpParserError501 < StandardError
+    def self.to_s
+      "Puma::HttpParserError501"
+    end
+  end
+
+  def self.stats
+  end
+
+  def self.cli_config
+    @cli_config ||= CliConfig.new
+  end
+
+  class Server
+  end
+
+  module Const
+    VERSION = "6.0.0".freeze
+  end
+
+  class CliConfig
+    attr_accessor :options
+
+    def initialize
+      @options = {}
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.5
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -202,6 +202,7 @@ files:
 - lib/appsignal/capistrano.rb
 - lib/appsignal/check_in.rb
 - lib/appsignal/check_in/cron.rb
+- lib/appsignal/check_in/scheduler.rb
 - lib/appsignal/cli.rb
 - lib/appsignal/cli/demo.rb
 - lib/appsignal/cli/diagnose.rb
@@ -267,6 +268,7 @@ files:
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
+- lib/appsignal/integrations/puma.rb
 - lib/appsignal/integrations/que.rb
 - lib/appsignal/integrations/railtie.rb
 - lib/appsignal/integrations/rake.rb
@@ -309,6 +311,7 @@ files:
 - lib/appsignal/utils/integration_logger.rb
 - lib/appsignal/utils/integration_memory_logger.rb
 - lib/appsignal/utils/json.rb
+- lib/appsignal/utils/ndjson.rb
 - lib/appsignal/utils/query_params_sanitizer.rb
 - lib/appsignal/utils/rails_helper.rb
 - lib/appsignal/utils/stdout_and_logger_message.rb
@@ -322,7 +325,8 @@ files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/capistrano2_spec.rb
 - spec/lib/appsignal/capistrano3_spec.rb
-- spec/lib/appsignal/check_in_spec.rb
+- spec/lib/appsignal/check_in/cron_spec.rb
+- spec/lib/appsignal/check_in/scheduler_spec.rb
 - spec/lib/appsignal/cli/demo_spec.rb
 - spec/lib/appsignal/cli/diagnose/paths_spec.rb
 - spec/lib/appsignal/cli/diagnose/utils_spec.rb
@@ -384,6 +388,7 @@ files:
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/net_http_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
+- spec/lib/appsignal/integrations/puma_spec.rb
 - spec/lib/appsignal/integrations/que_spec.rb
 - spec/lib/appsignal/integrations/railtie_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
@@ -450,6 +455,7 @@ files:
 - spec/support/helpers/rails_helper.rb
 - spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/system_helpers.rb
+- spec/support/helpers/take_at_most_helper.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/helpers/wait_for_helper.rb
@@ -460,7 +466,9 @@ files:
 - spec/support/mocks/dummy_app.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/fake_gvl_tools.rb
+- spec/support/mocks/hash_like.rb
 - spec/support/mocks/mock_probe.rb
+- spec/support/mocks/puma_mock.rb
 - spec/support/shared_examples/instrument.rb
 - spec/support/stubs/appsignal/loaders/loader_stub.rb
 - spec/support/stubs/delayed_job.rb

data/spec/lib/appsignal/check_in_spec.rb

@@ -1,136 +0,0 @@
-describe Appsignal::CheckIn::Cron do
-  let(:config) { project_fixture_config }
-  let(:cron_checkin) { described_class.new(:identifier => "cron-checkin-name") }
-  let(:transmitter) { Appsignal::Transmitter.new("http://cron_checkins/", config) }
-
-  before(:each) do
-    allow(Appsignal).to receive(:active?).and_return(true)
-    config.logger = Logger.new(StringIO.new)
-    allow(Appsignal::CheckIn::Cron).to receive(:transmitter).and_return(transmitter)
-  end
-
-  describe "when Appsignal is not active" do
-    it "should not transmit any events" do
-      allow(Appsignal).to receive(:active?).and_return(false)
-      expect(transmitter).not_to receive(:transmit)
-
-      cron_checkin.start
-      cron_checkin.finish
-    end
-  end
-
-  describe "#start" do
-    it "should send a cron check-in start" do
-      expect(transmitter).to receive(:transmit).with(hash_including(
-        :identifier => "cron-checkin-name",
-        :kind => "start",
-        :check_in_type => "cron"
-      )).and_return(Net::HTTPResponse.new(nil, "200", nil))
-
-      expect(Appsignal.internal_logger).to receive(:debug).with(
-        "Transmitted cron check-in `cron-checkin-name` (#{cron_checkin.digest}) start event"
-      )
-      expect(Appsignal.internal_logger).not_to receive(:error)
-
-      cron_checkin.start
-    end
-
-    it "should log an error if it fails" do
-      expect(transmitter).to receive(:transmit).with(hash_including(
-        :identifier => "cron-checkin-name",
-        :kind => "start",
-        :check_in_type => "cron"
-      )).and_return(Net::HTTPResponse.new(nil, "499", nil))
-
-      expect(Appsignal.internal_logger).not_to receive(:debug)
-      expect(Appsignal.internal_logger).to receive(:error).with(
-        "Failed to transmit cron check-in start event: status code was 499"
-      )
-
-      cron_checkin.start
-    end
-  end
-
-  describe "#finish" do
-    it "should send a cron check-in finish" do
-      expect(transmitter).to receive(:transmit).with(hash_including(
-        :identifier => "cron-checkin-name",
-        :kind => "finish",
-        :check_in_type => "cron"
-      )).and_return(Net::HTTPResponse.new(nil, "200", nil))
-
-      expect(Appsignal.internal_logger).to receive(:debug).with(
-        "Transmitted cron check-in `cron-checkin-name` (#{cron_checkin.digest}) finish event"
-      )
-      expect(Appsignal.internal_logger).not_to receive(:error)
-
-      cron_checkin.finish
-    end
-
-    it "should log an error if it fails" do
-      expect(transmitter).to receive(:transmit).with(hash_including(
-        :identifier => "cron-checkin-name",
-        :kind => "finish",
-        :check_in_type => "cron"
-      )).and_return(Net::HTTPResponse.new(nil, "499", nil))
-
-      expect(Appsignal.internal_logger).not_to receive(:debug)
-      expect(Appsignal.internal_logger).to receive(:error).with(
-        "Failed to transmit cron check-in finish event: status code was 499"
-      )
-
-      cron_checkin.finish
-    end
-  end
-
-  describe ".cron" do
-    describe "when a block is given" do
-      it "should send a cron check-in start and finish and return the block output" do
-        expect(transmitter).to receive(:transmit).with(hash_including(
-          :kind => "start",
-          :identifier => "cron-checkin-with-block",
-          :check_in_type => "cron"
-        )).and_return(nil)
-
-        expect(transmitter).to receive(:transmit).with(hash_including(
-          :kind => "finish",
-          :identifier => "cron-checkin-with-block",
-          :check_in_type => "cron"
-        )).and_return(nil)
-
-        output = Appsignal::CheckIn.cron("cron-checkin-with-block") { "output" }
-        expect(output).to eq("output")
-      end
-
-      it "should not send a cron check-in finish event when an error is raised" do
-        expect(transmitter).to receive(:transmit).with(hash_including(
-          :kind => "start",
-          :identifier => "cron-checkin-with-block",
-          :check_in_type => "cron"
-        )).and_return(nil)
-
-        expect(transmitter).not_to receive(:transmit).with(hash_including(
-          :kind => "finish",
-          :identifier => "cron-checkin-with-block",
-          :check_in_type => "cron"
-        ))
-
-        expect do
-          Appsignal::CheckIn.cron("cron-checkin-with-block") { raise "error" }
-        end.to raise_error(RuntimeError, "error")
-      end
-    end
-
-    describe "when no block is given" do
-      it "should only send a cron check-in finish event" do
-        expect(transmitter).to receive(:transmit).with(hash_including(
-          :kind => "finish",
-          :identifier => "cron-checkin-without-block",
-          :check_in_type => "cron"
-        )).and_return(nil)
-
-        Appsignal::CheckIn.cron("cron-checkin-without-block")
-      end
-    end
-  end
-end