appsignal 3.0.15-java → 3.0.19-java

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -251,7 +251,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
 
       it "adds the installation report to the diagnostics report" do
         run
-        jruby = DependencyHelper.running_jruby?
+        jruby = Appsignal::System.jruby?
         expect(received_report["installation"]).to match(
           "result" => {
             "status" => "success"
@@ -321,7 +321,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           expect(File).to receive(:read)
             .with(File.expand_path("../../../../../ext/install.report", __FILE__))
             .and_return(
-              YAML.dump(
+              JSON.generate(
                 "result" => {
                   "status" => "error",
                   "error" => "RuntimeError: some error",
@@ -384,8 +384,8 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         end
       end
 
-      context "when report is invalid YAML" do
-        let(:raw_report) { "foo:\nbar" }
+      context "when report is invalid JSON" do
+        let(:raw_report) { "{}-" }
         before do
           allow(File).to receive(:read).and_call_original
           expect(File).to receive(:read)
@@ -750,13 +750,13 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         end
 
         it "outputs a warning that no config is loaded" do
-          expect(output).to include "Environment: \"\"\n#{warning_message}"
+          expect(output).to include "environment: \"\"\n#{warning_message}"
           expect(output).to_not have_color_markers
         end
 
         context "with color", :color => true do
           it "outputs a warning that no config is loaded in color" do
-            expect(output).to include "Environment: \"\"\n"
+            expect(output).to include "environment: \"\"\n"
             expect(output).to have_colorized_text :red, warning_message
           end
         end
@@ -785,7 +785,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         describe "environment" do
           it "outputs environment" do
             run
-            expect(output).to include(%(Environment: "production"))
+            expect(output).to include(%(environment: "production"))
           end
 
           context "when the source is a single source" do
@@ -793,7 +793,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
 
             it "outputs the label source after the value" do
               expect(output).to include(
-                %(Environment: "#{Appsignal.config.env}" (Loaded from: initial)\n)
+                %(environment: "#{Appsignal.config.env}" (Loaded from: initial)\n)
               )
             end
           end
@@ -810,7 +810,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
 
             it "outputs a list of sources with their values" do
               expect(output).to include(
-                %(  Environment: "production"\n) +
+                %(  environment: "production"\n) +
                 %(    Sources:\n) +
                 %(      initial: "development"\n) +
                 %(      env:     "production"\n)
@@ -904,7 +904,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         before { run_within_dir tmp_dir }
 
         it "outputs environment" do
-          expect(output).to include(%(Environment: "foobar"))
+          expect(output).to include(%(environment: "foobar"))
         end
 
         it "outputs config defaults" do
@@ -1007,7 +1007,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
 
         it "outputs failure with status code" do
           expect(output).to include "Validation",
-            "Validating Push API key: Failed with status 500\n" +
+            "Validating Push API key: Failed to validate: status 500\n" +
             %("Could not confirm authorization: 500")
         end
 
@@ -1015,14 +1015,19 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           it "outputs error in color" do
             expect(output).to include "Validation",
               "Validating Push API key: " +
-              colorize(%(Failed with status 500\n"Could not confirm authorization: 500"), :red)
+              colorize(
+                "Failed to validate: status 500\n" +
+                %("Could not confirm authorization: 500"),
+                :red
+              )
           end
         end
 
         it "transmits validation in report" do
           expect(received_report).to include(
             "validation" => {
-              "push_api_key" => %(Failed with status 500\n\"Could not confirm authorization: 500")
+              "push_api_key" => "Failed to validate: status 500\n" +
+              %("Could not confirm authorization: 500")
             }
           )
         end

data/spec/lib/appsignal/config_spec.rb

@@ -151,34 +151,34 @@ describe Appsignal::Config do
 
     it "merges with the default config" do
       expect(config.config_hash).to eq(
+        :active                         => true,
+        :ca_file_path                   => File.join(resources_dir, "cacert.pem"),
         :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            => [],
         :instrument_net_http            => true,
         :instrument_redis               => true,
         :instrument_sequel              => true,
-        :skip_session_data              => false,
-        :send_environment_metadata      => true,
-        :send_params                    => true,
-        :endpoint                       => "https://push.appsignal.com",
-        :push_api_key                   => "abc",
+        :log                            => "file",
         :name                           => "TestApp",
-        :active                         => true,
-        :enable_allocation_tracking     => true,
-        :enable_gc_instrumentation      => false,
-        :enable_host_metrics            => true,
-        :enable_minutely_probes         => true,
-        :enable_statsd                  => true,
-        :ca_file_path                   => File.join(resources_dir, "cacert.pem"),
-        :dns_servers                    => [],
-        :files_world_accessible         => true,
-        :transaction_debug_mode         => false,
+        :push_api_key                   => "abc",
+        :request_headers                => [],
         :revision                       => "v2.5.1",
-        :request_headers                => []
+        :send_environment_metadata      => true,
+        :send_params                    => true,
+        :skip_session_data              => false,
+        :transaction_debug_mode         => false
       )
     end
 
@@ -319,13 +319,15 @@ describe Appsignal::Config do
           "non-existing-path",
           "production",
           :running_in_container => true,
-          :debug => true
+          :debug => true,
+          :log_level => "debug"
         )
       end
 
       it "overrides system detected and defaults config" do
         expect(config[:running_in_container]).to be_truthy
         expect(config[:debug]).to be_truthy
+        expect(config[:log_level]).to eq("debug")
       end
     end
 
@@ -502,6 +504,7 @@ describe Appsignal::Config do
       config[:log] = "stdout"
       config[:log_path] = "/tmp"
       config[:filter_parameters] = %w[password confirm_password]
+      config[:filter_session_data] = %w[key1 key2]
       config[:running_in_container] = false
       config[:dns_servers] = ["8.8.8.8", "8.8.4.4"]
       config[:transaction_debug_mode] = true
@@ -535,6 +538,8 @@ describe Appsignal::Config do
       expect(ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]).to       eq "true"
       expect(ENV["_APPSIGNAL_TRANSACTION_DEBUG_MODE"]).to       eq "true"
       expect(ENV["_APPSIGNAL_SEND_ENVIRONMENT_METADATA"]).to    eq "false"
+      expect(ENV["_APPSIGNAL_FILTER_PARAMETERS"]).to            eq "password,confirm_password"
+      expect(ENV["_APPSIGNAL_FILTER_SESSION_DATA"]).to          eq "key1,key2"
       expect(ENV["_APP_REVISION"]).to                           eq "v2.5.1"
       expect(ENV).to_not                                        have_key("_APPSIGNAL_WORKING_DIR_PATH")
       expect(ENV).to_not                                        have_key("_APPSIGNAL_WORKING_DIRECTORY_PATH")
@@ -781,4 +786,83 @@ describe Appsignal::Config do
       end
     end
   end
+
+  describe "#log_level" do
+    let(:options) { {} }
+    let(:config) { described_class.new("", nil, options) }
+    subject { config.log_level }
+
+    context "without any config" do
+      it "returns info by default" do
+        is_expected.to eq(Logger::INFO)
+      end
+    end
+
+    context "with debug set to true" do
+      let(:options) { { :debug => true } }
+      it { is_expected.to eq(Logger::DEBUG) }
+    end
+
+    context "with transaction_debug_mode set to true" do
+      let(:options) { { :transaction_debug_mode => true } }
+      it { is_expected.to eq(Logger::DEBUG) }
+    end
+
+    context "with log_level set to error" do
+      let(:options) { { :log_level => "error" } }
+      it { is_expected.to eq(Logger::ERROR) }
+    end
+
+    context "with log_level set to warn" do
+      let(:options) { { :log_level => "warn" } }
+      it { is_expected.to eq(Logger::WARN) }
+    end
+
+    context "with log_level set to info" do
+      let(:options) { { :log_level => "info" } }
+      it { is_expected.to eq(Logger::INFO) }
+    end
+
+    context "with log_level set to debug" do
+      let(:options) { { :log_level => "debug" } }
+      it { is_expected.to eq(Logger::DEBUG) }
+    end
+
+    context "with log_level set to trace" do
+      let(:options) { { :log_level => "trace" } }
+      it { is_expected.to eq(Logger::DEBUG) }
+    end
+
+    context "with debug and log_level set" do
+      let(:options) { { :log_level => "error", :debug => true } }
+
+      it "the log_level option is leading" do
+        is_expected.to eq(Logger::ERROR)
+      end
+    end
+
+    context "with transaction_debug_mode and log_level set" do
+      let(:options) { { :log_level => "error", :transaction_debug_mode => true } }
+
+      it "the log_level option is leading" do
+        is_expected.to eq(Logger::ERROR)
+      end
+    end
+
+    context "with log level set to an unknown value" do
+      let(:options) { { :log_level => "fatal" } }
+
+      it "prints a warning and doesn't use the log_level" do
+        is_expected.to eql(Logger::INFO)
+      end
+
+      context "with debug option set to true" do
+        let(:options) { { :log_level => "fatal", :debug => true } }
+
+        it "prints a warning and sets it to debug" do
+          is_expected.to eql(Logger::DEBUG)
+        end
+      end
+    end
+  end
 end

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -1,5 +1,5 @@
-describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
-  let(:klass)     { Appsignal::EventFormatter::ActiveRecord::SqlFormatter }
+describe Appsignal::EventFormatter::ActiveRecord::SqlFormatter do
+  let(:klass)     { described_class }
   let(:formatter) { klass.new }
 
   it "should register sql.active_record" do

data/spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb

@@ -0,0 +1,30 @@
+describe Appsignal::EventFormatter::Sequel::SqlFormatter do
+  let(:klass)     { described_class }
+  let(:formatter) { klass.new }
+
+  it "registers the sql.sequel event formatter" do
+    expect(Appsignal::EventFormatter.registered?("sql.sequel", klass)).to be_truthy
+  end
+
+  describe "#format" do
+    before do
+      stub_const(
+        "SequelDatabaseTypeClass",
+        Class.new do
+          def self.to_s
+            "SequelDatabaseTypeClassToString"
+          end
+        end
+      )
+    end
+    let(:payload) do
+      {
+        :name => SequelDatabaseTypeClass,
+        :sql => "SELECT * FROM users"
+      }
+    end
+    subject { formatter.format(payload) }
+
+    it { is_expected.to eq ["SequelDatabaseTypeClassToString", "SELECT * FROM users", 1] }
+  end
+end

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -28,7 +28,7 @@ end
 
 class MockDependentFormatter < Appsignal::EventFormatter
   def initialize
-    NonsenseDependency.something
+    raise "There is an error"
   end
 
   def format(_payload)
@@ -72,7 +72,7 @@ describe Appsignal::EventFormatter do
         end
         expect(klass.registered?("mock.dependent")).to be_falsy
         expect(logs).to contains_log :error, \
-          "'uninitialized constant MockDependentFormatter::NonsenseDependency' " \
+          "'There is an error' " \
           "when initializing mock.dependent event formatter"
       end
     end

data/spec/lib/appsignal/hooks/activejob_spec.rb

@@ -30,6 +30,7 @@ if DependencyHelper.active_job_present?
   end
 
   describe Appsignal::Hooks::ActiveJobHook::ActiveJobClassInstrumentation do
+    include ActiveJobHelpers
     let(:time) { Time.parse("2001-01-01 10:00:00UTC") }
     let(:namespace) { Appsignal::Transaction::BACKGROUND_JOB }
     let(:queue) { "default" }
@@ -64,6 +65,13 @@ if DependencyHelper.active_job_present?
         parameterized_expected_args
       ]
     end
+    let(:expected_perform_events) do
+      if DependencyHelper.rails7_present?
+        ["perform.active_job", "perform_start.active_job"]
+      else
+        ["perform_start.active_job", "perform.active_job"]
+      end
+    end
     before do
       ActiveJob::Base.queue_adapter = :inline
 
@@ -119,7 +127,8 @@ if DependencyHelper.active_job_present?
       events = transaction_hash["events"]
         .sort_by { |e| e["start"] }
         .map { |event| event["name"] }
-      expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+      expect(events).to eq(expected_perform_events)
     end
 
     context "with custom queue" do
@@ -208,7 +217,8 @@ if DependencyHelper.active_job_present?
         events = transaction_hash["events"]
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
 
       if DependencyHelper.rails_version >= Gem::Version.new("5.0.0")
@@ -286,7 +296,8 @@ if DependencyHelper.active_job_present?
           .reject { |e| e["name"] == "enqueue.active_job" }
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
     end
 
@@ -414,7 +425,7 @@ if DependencyHelper.active_job_present?
           expect(transaction_hash).to include(
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
-              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"],
+              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper,
               "tags" => {
                 "active_job_id" => kind_of(String),
                 "queue" => "mailers"
@@ -433,7 +444,7 @@ if DependencyHelper.active_job_present?
           expect(transaction_hash).to include(
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
-              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + method_expected_args,
+              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper(:args => method_expected_args),
               "tags" => {
                 "active_job_id" => kind_of(String),
                 "queue" => "mailers"
@@ -453,7 +464,7 @@ if DependencyHelper.active_job_present?
             expect(transaction_hash).to include(
               "action" => "ActionMailerTestJob#welcome",
               "sample_data" => hash_including(
-                "params" => ["ActionMailerTestJob", "welcome", "deliver_now", parameterized_expected_args],
+                "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper(:params => parameterized_expected_args),
                 "tags" => {
                   "active_job_id" => kind_of(String),
                   "queue" => "mailers"

data/spec/lib/appsignal/hooks/sequel_spec.rb

@@ -1,7 +1,7 @@
 describe Appsignal::Hooks::SequelHook do
   if DependencyHelper.sequel_present?
     let(:db) do
-      if Appsignal::System.jruby?
+      if DependencyHelper.running_jruby?
         Sequel.connect("jdbc:sqlite::memory:")
       else
         Sequel.sqlite

data/spec/lib/appsignal/integrations/padrino_spec.rb

@@ -98,7 +98,13 @@ if DependencyHelper.padrino_present?
         RSpec::Matchers.define :match_response do |expected_status, expected_content|
           match do |response|
             status, _headers, content = response
-            status == expected_status && content == [expected_content].compact
+            matches_content =
+              if expected_content.is_a?(Regexp)
+                content.join =~ expected_content
+              else
+                content == [expected_content].compact
+              end
+            status == expected_status && matches_content
           end
         end
 
@@ -142,7 +148,7 @@ if DependencyHelper.padrino_present?
               expect_a_transaction_to_be_created
               # Uses path for action name
               expect(transaction).to receive(:set_action_if_nil).with("PadrinoTestApp#unknown")
-              expect(response).to match_response(404, "GET /404")
+              expect(response).to match_response(404, %r{^GET /404})
             end
           end
 

data/spec/lib/appsignal/integrations/sidekiq_spec.rb

@@ -339,6 +339,7 @@ if DependencyHelper.active_job_present?
   require "sidekiq/testing"
 
   describe "Sidekiq ActiveJob integration" do
+    include ActiveJobHelpers
     let(:namespace) { Appsignal::Transaction::BACKGROUND_JOB }
     let(:time) { Time.parse("2001-01-01 10:00:00UTC") }
     let(:log) { StringIO.new }
@@ -366,6 +367,16 @@ if DependencyHelper.active_job_present?
         }
       ]
     end
+    let(:expected_wrapped_args) do
+      if (DependencyHelper.rails6_1_present? && DependencyHelper.ruby_3_1_or_newer?) || DependencyHelper.rails7_present?
+        [{
+          "_aj_ruby2_keywords" => ["args"],
+          "args" => expected_args
+        }]
+      else
+        expected_args
+      end
+    end
     let(:expected_tags) do
       {}.tap do |hash|
         hash["active_job_id"] = kind_of(String)
@@ -374,6 +385,13 @@ if DependencyHelper.active_job_present?
         end
       end
     end
+    let(:expected_perform_events) do
+      if DependencyHelper.rails7_present?
+        ["perform_job.sidekiq", "perform.active_job", "perform_start.active_job"]
+      else
+        ["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"]
+      end
+    end
     before do
       start_agent
       Appsignal.logger = test_logger(log)
@@ -434,8 +452,8 @@ if DependencyHelper.active_job_present?
       events = transaction_hash["events"]
         .sort_by { |e| e["start"] }
         .map { |event| event["name"] }
-      expect(events)
-        .to eq(["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"])
+
+      expect(events).to eq(expected_perform_events)
     end
 
     context "with error" do
@@ -467,8 +485,8 @@ if DependencyHelper.active_job_present?
         events = transaction_hash["events"]
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events)
-          .to eq(["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
     end
 
@@ -490,7 +508,7 @@ if DependencyHelper.active_job_present?
         expect(transaction_hash).to include(
           "action" => "ActionMailerSidekiqTestJob#welcome",
           "sample_data" => hash_including(
-            "params" => ["ActionMailerSidekiqTestJob", "welcome", "deliver_now"] + expected_args
+            "params" => ["ActionMailerSidekiqTestJob", "welcome", "deliver_now"] + expected_wrapped_args
           )
         )
       end

data/spec/lib/appsignal/span_spec.rb

@@ -0,0 +1,141 @@
+require "appsignal/span"
+
+describe Appsignal::Span do
+  before :context do
+    start_agent
+  end
+
+  let(:namespace) { "web" }
+  let(:root) { Appsignal::Span.new(namespace) }
+
+  describe "creating a span" do
+    it "creates an empty span" do
+      expect(root.to_h["namespace"]).to eq "web"
+      expect(root.to_h["trace_id"].length).to eq 16
+      expect(root.to_h["span_id"].length).to eq 8
+      expect(root.to_h["parent_span_id"]).to be_empty
+      expect(root.to_h["name"]).to be_empty
+      expect(root.to_h["start_time"]).to be > 1_600_000_000
+      expect(root.to_h["closed"]).to be false
+    end
+  end
+
+  describe "#child" do
+    let(:child) { root.child }
+
+    it "creates a child span" do
+      expect(child.to_h["namespace"]).to be_empty
+      expect(child.to_h["trace_id"].length).to eq 16
+      expect(child.to_h["span_id"].length).to eq 8
+      expect(child.to_h["parent_span_id"]).to eq root.to_h["span_id"]
+      expect(child.to_h["name"]).to be_empty
+      expect(child.to_h["start_time"]).to be > 1_600_000_000
+      expect(child.to_h["closed"]).to be false
+    end
+  end
+
+  describe "#add_error" do
+    it "adds an error" do
+      begin
+        raise "Error"
+      rescue => error
+        root.add_error(error)
+      end
+
+      error = root.to_h["error"]
+      expect(error["name"]).to eq "RuntimeError"
+      expect(error["message"]).to eq "Error"
+      expect(error["backtrace"]).not_to be_empty
+    end
+  end
+
+  describe "set_sample_data" do
+    it "sets sample data" do
+      root.set_sample_data(:params, "key" => "value")
+
+      sample_data = root.to_h["sample_data"]
+      expect(sample_data["params"]).to eq "{\"key\":\"value\"}"
+    end
+  end
+
+  describe "#name=" do
+    it "sets the name" do
+      root.name = "Span name"
+
+      expect(root.to_h["name"]).to eq "Span name"
+    end
+  end
+
+  describe "#[]=" do
+    let(:attributes) { root.to_h["attributes"] }
+
+    it "sets a string attribute" do
+      root["string"] = "attribute"
+
+      expect(attributes["string"]).to eq "attribute"
+    end
+
+    it "sets an integer attribute" do
+      root["integer"] = 1001
+
+      expect(attributes["integer"]).to eq 1001
+    end
+
+    it "sets a bigint attribute" do
+      root["bigint"] = 1 << 64
+
+      expect(attributes["bigint"]).to eq "bigint:#{1 << 64}"
+    end
+
+    it "sets a boolean attribute" do
+      root["true"] = true
+      root["false"] = false
+
+      expect(attributes["true"]).to eq true
+      expect(attributes["false"]).to eq false
+    end
+
+    it "sets a float attribute" do
+      root["float"] = 10.01
+
+      expect(attributes["float"]).to eq 10.01
+    end
+
+    it "raises an error for other types" do
+      expect do
+        root["something"] = Object.new
+      end.to raise_error TypeError
+    end
+  end
+
+  describe "#instrument" do
+    it "closes the span after yielding" do
+      root.instrument do
+        # Nothing happening
+      end
+      expect(root.closed?).to eq true
+    end
+
+    context "with an error raised in the passed block" do
+      it "closes the span after yielding" do
+        expect do
+          root.instrument do
+            raise ExampleException, "foo"
+          end
+        end.to raise_error(ExampleException, "foo")
+        expect(root.closed?).to eq true
+      end
+    end
+  end
+
+  describe "#close" do
+    it "closes a span" do
+      expect(root.closed?).to eq false
+
+      root.close
+
+      expect(root.to_h).to be_nil
+      expect(root.closed?).to eq true
+    end
+  end
+end