appsignal 3.10.0-java → 3.11.0-java

data/spec/lib/appsignal/transaction_spec.rb

@@ -1,132 +1,211 @@
 describe Appsignal::Transaction do
-  before :context do
-    start_agent
-  end
-
-  let(:transaction_id) { "1" }
-  let(:time)           { Time.at(fixed_time) }
-  let(:namespace)      { Appsignal::Transaction::HTTP_REQUEST }
-  let(:env)            { {} }
-  let(:merged_env)     { http_request_env_with_data(env) }
-  let(:options)        { {} }
-  let(:request)        { Rack::Request.new(merged_env) }
-  let(:transaction)    { Appsignal::Transaction.new(transaction_id, namespace, request, options) }
-  let(:log)            { StringIO.new }
+  let(:time) { Time.at(fixed_time) }
 
   before { Timecop.freeze(time) }
   after { Timecop.return }
   around do |example|
-    use_logger_with log do
+    start_agent
+    keep_transactions do
       example.run
     end
   end
 
-  describe "class methods" do
-    def current_transaction
-      Appsignal::Transaction.current
-    end
+  describe ".create" do
+    context "when no transaction is running" do
+      it "returns the created transaction" do
+        mock_transaction_id = "mock-uuid"
+        allow(SecureRandom).to receive(:uuid).and_return(mock_transaction_id)
+
+        transaction = create_transaction
+        expect(transaction).to be_a Appsignal::Transaction
 
-    describe ".create" do
-      def create_transaction(id = transaction_id)
-        Appsignal::Transaction.create(id, namespace, request, options)
+        expect(transaction).to have_id(mock_transaction_id)
+        expect(transaction.transaction_id).to eq(mock_transaction_id)
+
+        expect(transaction).to have_namespace(default_namespace)
+        expect(transaction.namespace).to eq(default_namespace)
       end
 
-      context "when no transaction is running" do
-        let!(:transaction) { create_transaction }
+      it "assigns the transaction to current" do
+        transaction = create_transaction
+        expect(transaction).to eq current_transaction
+      end
 
+      context "with legacy arguments" do
         it "returns the created transaction" do
-          expect(transaction).to be_a Appsignal::Transaction
-          expect(transaction.transaction_id).to eq transaction_id
-          expect(transaction.namespace).to eq namespace
-          expect(transaction.request).to eq request
+          transaction_id = "mock-id"
+          namespace = "my_namespace"
+          transaction = legacy_create_transaction(
+            :id => transaction_id,
+            :namespace => namespace
+          )
+          expect(transaction).to be_a(Appsignal::Transaction)
 
           expect(transaction).to have_id(transaction_id)
+          expect(transaction.transaction_id).to eq(transaction_id)
+
           expect(transaction).to have_namespace(namespace)
+          expect(transaction.namespace).to eq(namespace)
         end
 
-        it "assigns the transaction to current" do
-          expect(transaction).to eq current_transaction
+        it "logs deprecation warnings" do
+          logs =
+            capture_logs do
+              legacy_create_transaction(
+                :id => "mock-id",
+                :namespace => "my_namespace",
+                :request => Appsignal::Transaction::InternalGenericRequest.new({}),
+                :options => { :force => true }
+              )
+            end
+
+          expect(logs).to contains_log(
+            :warn,
+            "Appsignal::Transaction.create: " \
+              "A new Transaction is created using the transaction ID argument."
+          )
+          expect(logs).to contains_log(
+            :warn,
+            "Appsignal::Transaction.create: " \
+              "A Transaction is created using the namespace argument."
+          )
+          expect(logs).to contains_log(
+            :warn,
+            "Appsignal::Transaction.create: " \
+              "A Transaction is created using the request argument."
+          )
+          expect(logs).to contains_log(
+            :warn,
+            "Appsignal::Transaction.create: " \
+              "A Transaction is created using the `:force => true` option argument. "
+          )
         end
-      end
 
-      context "when a transaction is already running" do
-        before { create_transaction }
+        it "prints deprecation warnings" do
+          err_stream = std_stream
+          capture_std_streams(std_stream, err_stream) do
+            legacy_create_transaction(
+              :id => "mock-id",
+              :namespace => "my_namespace",
+              :request => Appsignal::Transaction::InternalGenericRequest.new({}),
+              :options => { :force => true }
+            )
+          end
 
-        it "does not create a new transaction, but returns the current transaction" do
-          expect do
-            new_transaction = create_transaction("2")
-            expect(new_transaction).to eq(current_transaction)
-            expect(new_transaction.transaction_id).to eq(transaction_id)
-          end.to_not(change { current_transaction })
+          stderr = err_stream.read
+          expect(stderr).to include(
+            "appsignal WARNING: Appsignal::Transaction.create: " \
+              "A new Transaction is created using the transaction ID argument."
+          )
+          expect(stderr).to include(
+            "appsignal WARNING: Appsignal::Transaction.create: " \
+              "A Transaction is created using the namespace argument."
+          )
+          expect(stderr).to include(
+            "appsignal WARNING: Appsignal::Transaction.create: " \
+              "A Transaction is created using the request argument."
+          )
+          expect(stderr).to include(
+            "appsignal WARNING: Appsignal::Transaction.create: " \
+              "A Transaction is created using the `:force => true` option argument. "
+          )
         end
+      end
+    end
 
-        it "logs a debug message" do
-          create_transaction("2")
-          expect(log_contents(log)).to contains_log :warn,
-            "Trying to start new transaction with id '2', but a " \
-              "transaction with id '#{transaction_id}' is already " \
-              "running. Using transaction '#{transaction_id}'."
-        end
+    context "when a transaction is already running" do
+      before do
+        allow(SecureRandom).to receive(:uuid)
+          .and_return(
+            "transaction_id_1",
+            "transaction_id_2"
+          )
+        create_transaction
+      end
 
-        context "with option :force => true" do
-          it "returns the newly created (and current) transaction" do
-            original_transaction = current_transaction
-            expect(original_transaction).to_not be_nil
-            expect(current_transaction.transaction_id).to eq transaction_id
+      it "does not create a new transaction, but returns the current transaction" do
+        expect do
+          new_transaction = create_transaction
 
-            options[:force] = true
-            expect(create_transaction("2")).to_not eq original_transaction
-            expect(current_transaction.transaction_id).to eq "2"
-          end
+          expect(new_transaction).to eq(current_transaction)
+        end.to_not(change { current_transaction })
+      end
+
+      it "logs a debug message" do
+        logs = capture_logs { create_transaction }
+
+        expect(logs).to contains_log :warn,
+          "Trying to start new transaction with id 'transaction_id_2', but a " \
+            "transaction with id 'transaction_id_1' is already " \
+            "running. Using transaction 'transaction_id_1'."
+      end
+
+      context "with option :force => true" do
+        it "returns the newly created (and current) transaction" do
+          original_transaction = create_transaction
+
+          expect(original_transaction).to be_a(Appsignal::Transaction)
+          expect(current_transaction).to have_id("transaction_id_1")
+
+          new_transaction = legacy_create_transaction(
+            :id => "transaction_id_2",
+            :options => { :force => true }
+          )
+
+          expect(new_transaction).to be_a(Appsignal::Transaction)
+          expect(new_transaction).to_not eq(original_transaction)
+          expect(new_transaction).to have_id("transaction_id_2")
+          expect(current_transaction).to eq(new_transaction)
         end
       end
     end
+  end
 
-    describe ".current" do
-      context "when there is a current transaction" do
-        let!(:transaction) do
-          Appsignal::Transaction.create(transaction_id, namespace, request, options)
-        end
+  describe ".current" do
+    context "when there is a current transaction" do
+      let!(:transaction) { create_transaction }
 
-        it "reads :appsignal_transaction from the current Thread" do
-          expect(current_transaction).to eq Thread.current[:appsignal_transaction]
-          expect(current_transaction).to eq transaction
-        end
+      it "reads :appsignal_transaction from the current Thread" do
+        expect(current_transaction).to eq(Thread.current[:appsignal_transaction])
+        expect(current_transaction).to eq(transaction)
+      end
 
-        it "is not a NilTransaction" do
-          expect(current_transaction.nil_transaction?).to eq false
-          expect(current_transaction).to be_a Appsignal::Transaction
-        end
+      it "is not a NilTransaction" do
+        expect(current_transaction.nil_transaction?).to be(false)
+        expect(current_transaction).to be_a(Appsignal::Transaction)
+      end
 
-        it "returns true for current?" do
-          expect(Appsignal::Transaction.current?).to be(true)
-        end
+      it "returns true for current?" do
+        expect(Appsignal::Transaction.current?).to be(true)
       end
+    end
 
-      context "when there is no current transaction" do
-        it "has no :appsignal_transaction registered on the current Thread" do
-          expect(Thread.current[:appsignal_transaction]).to be_nil
-        end
+    context "when there is no current transaction" do
+      it "has no :appsignal_transaction registered on the current Thread" do
+        expect(Thread.current[:appsignal_transaction]).to be_nil
+      end
 
-        it "returns a NilTransaction stub" do
-          expect(current_transaction.nil_transaction?).to eq true
-          expect(current_transaction).to be_a Appsignal::Transaction::NilTransaction
-        end
+      it "returns a NilTransaction stub" do
+        expect(current_transaction.nil_transaction?).to be(true)
+        expect(current_transaction).to be_a(Appsignal::Transaction::NilTransaction)
+      end
 
-        it "returns false for current?" do
-          expect(Appsignal::Transaction.current?).to be(false)
-        end
+      it "returns false for current?" do
+        expect(Appsignal::Transaction.current?).to be(false)
       end
     end
+  end
 
-    describe ".complete_current!" do
-      let!(:transaction) { Appsignal::Transaction.create(transaction_id, namespace, options) }
+  describe ".complete_current!" do
+    context "with active transaction" do
+      let!(:transaction) { create_transaction }
 
       it "completes the current transaction" do
-        expect(transaction).to eq current_transaction
-        expect(transaction).to receive(:complete).and_call_original
+        expect(transaction).to eq(current_transaction)
 
         Appsignal::Transaction.complete_current!
+
+        expect(transaction).to be_completed
       end
 
       it "unsets the current transaction on the current Thread" do
@@ -141,8 +220,11 @@ describe Appsignal::Transaction do
         end
 
         it "logs an error message" do
-          Appsignal::Transaction.complete_current!
-          expect(log_contents(log)).to contains_log :error,
+          logs =
+            capture_logs do
+              Appsignal::Transaction.complete_current!
+            end
+          expect(logs).to contains_log :error,
             "Failed to complete transaction ##{transaction.transaction_id}. ExampleStandardError"
         end
 
@@ -153,9 +235,19 @@ describe Appsignal::Transaction do
         end
       end
     end
+
+    context "without active transaction" do
+      it "does nothing" do
+        expect do
+          Appsignal::Transaction.complete_current!
+        end.to_not(change { Thread.current[:appsignal_transaction] })
+      end
+    end
   end
 
   describe "#complete" do
+    let(:transaction) { create_transaction }
+
     context "when transaction is being sampled" do
       it "samples data" do
         transaction.set_tags(:foo => "bar")
@@ -183,11 +275,12 @@ describe Appsignal::Transaction do
       end
 
       it "logs a debug message" do
+        allow(SecureRandom).to receive(:uuid).and_return("mock_transaction_id")
         transaction.discard!
-        transaction.complete
+        logs = capture_logs { transaction.complete }
 
-        expect(log_contents(log)).to contains_log :debug,
-          "Skipping transaction '#{transaction_id}' because it was manually discarded."
+        expect(logs).to contains_log :debug,
+          "Skipping transaction 'mock_transaction_id' because it was manually discarded."
       end
 
       context "when a discarded transaction is restored" do
@@ -207,6 +300,8 @@ describe Appsignal::Transaction do
   end
 
   context "pausing" do
+    let(:transaction) { new_transaction }
+
     describe "#pause!" do
       it "changes the pause flag to true" do
         expect do
@@ -242,993 +337,1439 @@ describe Appsignal::Transaction do
     end
   end
 
-  context "with transaction instance" do
-    context "initialization" do
-      it "loads the AppSignal extension" do
-        expect(transaction.ext).to_not be_nil
-      end
+  context "initialization" do
+    let(:transaction) { new_transaction }
 
-      context "when extension is not loaded", :extension_installation_failure do
-        around do |example|
-          Appsignal::Testing.without_testing { example.run }
-        end
+    it "loads the AppSignal extension" do
+      expect(transaction.ext).to_not be_nil
+    end
 
-        it "does not error on missing extension method calls" do
-          expect(transaction.ext).to be_kind_of(Appsignal::Extension::MockTransaction)
-          transaction.start_event
-          transaction.finish_event(
-            "name",
-            "title",
-            "body",
-            Appsignal::EventFormatter::DEFAULT
-          )
-        end
+    context "when extension is not loaded", :extension_installation_failure do
+      around do |example|
+        Appsignal::Testing.without_testing { example.run }
       end
 
-      it "sets the transaction id" do
-        expect(transaction.transaction_id).to eq "1"
+      it "does not error on missing extension method calls" do
+        expect(transaction.ext).to be_kind_of(Appsignal::Extension::MockTransaction)
+        transaction.start_event
+        transaction.finish_event(
+          "name",
+          "title",
+          "body",
+          Appsignal::EventFormatter::DEFAULT
+        )
       end
+    end
 
-      it "sets the namespace to http_request" do
-        expect(transaction.namespace).to eq "http_request"
+    context "transaction id" do
+      before do
+        allow(SecureRandom).to receive(:uuid).and_return("mock_transaction_id")
       end
 
-      it "sets the request" do
-        expect(transaction.request).to_not be_nil
+      it "sets the transaction id" do
+        expect(transaction).to have_id("mock_transaction_id")
       end
+    end
 
-      it "sets the request not to paused" do
-        expect(transaction.paused).to be_falsy
-      end
+    it "sets the namespace to http_request" do
+      expect(transaction.namespace).to eq "http_request"
+    end
 
-      it "sets no tags by default" do
-        expect(transaction.tags).to eq({})
-      end
+    it "sets the request" do
+      expect(transaction.request).to be_a(Appsignal::Transaction::InternalGenericRequest)
+    end
 
-      describe "#options" do
-        subject { transaction.options }
+    it "sets the request not to paused" do
+      expect(transaction.paused?).to be_falsy
+    end
 
-        it "sets the default :params_method" do
-          expect(subject[:params_method]).to eq :params
-        end
+    it "sets no tags by default" do
+      expect(transaction.tags).to be_empty
+    end
 
-        context "with overridden options" do
-          let(:options) { { :params_method => :filtered_params } }
+    describe "#options" do
+      let(:options) { transaction.options }
 
-          it "sets the overridden :params_method" do
-            expect(subject[:params_method]).to eq :filtered_params
-          end
-        end
+      it "sets the default :params_method" do
+        expect(options[:params_method]).to eq :params
       end
-    end
 
-    describe "#store" do
-      it "should return an empty store when it's not already present" do
-        expect(transaction.store("test")).to eql({})
+      context "with overridden options" do
+        let(:transaction) do
+          legacy_new_transaction(:options => { :params_method => :filtered_params })
+        end
+
+        it "sets the overridden :params_method" do
+          expect(options[:params_method]).to eq :filtered_params
+        end
       end
+    end
+  end
 
-      it "should store changes to the store" do
-        transaction_store = transaction.store("test")
-        transaction_store["transaction"] = "value"
+  describe "#store" do
+    let(:transaction) { new_transaction }
 
-        expect(transaction.store("test")).to eql("transaction" => "value")
-      end
+    it "returns an empty store when it's not already present" do
+      expect(transaction.store("test")).to eql({})
     end
 
-    describe "#params" do
-      subject { transaction.params }
+    it "stores changes to the store" do
+      transaction_store = transaction.store("test")
+      transaction_store["transaction"] = "value"
 
-      context "with custom params set on transaction" do
-        before do
-          transaction.set_params(:foo => "bar")
-        end
+      expect(transaction.store("test")).to eql("transaction" => "value")
+    end
+  end
 
-        it "returns custom parameters" do
-          expect(subject).to eq(:foo => "bar")
-        end
+  describe "#params" do
+    let(:transaction) { new_transaction }
+    let(:params) { transaction.params }
 
-        context "when params is a callable object" do
-          it "calls the params object and sets the return value as parametesr" do
-            transaction.set_params { { "param1" => "value1" } }
+    context "with custom params set on transaction" do
+      before { transaction.set_params(:foo => "bar") }
 
-            expect(transaction.params).to eq(
-              "param1" => "value1"
-            )
-          end
-        end
+      it "returns custom parameters" do
+        expect(params).to eq(:foo => "bar")
       end
 
-      context "without custom params set on transaction" do
-        it "returns parameters from request" do
-          expect(subject).to eq(
-            "action" => "show",
-            "controller" => "blog_posts",
-            "id" => "1"
-          )
+      context "when params is a callable object" do
+        it "calls the params object and sets the return value as parametesr" do
+          transaction.set_params { { "param1" => "value1" } }
+
+          expect(params).to eq("param1" => "value1")
         end
       end
     end
 
-    describe "#params=" do
-      around { |example| keep_transactions { example.run } }
+    context "without custom params set on transaction" do
+      let(:transaction) do
+        legacy_new_transaction(
+          :request => legacy_request(
+            :params => {
+              "action" => "show",
+              "controller" => "blog_posts",
+              "id" => "1"
 
-      it "sets params on the transaction" do
-        params = { "foo" => "bar" }
-        silence { transaction.params = params }
-
-        transaction._sample
-        expect(transaction.params).to eq(params)
-        expect(transaction).to include_params(params)
+            }
+          )
+        )
       end
 
-      it "logs a deprecation warning" do
-        transaction.params = { "foo" => "bar" }
-
-        expect(log_contents(log)).to contains_log(
-          :warn,
-          "Transaction#params= is deprecated." \
-            "Use Transaction#set_params or #set_params_if_nil instead."
+      it "returns parameters from request" do
+        expect(params).to eq(
+          "action" => "show",
+          "controller" => "blog_posts",
+          "id" => "1"
         )
       end
     end
+  end
 
-    describe "#set_params" do
-      around { |example| keep_transactions { example.run } }
+  describe "#params=" do
+    let(:transaction) { new_transaction }
 
-      context "when the params are set" do
-        it "updates the params on the transaction" do
-          params = { "key" => "value" }
-          transaction.set_params(params)
+    it "sets params on the transaction" do
+      params = { "foo" => "bar" }
+      silence { transaction.params = params }
 
-          transaction._sample
-          expect(transaction.params).to eq(params)
-          expect(transaction).to include_params(params)
+      transaction._sample
+      expect(transaction.params).to eq(params)
+      expect(transaction).to include_params(params)
+    end
+
+    it "logs a deprecation warning" do
+      logs =
+        capture_logs do
+          transaction.params = { "foo" => "bar" }
         end
 
-        it "updates the params on the transaction with a block" do
-          params = { "key" => "value" }
-          transaction.set_params { params }
+      expect(logs).to contains_log(
+        :warn,
+        "Transaction#params= is deprecated." \
+          "Use Transaction#set_params or #set_params_if_nil instead."
+      )
+    end
+  end
 
-          transaction._sample
-          expect(transaction.params).to eq(params)
-          expect(transaction).to include_params(params)
-        end
+  describe "#set_params" do
+    let(:transaction) { new_transaction }
 
-        it "updates with the params argument when both an argument and block are given" do
-          arg_params = { "argument" => "value" }
-          block_params = { "block" => "value" }
-          transaction.set_params(arg_params) { block_params }
+    context "when the params are set" do
+      it "updates the params on the transaction" do
+        params = { "key" => "value" }
+        transaction.set_params(params)
 
-          transaction._sample
-          expect(transaction.params).to eq(arg_params)
-          expect(transaction).to include_params(arg_params)
-        end
+        transaction._sample
+        expect(transaction.params).to eq(params)
+        expect(transaction).to include_params(params)
       end
 
-      context "when the given params is nil" do
-        it "does not update the params on the transaction" do
-          params = { "key" => "value" }
-          transaction.set_params(params)
-          transaction.set_params(nil)
+      it "updates the params on the transaction with a block" do
+        params = { "key" => "value" }
+        transaction.set_params { params }
 
-          transaction._sample
-          expect(transaction.params).to eq(params)
-          expect(transaction).to include_params(params)
-        end
+        transaction._sample
+        expect(transaction.params).to eq(params)
+        expect(transaction).to include_params(params)
       end
-    end
 
-    describe "#set_params_if_nil" do
-      around { |example| keep_transactions { example.run } }
+      it "updates with the params argument when both an argument and block are given" do
+        arg_params = { "argument" => "value" }
+        block_params = { "block" => "value" }
+        transaction.set_params(arg_params) { block_params }
 
-      context "when the params are not set" do
-        it "sets the params on the transaction" do
-          params = { "key" => "value" }
-          transaction.set_params_if_nil(params)
+        transaction._sample
+        expect(transaction.params).to eq(arg_params)
+        expect(transaction).to include_params(arg_params)
+      end
 
-          transaction._sample
-          expect(transaction.params).to eq(params)
-          expect(transaction).to include_params(params)
-        end
+      it "logs an error if an error occurred storing the params" do
+        transaction.set_params { raise "uh oh" }
 
-        it "updates the params on the transaction with a block" do
-          params = { "key" => "value" }
-          transaction.set_params_if_nil { params }
+        logs = capture_logs { transaction._sample }
+        expect(logs).to contains_log(
+          :error,
+          "Exception while fetching params: RuntimeError: uh oh"
+        )
+      end
+    end
 
-          transaction._sample
-          expect(transaction.params).to eq(params)
-          expect(transaction).to include_params(params)
-        end
+    context "when the given params is nil" do
+      it "does not update the params on the transaction" do
+        params = { "key" => "value" }
+        transaction.set_params(params)
+        transaction.set_params(nil)
 
-        it "updates with the params argument when both an argument and block are given" do
-          arg_params = { "argument" => "value" }
-          block_params = { "block" => "value" }
-          transaction.set_params_if_nil(arg_params) { block_params }
+        transaction._sample
+        expect(transaction.params).to eq(params)
+        expect(transaction).to include_params(params)
+      end
+    end
+  end
 
-          transaction._sample
-          expect(transaction.params).to eq(arg_params)
-          expect(transaction).to include_params(arg_params)
-        end
+  describe "#set_params_if_nil" do
+    let(:transaction) { new_transaction }
 
-        context "when the given params is nil" do
-          it "does not update the params on the transaction" do
-            params = { "key" => "value" }
-            transaction.set_params(params)
-            transaction.set_params_if_nil(nil)
+    context "when the params are not set" do
+      it "sets the params on the transaction" do
+        params = { "key" => "value" }
+        transaction.set_params_if_nil(params)
 
-            transaction._sample
-            expect(transaction.params).to eq(params)
-            expect(transaction).to include_params(params)
-          end
-        end
+        transaction._sample
+        expect(transaction.params).to eq(params)
+        expect(transaction).to include_params(params)
       end
 
-      context "when the params are set" do
-        it "does not update the params on the transaction" do
-          preset_params = { "other" => "params" }
-          params = { "key" => "value" }
-          transaction.set_params(preset_params)
-          transaction.set_params_if_nil(params)
+      it "updates the params on the transaction with a block" do
+        params = { "key" => "value" }
+        transaction.set_params_if_nil { params }
 
-          transaction._sample
-          expect(transaction.params).to eq(preset_params)
-          expect(transaction).to include_params(preset_params)
-        end
+        transaction._sample
+        expect(transaction.params).to eq(params)
+        expect(transaction).to include_params(params)
+      end
+
+      it "updates with the params argument when both an argument and block are given" do
+        arg_params = { "argument" => "value" }
+        block_params = { "block" => "value" }
+        transaction.set_params_if_nil(arg_params) { block_params }
+
+        transaction._sample
+        expect(transaction.params).to eq(arg_params)
+        expect(transaction).to include_params(arg_params)
+      end
 
-        it "does not update the params with a block on the transaction" do
-          preset_params = { "other" => "params" }
+      context "when the given params is nil" do
+        it "does not update the params on the transaction" do
           params = { "key" => "value" }
-          transaction.set_params(preset_params)
-          transaction.set_params_if_nil { params }
+          transaction.set_params(params)
+          transaction.set_params_if_nil(nil)
 
           transaction._sample
-          expect(transaction.params).to eq(preset_params)
-          expect(transaction).to include_params(preset_params)
+          expect(transaction.params).to eq(params)
+          expect(transaction).to include_params(params)
         end
       end
     end
 
-    describe "#set_tags" do
-      let(:long_string) { "a" * 10_001 }
+    context "when the params are set" do
+      it "does not update the params on the transaction" do
+        preset_params = { "other" => "params" }
+        params = { "key" => "value" }
+        transaction.set_params(preset_params)
+        transaction.set_params_if_nil(params)
 
-      it "stores tags on the transaction" do
-        transaction.set_tags(
-          :valid_key => "valid_value",
-          "valid_string_key" => "valid_value",
-          :both_symbols => :valid_value,
-          :integer_value => 1,
-          :hash_value => { "invalid" => "hash" },
-          :array_value => %w[invalid array],
-          :object => Object.new,
-          :too_long_value => long_string,
-          long_string => "too_long_key"
-        )
         transaction._sample
-
-        expect(transaction).to include_tags(
-          "valid_key" => "valid_value",
-          "valid_string_key" => "valid_value",
-          "both_symbols" => "valid_value",
-          "integer_value" => 1,
-          "too_long_value" => "#{"a" * 10_000}...",
-          long_string => "too_long_key"
-        )
+        expect(transaction.params).to eq(preset_params)
+        expect(transaction).to include_params(preset_params)
       end
 
-      it "merges the tags when called multiple times" do
-        transaction.set_tags(:key1 => "value1")
-        transaction.set_tags(:key2 => "value2")
-        transaction._sample
+      it "does not update the params with a block on the transaction" do
+        preset_params = { "other" => "params" }
+        params = { "key" => "value" }
+        transaction.set_params(preset_params)
+        transaction.set_params_if_nil { params }
 
-        expect(transaction).to include_tags(
-          "key1" => "value1",
-          "key2" => "value2"
-        )
+        transaction._sample
+        expect(transaction.params).to eq(preset_params)
+        expect(transaction).to include_params(preset_params)
       end
     end
+  end
 
-    describe "#set_custom_data" do
-      let(:log_stream) { std_stream }
-      let(:logs) { log_contents(log_stream) }
-      around { |example| use_logger_with(log_stream) { example.run } }
+  describe "#set_session_data" do
+    let(:transaction) { new_transaction }
 
-      it "stores custom Hash data on the transaction" do
-        transaction.set_custom_data(
-          :user => {
-            :id => 123,
-            :locale => "abc"
-          },
-          :organization => {
-            :slug => "appsignal",
-            :plan => "enterprise"
-          }
-        )
+    context "when the session data is set" do
+      it "updates the session data on the transaction" do
+        data = { "key" => "value" }
+        transaction.set_session_data(data)
 
         transaction._sample
-        expect(transaction).to include_custom_data(
-          "user" => {
-            "id" => 123,
-            "locale" => "abc"
-          },
-          "organization" => {
-            "slug" => "appsignal",
-            "plan" => "enterprise"
-          }
-        )
+        expect(transaction).to include_session_data(data)
       end
 
-      it "stores custom Array data on the transaction" do
-        transaction.set_custom_data([
-          [123, "abc"],
-          ["appsignal", "enterprise"]
-        ])
+      it "updates the session data on the transaction with a block" do
+        data = { "key" => "value" }
+        transaction.set_session_data { data }
 
         transaction._sample
-        expect(transaction).to include_custom_data([
-          [123, "abc"],
-          ["appsignal", "enterprise"]
-        ])
+        expect(transaction).to include_session_data(data)
       end
 
-      it "does not store non Hash or Array custom data" do
-        transaction.set_custom_data("abc")
-        transaction._sample
-        expect(transaction).to_not include_custom_data
+      it "updates with the session data argument when both an argument and block are given" do
+        arg_data = { "argument" => "value" }
+        block_data = { "block" => "value" }
+        transaction.set_session_data(arg_data) { block_data }
 
-        transaction.set_custom_data(123)
         transaction._sample
-        expect(transaction).to_not include_custom_data
+        expect(transaction).to include_session_data(arg_data)
+      end
+
+      it "does not include filtered out session data" do
+        Appsignal.config[:filter_session_data] = ["filtered_key"]
+        transaction.set_session_data("data" => "value1", "filtered_key" => "filtered_value")
 
-        transaction.set_custom_data(Object.new)
         transaction._sample
-        expect(transaction).to_not include_custom_data
+        expect(transaction).to include_session_data("data" => "value1")
+      end
 
+      it "logs an error if an error occurred storing the session data" do
+        transaction.set_session_data { raise "uh oh" }
+
+        logs = capture_logs { transaction._sample }
         expect(logs).to contains_log(
           :error,
-          "set_custom_data: Unsupported data type String received."
-        )
-        expect(logs).to contains_log(
-          :error,
-          "set_custom_data: Unsupported data type Integer received."
-        )
-        expect(logs).to contains_log(
-          :error,
-          "set_custom_data: Unsupported data type String received."
+          "Exception while fetching session data: RuntimeError: uh oh"
         )
       end
+    end
 
-      it "overwrites the custom data if called multiple times" do
-        transaction.set_custom_data("user" => { "id" => 123 })
-        transaction.set_custom_data("user" => { "id" => 456 })
+    context "when the given session data is nil" do
+      it "does not update the session data on the transaction" do
+        data = { "key" => "value" }
+        transaction.set_session_data(data)
+        transaction.set_session_data(nil)
 
         transaction._sample
-        expect(transaction).to include_custom_data("user" => { "id" => 456 })
+        expect(transaction).to include_session_data(data)
       end
     end
+  end
 
-    describe "#add_breadcrumb" do
-      context "when over the limit" do
-        before do
-          22.times do |i|
-            transaction.add_breadcrumb(
-              "network",
-              "GET http://localhost",
-              "User made external network request",
-              { :code => i + 1 },
-              Time.parse("10-10-2010 10:00:00 UTC")
-            )
-          end
-          transaction.sample_data
-        end
+  describe "#set_session_data_if_nil" do
+    let(:transaction) { new_transaction }
 
-        it "stores last <LIMIT> breadcrumbs on the transaction" do
-          expect(transaction.to_h["sample_data"]["breadcrumbs"].length).to eql(20)
-          expect(transaction.to_h["sample_data"]["breadcrumbs"][0]).to eq(
-            "action" => "GET http://localhost",
-            "category" => "network",
-            "message" => "User made external network request",
-            "metadata" => { "code" => 3 },
-            "time" => 1286704800 # rubocop:disable Style/NumericLiterals
-          )
-          expect(transaction.to_h["sample_data"]["breadcrumbs"][19]).to eq(
-            "action" => "GET http://localhost",
-            "category" => "network",
-            "message" => "User made external network request",
-            "metadata" => { "code" => 22 },
-            "time" => 1286704800 # rubocop:disable Style/NumericLiterals
-          )
-        end
+    context "when the params are not set" do
+      it "sets the params on the transaction" do
+        data = { "key" => "value" }
+        transaction.set_session_data_if_nil(data)
+
+        transaction._sample
+        expect(transaction).to include_session_data(data)
       end
 
-      context "with defaults" do
-        it "stores breadcrumb with defaults on transaction" do
-          timeframe_start = Time.now.utc.to_i
-          transaction.add_breadcrumb("user_action", "clicked HOME")
-          transaction.sample_data
-          timeframe_end = Time.now.utc.to_i
+      it "updates the params on the transaction with a block" do
+        data = { "key" => "value" }
+        transaction.set_session_data_if_nil { data }
 
-          expect(transaction).to include_breadcrumb(
-            "clicked HOME",
-            "user_action",
-            "",
-            {},
-            be_between(timeframe_start, timeframe_end)
-          )
-        end
+        transaction._sample
+        expect(transaction).to include_session_data(data)
       end
 
-      context "with metadata argument that's not a Hash" do
-        it "does not add the breadcrumb and logs and error" do
-          transaction.add_breadcrumb("category", "action", "message", "invalid metadata")
-          transaction.sample_data
+      it "updates with the params argument when both an argument and block are given" do
+        arg_data = { "argument" => "value" }
+        block_data = { "block" => "value" }
+        transaction.set_session_data_if_nil(arg_data) { block_data }
 
-          expect(transaction).to_not include_breadcrumbs
-          expect(log_contents(log)).to contains_log(
-            :error,
-            "add_breadcrumb: Cannot add breadcrumb. The given metadata argument is not a Hash."
-          )
+        transaction._sample
+        expect(transaction).to include_session_data(arg_data)
+      end
+
+      context "when the given params is nil" do
+        it "does not update the params on the transaction" do
+          data = { "key" => "value" }
+          transaction.set_session_data(data)
+          transaction.set_session_data_if_nil(nil)
+
+          transaction._sample
+          expect(transaction).to include_session_data(data)
         end
       end
     end
 
-    describe "#set_action" do
-      context "when the action is set" do
-        it "updates the action name on the transaction" do
-          action_name = "PagesController#show"
-          transaction.set_action(action_name)
+    context "when the params are set" do
+      it "does not update the params on the transaction" do
+        preset_data = { "other" => "data" }
+        data = { "key" => "value" }
+        transaction.set_session_data(preset_data)
+        transaction.set_session_data_if_nil(data)
 
-          expect(transaction.action).to eq(action_name)
-          expect(transaction).to have_action(action_name)
-        end
+        transaction._sample
+        expect(transaction).to include_session_data(preset_data)
       end
 
-      context "when the action is nil" do
-        it "does not update the action name on the transaction" do
-          action_name = "PagesController#show"
-          transaction.set_action(action_name)
-          transaction.set_action(nil)
+      it "does not update the params with a block on the transaction" do
+        preset_data = { "other" => "data" }
+        data = { "key" => "value" }
+        transaction.set_session_data(preset_data)
+        transaction.set_session_data_if_nil { data }
 
-          expect(transaction.action).to eq(action_name)
-          expect(transaction).to have_action(action_name)
-        end
+        transaction._sample
+        expect(transaction).to include_session_data(preset_data)
       end
     end
+  end
 
-    describe "#set_action_if_nil" do
-      context "when the action is not set" do
-        it "updates the action name on the transaction" do
-          expect(transaction.action).to eq(nil)
-          expect(transaction).to_not have_action
+  describe "#set_headers" do
+    let(:transaction) { new_transaction }
 
-          action_name = "PagesController#show"
-          transaction.set_action_if_nil(action_name)
+    context "when the headers are set" do
+      it "updates the headers on the transaction" do
+        headers = { "PATH_INFO" => "value" }
+        transaction.set_headers(headers)
 
-          expect(transaction.action).to eq(action_name)
-          expect(transaction).to have_action(action_name)
-        end
+        transaction._sample
+        expect(transaction).to include_environment(headers)
+      end
 
-        context "when the given action is nil" do
-          it "does not update the action name on the transaction" do
-            action_name = "something"
-            transaction.set_action("something")
-            transaction.set_action_if_nil(nil)
+      it "updates the headers on the transaction with a block" do
+        headers = { "PATH_INFO" => "value" }
+        transaction.set_headers { headers }
 
-            expect(transaction.action).to eq(action_name)
-            expect(transaction).to have_action(action_name)
-          end
-        end
+        transaction._sample
+        expect(transaction).to include_environment(headers)
       end
 
-      context "when the action is set" do
-        it "does not update the action name on the transaction" do
-          action_name = "something"
-          transaction.set_action("something")
-          transaction.set_action_if_nil("something else")
+      it "updates with the headers argument when both an argument and block are given" do
+        arg_data = { "PATH_INFO" => "/arg-path" }
+        block_data = { "PATH_INFO" => "/block-path" }
+        transaction.set_headers(arg_data) { block_data }
 
-          expect(transaction.action).to eq(action_name)
-          expect(transaction).to have_action(action_name)
-        end
+        transaction._sample
+        expect(transaction).to include_environment(arg_data)
       end
-    end
 
-    describe "#set_namespace" do
-      context "when the namespace is not nil" do
-        it "updates the namespace on the transaction" do
-          namespace = "custom"
-          transaction.set_namespace(namespace)
+      it "does not include filtered out headers" do
+        Appsignal.config[:request_headers] = ["MY_HEADER"]
+        transaction.set_headers("MY_HEADER" => "value1", "filtered_key" => "filtered_value")
 
-          expect(transaction.namespace).to eq namespace
-          expect(transaction).to have_namespace(namespace)
-        end
+        transaction._sample
+        expect(transaction).to include_environment("MY_HEADER" => "value1")
       end
 
-      context "when the namespace is nil" do
-        it "does not update the namespace on the transaction" do
-          namespace = "custom"
-          transaction.set_namespace(namespace)
-          transaction.set_namespace(nil)
+      it "logs an error if an error occurred storing the headers" do
+        transaction.set_headers { raise "uh oh" }
 
-          expect(transaction.namespace).to eq(namespace)
-          expect(transaction).to have_namespace(namespace)
-        end
+        logs = capture_logs { transaction._sample }
+        expect(logs).to contains_log(
+          :error,
+          "Exception while fetching headers: RuntimeError: uh oh"
+        )
       end
     end
 
-    describe "#set_http_or_background_action" do
-      context "for a hash with controller and action" do
-        it "sets the action" do
-          transaction.set_http_or_background_action(
-            :controller => "HomeController",
-            :action => "show"
-          )
-          expect(transaction).to have_action("HomeController#show")
-        end
+    context "when the given headers is nil" do
+      it "does not update the headers on the transaction" do
+        headers = { "PATH_INFO" => "value" }
+        transaction.set_headers(headers)
+        transaction.set_headers(nil)
+
+        transaction._sample
+        expect(transaction).to include_environment(headers)
       end
+    end
+  end
 
-      context "for a hash with just action" do
-        it "sets the action" do
-          transaction.set_http_or_background_action(:action => "show")
-          expect(transaction).to have_action("show")
-        end
+  describe "#set_headers_if_nil" do
+    let(:transaction) { new_transaction }
+
+    context "when the params are not set" do
+      it "sets the params on the transaction" do
+        headers = { "PATH_INFO" => "value" }
+        transaction.set_headers_if_nil(headers)
+
+        transaction._sample
+        expect(transaction).to include_environment(headers)
       end
 
-      context "for a hash with class and method" do
-        it "sets the action" do
-          transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
-          expect(transaction).to have_action("Worker#perform")
-        end
+      it "updates the params on the transaction with a block" do
+        headers = { "PATH_INFO" => "value" }
+        transaction.set_headers_if_nil { headers }
+
+        transaction._sample
+        expect(transaction).to include_environment(headers)
+      end
+
+      it "updates with the params argument when both an argument and block are given" do
+        arg_data = { "PATH_INFO" => "/arg-path" }
+        block_data = { "PATH_INFO" => "/block-path" }
+        transaction.set_headers_if_nil(arg_data) { block_data }
+
+        transaction._sample
+        expect(transaction).to include_environment(arg_data)
       end
 
-      context "when action is already set" do
-        it "does not overwrite the set action" do
-          transaction.set_action("MyCustomAction#perform")
-          transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
-          expect(transaction).to have_action("MyCustomAction#perform")
+      context "when the given params is nil" do
+        it "does not update the params on the transaction" do
+          headers = { "PATH_INFO" => "value" }
+          transaction.set_headers(headers)
+          transaction.set_headers_if_nil(nil)
+
+          transaction._sample
+          expect(transaction).to include_environment(headers)
         end
       end
     end
 
-    describe "#set_queue_start" do
-      it "sets the queue start in extension" do
-        expect(transaction.ext).to receive(:set_queue_start).with(10.0).once
+    context "when the params are set" do
+      it "does not update the params on the transaction" do
+        preset_headers = { "PATH_INFO" => "/first-path" }
+        headers = { "PATH_INFO" => "/other-path" }
+        transaction.set_headers(preset_headers)
+        transaction.set_headers_if_nil(headers)
 
-        transaction.set_queue_start(10.0)
+        transaction._sample
+        expect(transaction).to include_environment(preset_headers)
       end
 
-      it "does not set the queue start in extension when value is nil" do
-        expect(transaction.ext).to_not receive(:set_queue_start)
+      it "does not update the params with a block on the transaction" do
+        preset_headers = { "PATH_INFO" => "/first-path" }
+        headers = { "PATH_INFO" => "/other-path" }
+        transaction.set_headers(preset_headers)
+        transaction.set_headers_if_nil { headers }
 
-        transaction.set_queue_start(nil)
+        transaction._sample
+        expect(transaction).to include_environment(preset_headers)
       end
+    end
+  end
 
-      it "does not raise an error when the queue start is too big" do
-        expect(transaction.ext).to receive(:set_queue_start).and_raise(RangeError)
+  describe "#set_tags" do
+    let(:transaction) { new_transaction }
+    let(:long_string) { "a" * 10_001 }
+
+    it "stores tags on the transaction" do
+      transaction.set_tags(
+        :valid_key => "valid_value",
+        "valid_string_key" => "valid_value",
+        :both_symbols => :valid_value,
+        :integer_value => 1,
+        :hash_value => { "invalid" => "hash" },
+        :array_value => %w[invalid array],
+        :object => Object.new,
+        :too_long_value => long_string,
+        long_string => "too_long_key",
+        :true_tag => true,
+        :false_tag => false
+      )
+      transaction._sample
+
+      expect(transaction).to include_tags(
+        "valid_key" => "valid_value",
+        "valid_string_key" => "valid_value",
+        "both_symbols" => "valid_value",
+        "integer_value" => 1,
+        "too_long_value" => "#{"a" * 10_000}...",
+        long_string => "too_long_key",
+        "true_tag" => true,
+        "false_tag" => false
+      )
+    end
 
-        expect(Appsignal.internal_logger).to receive(:warn).with("Queue start value 10 is too big")
+    it "merges the tags when called multiple times" do
+      transaction.set_tags(:key1 => "value1")
+      transaction.set_tags(:key2 => "value2")
+      transaction._sample
 
-        transaction.set_queue_start(10)
-      end
+      expect(transaction).to include_tags(
+        "key1" => "value1",
+        "key2" => "value2"
+      )
     end
+  end
 
-    describe "#set_http_or_background_queue_start" do
-      let(:header_factor) { 1_000 }
-      let(:env_queue_start) { fixed_time + 20 } # in seconds
+  describe "#set_custom_data" do
+    let(:transaction) { new_transaction }
+
+    it "stores custom Hash data on the transaction" do
+      transaction.set_custom_data(
+        :user => {
+          :id => 123,
+          :locale => "abc"
+        },
+        :organization => {
+          :slug => "appsignal",
+          :plan => "enterprise"
+        }
+      )
+
+      transaction._sample
+      expect(transaction).to include_custom_data(
+        "user" => {
+          "id" => 123,
+          "locale" => "abc"
+        },
+        "organization" => {
+          "slug" => "appsignal",
+          "plan" => "enterprise"
+        }
+      )
+    end
 
-      context "when a queue time is found in a request header" do
-        let(:header_time) { ((fixed_time + 10) * header_factor).to_i } # in milliseconds
-        let(:env) { { "HTTP_X_REQUEST_START" => "t=#{header_time}" } }
+    it "stores custom Array data on the transaction" do
+      transaction.set_custom_data([
+        [123, "abc"],
+        ["appsignal", "enterprise"]
+      ])
+
+      transaction._sample
+      expect(transaction).to include_custom_data([
+        [123, "abc"],
+        ["appsignal", "enterprise"]
+      ])
+    end
 
-        it "sets the http header value in milliseconds on the transaction" do
-          expect(transaction).to receive(:set_queue_start).with(1_389_783_610_000)
+    it "does not store non Hash or Array custom data" do
+      logs =
+        capture_logs do
+          transaction.set_custom_data("abc")
+          transaction._sample
+          expect(transaction).to_not include_custom_data
+
+          transaction.set_custom_data(123)
+          transaction._sample
+          expect(transaction).to_not include_custom_data
+
+          transaction.set_custom_data(Object.new)
+          transaction._sample
+          expect(transaction).to_not include_custom_data
+        end
+
+      expect(logs).to contains_log(
+        :error,
+        "set_custom_data: Unsupported data type String received."
+      )
+      expect(logs).to contains_log(
+        :error,
+        "set_custom_data: Unsupported data type Integer received."
+      )
+      expect(logs).to contains_log(
+        :error,
+        "set_custom_data: Unsupported data type String received."
+      )
+    end
+
+    it "overwrites the custom data if called multiple times" do
+      transaction.set_custom_data("user" => { "id" => 123 })
+      transaction.set_custom_data("user" => { "id" => 456 })
+
+      transaction._sample
+      expect(transaction).to include_custom_data("user" => { "id" => 456 })
+    end
+  end
 
-          transaction.set_http_or_background_queue_start
+  describe "#add_breadcrumb" do
+    let(:transaction) { new_transaction }
+
+    context "when over the limit" do
+      before do
+        22.times do |i|
+          transaction.add_breadcrumb(
+            "network",
+            "GET http://localhost",
+            "User made external network request",
+            { :code => i + 1 },
+            Time.parse("10-10-2010 10:00:00 UTC")
+          )
         end
+        transaction._sample
+      end
 
-        context "when a :queue_start key is found in the transaction environment" do
-          let(:env) do
-            {
-              "HTTP_X_REQUEST_START" => "t=#{header_time}",
-              :queue_start => env_queue_start
-            }
-          end
+      it "stores last <LIMIT> breadcrumbs on the transaction" do
+        expect(transaction.to_h["sample_data"]["breadcrumbs"].length).to eql(20)
+        expect(transaction.to_h["sample_data"]["breadcrumbs"][0]).to eq(
+          "action" => "GET http://localhost",
+          "category" => "network",
+          "message" => "User made external network request",
+          "metadata" => { "code" => 3 },
+          "time" => 1286704800 # rubocop:disable Style/NumericLiterals
+        )
+        expect(transaction.to_h["sample_data"]["breadcrumbs"][19]).to eq(
+          "action" => "GET http://localhost",
+          "category" => "network",
+          "message" => "User made external network request",
+          "metadata" => { "code" => 22 },
+          "time" => 1286704800 # rubocop:disable Style/NumericLiterals
+        )
+      end
+    end
 
-          it "sets the http header value in milliseconds on the transaction" do
-            expect(transaction).to receive(:set_queue_start).with(1_389_783_610_000)
+    context "with defaults" do
+      it "stores breadcrumb with defaults on transaction" do
+        timeframe_start = Time.now.utc.to_i
+        transaction.add_breadcrumb("user_action", "clicked HOME")
+        transaction._sample
+        timeframe_end = Time.now.utc.to_i
+
+        expect(transaction).to include_breadcrumb(
+          "clicked HOME",
+          "user_action",
+          "",
+          {},
+          be_between(timeframe_start, timeframe_end)
+        )
+      end
+    end
 
-            transaction.set_http_or_background_queue_start
+    context "with metadata argument that's not a Hash" do
+      it "does not add the breadcrumb and logs and error" do
+        logs =
+          capture_logs do
+            transaction.add_breadcrumb("category", "action", "message", "invalid metadata")
           end
-        end
+        transaction._sample
+
+        expect(transaction).to_not include_breadcrumbs
+        expect(logs).to contains_log(
+          :error,
+          "add_breadcrumb: Cannot add breadcrumb. The given metadata argument is not a Hash."
+        )
       end
+    end
+  end
 
-      context "when a :queue_start key is found in the transaction environment" do
-        let(:env) { { :queue_start => env_queue_start } } # in seconds
+  describe "#set_action" do
+    let(:transaction) { new_transaction }
 
-        it "sets the :queue_start value in milliseconds on the transaction" do
-          expect(transaction).to receive(:set_queue_start).with(1_389_783_620_000)
+    context "when the action is set" do
+      it "updates the action name on the transaction" do
+        action_name = "PagesController#show"
+        transaction.set_action(action_name)
 
-          transaction.set_http_or_background_queue_start
-        end
+        expect(transaction.action).to eq(action_name)
+        expect(transaction).to have_action(action_name)
       end
     end
 
-    describe "#set_metadata" do
-      it "updates the metadata on the transaction" do
-        transaction.set_metadata("request_method", "GET")
+    context "when the action is nil" do
+      it "does not update the action name on the transaction" do
+        action_name = "PagesController#show"
+        transaction.set_action(action_name)
+        transaction.set_action(nil)
 
-        expect(transaction).to include_metadata("request_method" => "GET")
+        expect(transaction.action).to eq(action_name)
+        expect(transaction).to have_action(action_name)
       end
+    end
+  end
 
-      context "when filter_metadata includes metadata key" do
-        before { Appsignal.config[:filter_metadata] = ["filter_key"] }
-        after { Appsignal.config[:filter_metadata] = [] }
+  describe "#set_action_if_nil" do
+    let(:transaction) { new_transaction }
 
-        it "does not set the metadata on the transaction" do
-          transaction.set_metadata(:filter_key, "filtered value")
-          transaction.set_metadata("filter_key", "filtered value")
+    context "when the action is not set" do
+      it "updates the action name on the transaction" do
+        expect(transaction.action).to eq(nil)
+        expect(transaction).to_not have_action
 
-          expect(transaction).to_not include_metadata("filter_key" => anything)
-        end
+        action_name = "PagesController#show"
+        transaction.set_action_if_nil(action_name)
+
+        expect(transaction.action).to eq(action_name)
+        expect(transaction).to have_action(action_name)
       end
 
-      context "when the key is nil" do
-        it "does not update the metadata on the transaction" do
-          transaction.set_metadata(nil, "GET")
+      context "when the given action is nil" do
+        it "does not update the action name on the transaction" do
+          action_name = "something"
+          transaction.set_action("something")
+          transaction.set_action_if_nil(nil)
 
-          expect(transaction).to_not include_metadata
+          expect(transaction.action).to eq(action_name)
+          expect(transaction).to have_action(action_name)
         end
       end
+    end
 
-      context "when the value is nil" do
-        it "does not update the metadata on the transaction" do
-          transaction.set_metadata("request_method", nil)
+    context "when the action is set" do
+      it "does not update the action name on the transaction" do
+        action_name = "something"
+        transaction.set_action("something")
+        transaction.set_action_if_nil("something else")
 
-          expect(transaction).to_not include_metadata
-        end
+        expect(transaction.action).to eq(action_name)
+        expect(transaction).to have_action(action_name)
       end
     end
+  end
 
-    describe "#set_sample_data" do
-      it "updates the sample data on the transaction" do
-        transaction.set_sample_data(
-          "params",
-          :controller => "blog_posts",
-          :action     => "show",
-          :id         => "1"
-        )
+  describe "#set_namespace" do
+    let(:transaction) { new_transaction }
 
-        expect(transaction).to include_params(
-          "action" => "show",
-          "controller" => "blog_posts",
-          "id" => "1"
+    context "when the namespace is not nil" do
+      it "updates the namespace on the transaction" do
+        namespace = "custom"
+        transaction.set_namespace(namespace)
+
+        expect(transaction.namespace).to eq namespace
+        expect(transaction).to have_namespace(namespace)
+      end
+    end
+
+    context "when the namespace is nil" do
+      it "does not update the namespace on the transaction" do
+        namespace = "custom"
+        transaction.set_namespace(namespace)
+        transaction.set_namespace(nil)
+
+        expect(transaction.namespace).to eq(namespace)
+        expect(transaction).to have_namespace(namespace)
+      end
+    end
+  end
+
+  describe "#set_http_or_background_action" do
+    let(:transaction) { new_transaction }
+
+    context "for a hash with controller and action" do
+      it "sets the action" do
+        transaction.set_http_or_background_action(
+          :controller => "HomeController",
+          :action => "show"
         )
+        expect(transaction).to have_action("HomeController#show")
       end
+    end
 
-      context "when the data is no Array or Hash" do
-        it "does not update the sample data on the transaction" do
-          transaction.set_sample_data("params", "string")
+    context "for a hash with just action" do
+      it "sets the action" do
+        transaction.set_http_or_background_action(:action => "show")
+        expect(transaction).to have_action("show")
+      end
+    end
 
-          expect(transaction.to_h["sample_data"]).to eq({})
-          expect(log_contents(log)).to contains_log :error,
-            %(Invalid sample data for 'params'. Value is not an Array or Hash: '"string"')
-        end
+    context "for a hash with class and method" do
+      it "sets the action" do
+        transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
+        expect(transaction).to have_action("Worker#perform")
       end
+    end
 
-      context "when the data cannot be converted to JSON" do
-        it "does not update the sample data on the transaction" do
-          klass = Class.new do
-            def to_s
-              raise "foo" # Cause a deliberate error
-            end
-          end
-          transaction.set_sample_data("params", klass.new => 1)
+    context "when action is already set" do
+      it "does not overwrite the set action" do
+        transaction.set_action("MyCustomAction#perform")
+        transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
+        expect(transaction).to have_action("MyCustomAction#perform")
+      end
+    end
+  end
 
-          expect(transaction).to_not include_params
-          expect(log_contents(log)).to contains_log :error,
-            "Error generating data (RuntimeError: foo) for"
-        end
+  describe "#set_queue_start" do
+    let(:transaction) { new_transaction }
+
+    it "sets the queue start in extension" do
+      transaction.set_queue_start(10)
+
+      expect(transaction).to have_queue_start(10)
+    end
+
+    it "does not set the queue start in extension when value is nil" do
+      transaction.set_queue_start(nil)
+
+      expect(transaction).to_not have_queue_start
+    end
+
+    it "does not raise an error when the queue start is too big" do
+      expect(transaction.ext).to receive(:set_queue_start).and_raise(RangeError)
+
+      expect(Appsignal.internal_logger).to receive(:warn).with("Queue start value 10 is too big")
+
+      transaction.set_queue_start(10)
+    end
+  end
+
+  describe "#set_http_or_background_queue_start" do
+    let(:transaction) { legacy_new_transaction(:request => legacy_request(env)) }
+    let(:err_stream) { std_stream }
+    let(:stderr) { err_stream.read }
+    let(:header_factor) { 1_000 }
+    let(:env_queue_start) { fixed_time + 20 } # in seconds
+
+    def set_http_or_background_queue_start
+      capture_std_streams(std_stream, err_stream) do
+        transaction.set_http_or_background_queue_start
       end
     end
 
-    describe "#sample_data" do
-      let(:env) { { "rack.session" => { "session" => "value" } } }
+    context "when a queue time is found in a request header" do
+      let(:header_time) { ((fixed_time + 10) * header_factor).to_i } # in milliseconds
+      let(:env) { { "HTTP_X_REQUEST_START" => "t=#{header_time}" } }
 
-      it "sets sample data" do
-        transaction.set_tags "tag" => "value"
-        transaction.add_breadcrumb "category", "action", "message", "key" => "value"
-        transaction.sample_data
+      it "sets the http header value in milliseconds on the transaction" do
+        set_http_or_background_queue_start
 
-        expect(transaction).to include_environment(
-          "REQUEST_METHOD" => "GET",
-          "SERVER_NAME" => "example.org",
-          "SERVER_PORT" => "80",
-          "PATH_INFO" => "/blog"
-        )
-        expect(transaction).to include_session_data("session" => "value")
-        expect(transaction).to include_params(
-          "controller" => "blog_posts",
-          "action" => "show",
-          "id" => "1"
+        expect(transaction).to have_queue_start(1_389_783_610_000)
+      end
+
+      it "logs a deprecation message" do
+        logs = capture_logs { set_http_or_background_queue_start }
+
+        expect(logs).to contains_log(
+          :warn,
+          "The Appsignal::Transaction#set_http_or_background_queue_start " \
+            "method has been deprecated."
         )
-        expect(transaction).to include_sample_metadata("key" => "value")
-        expect(transaction).to include_tags("tag" => "value")
-        expect(transaction).to include_breadcrumb(
-          "action",
-          "category",
-          "message",
-          { "key" => "value" },
-          kind_of(Integer)
+      end
+
+      it "prints a deprecation message" do
+        set_http_or_background_queue_start
+
+        expect(stderr).to include(
+          "The Appsignal::Transaction#set_http_or_background_queue_start " \
+            "method has been deprecated."
         )
       end
 
-      context "when params is a callable object" do
-        it "calls the params object and sets the return value as parametesr" do
-          transaction.set_params { { "param1" => "value1" } }
+      context "when a :queue_start key is found in the transaction environment" do
+        let(:env) do
+          {
+            "HTTP_X_REQUEST_START" => "t=#{header_time}",
+            :queue_start => env_queue_start
+          }
+        end
 
-          transaction.sample_data
-          expect(transaction).to include_params(
-            "param1" => "value1"
-          )
+        it "sets the http header value in milliseconds on the transaction" do
+          set_http_or_background_queue_start
+
+          expect(transaction).to have_queue_start(1_389_783_610_000)
         end
       end
     end
 
-    describe "#set_error" do
-      let(:env) { http_request_env_with_data }
-      let(:error) do
-        e = ExampleStandardError.new("test message")
-        allow(e).to receive(:backtrace).and_return(["line 1"])
-        e
+    context "when a :queue_start key is found in the transaction environment" do
+      let(:env) { { :queue_start => env_queue_start } } # in seconds
+
+      it "sets the :queue_start value in milliseconds on the transaction" do
+        set_http_or_background_queue_start
+
+        expect(transaction).to have_queue_start(1_389_783_620_000)
       end
+    end
+  end
+
+  describe "#set_metadata" do
+    let(:transaction) { new_transaction }
 
-      it "should also respond to add_exception for backwards compatibility" do
-        expect(transaction).to respond_to(:add_exception)
+    it "updates the metadata on the transaction" do
+      transaction.set_metadata("request_method", "GET")
+
+      expect(transaction).to include_metadata("request_method" => "GET")
+    end
+
+    context "when filter_metadata includes metadata key" do
+      before { Appsignal.config[:filter_metadata] = ["filter_key"] }
+      after { Appsignal.config[:filter_metadata] = [] }
+
+      it "does not set the metadata on the transaction" do
+        transaction.set_metadata(:filter_key, "filtered value")
+        transaction.set_metadata("filter_key", "filtered value")
+
+        expect(transaction).to_not include_metadata("filter_key" => anything)
       end
+    end
 
-      it "should not add the error if appsignal is not active" do
-        allow(Appsignal).to receive(:active?).and_return(false)
-        expect(transaction.ext).to_not receive(:set_error)
+    context "when the key is nil" do
+      it "does not update the metadata on the transaction" do
+        transaction.set_metadata(nil, "GET")
 
-        transaction.set_error(error)
+        expect(transaction).to_not include_metadata
       end
+    end
 
-      context "when error is not an error" do
-        let(:error) { Object.new }
+    context "when the value is nil" do
+      it "does not update the metadata on the transaction" do
+        transaction.set_metadata("request_method", nil)
 
-        it "does not add the error" do
-          expect(Appsignal.internal_logger).to receive(:error).with(
-            "Appsignal::Transaction#set_error: Cannot set error. " \
-              "The given value is not an exception: #{error.inspect}"
-          )
-          expect(transaction.ext).to_not receive(:set_error)
+        expect(transaction).to_not include_metadata
+      end
+    end
+  end
+
+  describe "storing sample data" do
+    let(:transaction) { new_transaction }
+
+    it "stores sample data on the transaction" do
+      transaction.set_params(
+        "string_param" => "string_value",
+        :symbol_param => "symbol_value",
+        "integer" => 123,
+        "float" => 123.45,
+        "array" => ["abc", 456, { "option" => true }],
+        "hash" => { "hash_key" => "hash_value" }
+      )
+
+      transaction._sample
+      expect(transaction).to include_params(
+        "string_param" => "string_value",
+        "symbol_param" => "symbol_value",
+        "integer" => 123,
+        "float" => 123.45,
+        "array" => ["abc", 456, { "option" => true }],
+        "hash" => { "hash_key" => "hash_value" }
+      )
+    end
 
-          transaction.set_error(error)
+    it "does not store non-Array and non-Hash data" do
+      logs =
+        capture_logs do
+          transaction.set_params("some string")
+          transaction._sample
+          expect(transaction).to_not include_params
+
+          transaction.set_params(123)
+          transaction._sample
+          expect(transaction).to_not include_params
+
+          transaction.set_params(Class.new)
+          transaction._sample
+          expect(transaction).to_not include_params
+
+          set = Set.new
+          set.add("some value")
+          transaction.set_params(set)
+          transaction._sample
+          expect(transaction).to_not include_params
         end
-      end
 
-      context "for a http request" do
-        it "should set an error in the extension" do
-          expect(transaction.ext).to receive(:set_error).with(
-            "ExampleStandardError",
-            "test message",
-            Appsignal::Utils::Data.generate(["line 1"])
-          )
+      expect(logs).to contains_log :error,
+        %(Invalid sample data for 'params'. Value is not an Array or Hash: '"some string"')
+      expect(logs).to contains_log :error,
+        %(Invalid sample data for 'params'. Value is not an Array or Hash: '123')
+      expect(logs).to contains_log :error,
+        %(Invalid sample data for 'params'. Value is not an Array or Hash: '"#<Class>"')
+      expect(logs).to contains_log :error,
+        %(Invalid sample data for 'params'. Value is not an Array or Hash: '"#<Set>"')
+    end
 
-          transaction.set_error(error)
+    it "does not store data that can't be converted to JSON" do
+      klass = Class.new do
+        def initialize
+          @calls = 0
         end
-      end
 
-      context "when the error has no causes" do
-        it "should not send the causes information as sample data" do
-          expect(transaction.ext).to_not receive(:set_sample_data)
+        def to_s
+          raise "foo" if @calls > 0 # Cause a deliberate error
 
-          transaction.set_error(error)
+          @calls += 1
         end
       end
 
-      context "when the error has multiple causes" do
-        let(:error) do
-          e = ExampleStandardError.new("test message")
-          e2 = RuntimeError.new("cause message")
-          e3 = StandardError.new("cause message 2")
-          allow(e).to receive(:backtrace).and_return(["line 1"])
-          allow(e).to receive(:cause).and_return(e2)
-          allow(e2).to receive(:cause).and_return(e3)
-          e
-        end
+      transaction.set_params(klass.new => 1)
+      logs = capture_logs { transaction._sample }
 
-        it "sends the causes information as sample data" do
-          expect(transaction.ext).to receive(:set_error).with(
-            "ExampleStandardError",
-            "test message",
-            Appsignal::Utils::Data.generate(["line 1"])
-          )
+      expect(transaction).to_not include_params
+      expect(logs).to contains_log :error,
+        "Error generating data (RuntimeError: foo) for"
+    end
+  end
 
-          expect(transaction.ext).to receive(:set_sample_data).with(
-            "error_causes",
-            Appsignal::Utils::Data.generate(
-              [
-                {
-                  :name => "RuntimeError",
-                  :message => "cause message"
-                },
-                {
-                  :name => "StandardError",
-                  :message => "cause message 2"
-                }
-              ]
-            )
-          )
+  describe "#set_sample_data" do
+    let(:transaction) { new_transaction }
 
-          expect(Appsignal.internal_logger).to_not receive(:debug)
+    it "updates the sample data on the transaction" do
+      silence do
+        transaction.set_sample_data(
+          "params",
+          :controller => "blog_posts",
+          :action     => "show",
+          :id         => "1"
+        )
+      end
+
+      expect(transaction).to include_params(
+        "action" => "show",
+        "controller" => "blog_posts",
+        "id" => "1"
+      )
+    end
+
+    context "when the data is no Array or Hash" do
+      it "does not update the sample data on the transaction" do
+        logs =
+          capture_logs do
+            silence { transaction.set_sample_data("params", "string") }
+          end
+
+        expect(transaction.to_h["sample_data"]).to eq({})
+        expect(logs).to contains_log :error,
+          %(Invalid sample data for 'params'. Value is not an Array or Hash: '"string"')
+      end
+    end
 
-          transaction.set_error(error)
+    context "when the data cannot be converted to JSON" do
+      it "does not update the sample data on the transaction" do
+        klass = Class.new do
+          def to_s
+            raise "foo" # Cause a deliberate error
+          end
         end
+        logs =
+          capture_logs do
+            silence { transaction.set_sample_data("params", klass.new => 1) }
+          end
+
+        expect(transaction).to_not include_params
+        expect(logs).to contains_log :error,
+          "Error generating data (RuntimeError: foo) for"
+      end
+    end
+  end
+
+  describe "#sample_data" do
+    let(:transaction) { legacy_new_transaction(:request => rack_request(env)) }
+    let(:env) do
+      Rack::MockRequest.env_for(
+        "/blog",
+        "REQUEST_METHOD" => "GET",
+        "SERVER_NAME" => "example.org",
+        "SERVER_PORT" => "80",
+        "PATH_INFO" => "/blog",
+        "rack.session" => { "session" => "value" },
+        :params => {
+          "controller" => "blog_posts",
+          "action" => "show",
+          "id" => "1"
+        }
+      ).merge(
+        :metadata => { "metadata" => "value" }
+      )
+    end
+
+    it "sets sample data from request" do
+      transaction.set_tags "tag" => "value"
+      transaction.add_breadcrumb "category", "action", "message", "key" => "value"
+      silence { transaction.sample_data }
+
+      expect(transaction).to include_environment(
+        "REQUEST_METHOD" => "GET",
+        "SERVER_NAME" => "example.org",
+        "SERVER_PORT" => "80",
+        "PATH_INFO" => "/blog"
+      )
+      expect(transaction).to include_session_data("session" => "value")
+      expect(transaction).to include_params(
+        "controller" => "blog_posts",
+        "action" => "show",
+        "id" => "1"
+      )
+      expect(transaction).to include_sample_metadata("metadata" => "value")
+      expect(transaction).to include_tags("tag" => "value")
+      expect(transaction).to include_breadcrumb(
+        "action",
+        "category",
+        "message",
+        { "key" => "value" },
+        kind_of(Integer)
+      )
+    end
+  end
+
+  describe "#set_error" do
+    let(:transaction) { new_transaction }
+    let(:env) { http_request_env_with_data }
+    let(:error) do
+      e = ExampleStandardError.new("test message")
+      allow(e).to receive(:backtrace).and_return(["line 1"])
+      e
+    end
+
+    it "should also respond to add_exception for backwards compatibility" do
+      expect(transaction).to respond_to(:add_exception)
+    end
+
+    it "should not add the error if appsignal is not active" do
+      allow(Appsignal).to receive(:active?).and_return(false)
+      expect(transaction.ext).to_not receive(:set_error)
+
+      transaction.set_error(error)
+    end
+
+    context "when error is not an error" do
+      let(:error) { Object.new }
+
+      it "does not add the error" do
+        expect(Appsignal.internal_logger).to receive(:error).with(
+          "Appsignal::Transaction#set_error: Cannot set error. " \
+            "The given value is not an exception: #{error.inspect}"
+        )
+        expect(transaction.ext).to_not receive(:set_error)
+
+        transaction.set_error(error)
       end
+    end
 
-      context "when the error has too many causes" do
-        let(:error) do
-          e = ExampleStandardError.new("root cause error")
+    context "for a http request" do
+      it "should set an error in the extension" do
+        expect(transaction.ext).to receive(:set_error).with(
+          "ExampleStandardError",
+          "test message",
+          Appsignal::Utils::Data.generate(["line 1"])
+        )
 
-          11.times do |i|
-            next_e = ExampleStandardError.new("wrapper error #{i}")
-            allow(next_e).to receive(:cause).and_return(e)
-            e = next_e
-          end
+        transaction.set_error(error)
+      end
+    end
+
+    context "when the error has no causes" do
+      it "should not send the causes information as sample data" do
+        expect(transaction.ext).to_not receive(:set_sample_data)
+
+        transaction.set_error(error)
+      end
+    end
+
+    context "when the error has multiple causes" do
+      let(:error) do
+        e = ExampleStandardError.new("test message")
+        e2 = RuntimeError.new("cause message")
+        e3 = StandardError.new("cause message 2")
+        allow(e).to receive(:backtrace).and_return(["line 1"])
+        allow(e).to receive(:cause).and_return(e2)
+        allow(e2).to receive(:cause).and_return(e3)
+        e
+      end
 
-          allow(e).to receive(:backtrace).and_return(["line 1"])
-          e
-        end
+      it "sends the causes information as sample data" do
+        expect(transaction.ext).to receive(:set_error).with(
+          "ExampleStandardError",
+          "test message",
+          Appsignal::Utils::Data.generate(["line 1"])
+        )
 
-        it "sends only the first causes as sample data" do
-          expect(transaction.ext).to receive(:set_error).with(
-            "ExampleStandardError",
-            "wrapper error 10",
-            Appsignal::Utils::Data.generate(["line 1"])
+        expect(transaction.ext).to receive(:set_sample_data).with(
+          "error_causes",
+          Appsignal::Utils::Data.generate(
+            [
+              {
+                :name => "RuntimeError",
+                :message => "cause message"
+              },
+              {
+                :name => "StandardError",
+                :message => "cause message 2"
+              }
+            ]
           )
+        )
 
-          expected_error_causes = Array.new(10) do |i|
-            {
-              :name => "ExampleStandardError",
-              :message => "wrapper error #{9 - i}"
-            }
-          end
-
-          expected_error_causes.last[:is_root_cause] = false
+        expect(Appsignal.internal_logger).to_not receive(:debug)
 
-          expect(transaction.ext).to receive(:set_sample_data).with(
-            "error_causes",
-            Appsignal::Utils::Data.generate(expected_error_causes)
-          )
+        transaction.set_error(error)
+      end
+    end
 
-          expect(Appsignal.internal_logger).to receive(:debug).with(
-            "Appsignal::Transaction#set_error: Error has more " \
-              "than 10 error causes. Only the first 10 " \
-              "will be reported."
-          )
+    context "when the error has too many causes" do
+      let(:error) do
+        e = ExampleStandardError.new("root cause error")
 
-          transaction.set_error(error)
+        11.times do |i|
+          next_e = ExampleStandardError.new("wrapper error #{i}")
+          allow(next_e).to receive(:cause).and_return(e)
+          e = next_e
         end
+
+        allow(e).to receive(:backtrace).and_return(["line 1"])
+        e
       end
 
-      context "when error message is nil" do
-        let(:error) do
-          e = ExampleStandardError.new
-          allow(e).to receive(:message).and_return(nil)
-          allow(e).to receive(:backtrace).and_return(["line 1"])
-          e
-        end
+      it "sends only the first causes as sample data" do
+        expect(transaction.ext).to receive(:set_error).with(
+          "ExampleStandardError",
+          "wrapper error 10",
+          Appsignal::Utils::Data.generate(["line 1"])
+        )
 
-        it "should not raise an error" do
-          transaction.set_error(error)
+        expected_error_causes = Array.new(10) do |i|
+          {
+            :name => "ExampleStandardError",
+            :message => "wrapper error #{9 - i}"
+          }
         end
 
-        it "should set an error in the extension" do
-          expect(transaction.ext).to receive(:set_error).with(
-            "ExampleStandardError",
-            "",
-            Appsignal::Utils::Data.generate(["line 1"])
-          )
+        expected_error_causes.last[:is_root_cause] = false
 
-          transaction.set_error(error)
-        end
+        expect(transaction.ext).to receive(:set_sample_data).with(
+          "error_causes",
+          Appsignal::Utils::Data.generate(expected_error_causes)
+        )
+
+        expect(Appsignal.internal_logger).to receive(:debug).with(
+          "Appsignal::Transaction#set_error: Error has more " \
+            "than 10 error causes. Only the first 10 " \
+            "will be reported."
+        )
+
+        transaction.set_error(error)
       end
     end
 
-    describe "#start_event" do
-      it "starts the event in the extension" do
-        expect(transaction.ext).to receive(:start_event).with(0).and_call_original
+    context "when error message is nil" do
+      let(:error) do
+        e = ExampleStandardError.new
+        allow(e).to receive(:message).and_return(nil)
+        allow(e).to receive(:backtrace).and_return(["line 1"])
+        e
+      end
 
-        transaction.start_event
+      it "should not raise an error" do
+        transaction.set_error(error)
       end
 
-      context "when transaction is paused" do
-        it "does not start the event" do
-          transaction.pause!
-          expect(transaction.ext).to_not receive(:start_event)
+      it "should set an error in the extension" do
+        expect(transaction.ext).to receive(:set_error).with(
+          "ExampleStandardError",
+          "",
+          Appsignal::Utils::Data.generate(["line 1"])
+        )
 
-          transaction.start_event
-        end
+        transaction.set_error(error)
       end
     end
+  end
 
-    describe "#finish_event" do
-      let(:fake_gc_time) { 0 }
+  describe "#start_event" do
+    let(:transaction) { new_transaction }
 
-      it "should finish the event in the extension" do
-        expect(transaction.ext).to receive(:finish_event).with(
-          "name",
-          "title",
-          "body",
-          1,
-          fake_gc_time
-        ).and_call_original
+    it "starts the event in the extension" do
+      expect(transaction.ext).to receive(:start_event).with(0).and_call_original
 
-        transaction.finish_event(
-          "name",
-          "title",
-          "body",
-          1
-        )
-      end
+      transaction.start_event
+    end
 
-      it "should finish the event in the extension with nil arguments" do
-        expect(transaction.ext).to receive(:finish_event).with(
-          "name",
-          "",
-          "",
-          0,
-          fake_gc_time
-        ).and_call_original
+    context "when transaction is paused" do
+      it "does not start the event" do
+        transaction.pause!
+        expect(transaction.ext).to_not receive(:start_event)
 
-        transaction.finish_event(
-          "name",
-          nil,
-          nil,
-          nil
-        )
+        transaction.start_event
       end
+    end
+  end
 
-      context "when transaction is paused" do
-        it "does not finish the event" do
-          transaction.pause!
-          expect(transaction.ext).to_not receive(:finish_event)
-
-          transaction.start_event
-        end
-      end
+  describe "#finish_event" do
+    let(:transaction) { new_transaction }
+    let(:fake_gc_time) { 0 }
+
+    it "should finish the event in the extension" do
+      expect(transaction.ext).to receive(:finish_event).with(
+        "name",
+        "title",
+        "body",
+        1,
+        fake_gc_time
+      ).and_call_original
+
+      transaction.finish_event(
+        "name",
+        "title",
+        "body",
+        1
+      )
     end
 
-    describe "#record_event" do
-      let(:fake_gc_time) { 0 }
+    it "should finish the event in the extension with nil arguments" do
+      expect(transaction.ext).to receive(:finish_event).with(
+        "name",
+        "",
+        "",
+        0,
+        fake_gc_time
+      ).and_call_original
+
+      transaction.finish_event(
+        "name",
+        nil,
+        nil,
+        nil
+      )
+    end
 
-      it "should record the event in the extension" do
-        expect(transaction.ext).to receive(:record_event).with(
-          "name",
-          "title",
-          "body",
-          1,
-          1000,
-          fake_gc_time
-        ).and_call_original
+    context "when transaction is paused" do
+      it "does not finish the event" do
+        transaction.pause!
+        expect(transaction.ext).to_not receive(:finish_event)
 
-        transaction.record_event(
-          "name",
-          "title",
-          "body",
-          1000,
-          1
-        )
+        transaction.start_event
       end
+    end
+  end
 
-      it "should finish the event in the extension with nil arguments" do
-        expect(transaction.ext).to receive(:record_event).with(
-          "name",
-          "",
-          "",
-          0,
-          1000,
-          fake_gc_time
-        ).and_call_original
+  describe "#record_event" do
+    let(:transaction) { new_transaction }
+    let(:fake_gc_time) { 0 }
+
+    it "should record the event in the extension" do
+      expect(transaction.ext).to receive(:record_event).with(
+        "name",
+        "title",
+        "body",
+        1,
+        1000,
+        fake_gc_time
+      ).and_call_original
+
+      transaction.record_event(
+        "name",
+        "title",
+        "body",
+        1000,
+        1
+      )
+    end
+
+    it "should finish the event in the extension with nil arguments" do
+      expect(transaction.ext).to receive(:record_event).with(
+        "name",
+        "",
+        "",
+        0,
+        1000,
+        fake_gc_time
+      ).and_call_original
+
+      transaction.record_event(
+        "name",
+        nil,
+        nil,
+        1000,
+        nil
+      )
+    end
+
+    context "when transaction is paused" do
+      it "does not record the event" do
+        transaction.pause!
+        expect(transaction.ext).to_not receive(:record_event)
 
         transaction.record_event(
           "name",
@@ -1238,172 +1779,192 @@ describe Appsignal::Transaction do
           nil
         )
       end
+    end
+  end
 
-      context "when transaction is paused" do
-        it "does not record the event" do
-          transaction.pause!
-          expect(transaction.ext).to_not receive(:record_event)
-
-          transaction.record_event(
-            "name",
-            nil,
-            nil,
-            1000,
-            nil
-          )
-        end
-      end
+  describe "#instrument" do
+    it_behaves_like "instrument helper" do
+      let(:transaction) { new_transaction }
+      let(:instrumenter) { transaction }
     end
+  end
 
-    describe "#instrument" do
-      it_behaves_like "instrument helper" do
-        let(:instrumenter) { transaction }
-      end
+  context "GenericRequest" do
+    let(:env) { {} }
+    subject { Appsignal::Transaction::GenericRequest.new(env) }
+
+    it "prints a deprecation warning on use" do
+      err_stream = std_stream
+      capture_std_streams(std_stream, err_stream) { subject }
+
+      expect(err_stream.read).to include(
+        "appsignal WARNING: The use of Appsignal::Transaction::GenericRequest is deprecated."
+      )
     end
 
-    context "generic request" do
-      let(:env) { {} }
-      subject { Appsignal::Transaction::GenericRequest.new(env) }
+    it "logs a deprecation warning on use" do
+      logs = capture_logs { silence { subject } }
 
-      it "initializes with an empty env" do
-        expect(subject.env).to be_empty
-      end
+      expect(logs).to contains_log(
+        :warn,
+        "The use of Appsignal::Transaction::GenericRequest is deprecated."
+      )
+    end
 
-      context "when given an env" do
-        let(:env) do
-          {
-            :params => { :id => 1 },
-            :queue_start => 10
-          }
-        end
+    it "initializes with an empty env" do
+      expect(subject.env).to be_empty
+    end
 
-        it "sets the given env" do
-          expect(subject.env).to eq env
-        end
+    context "when given an env" do
+      let(:env) do
+        {
+          :params => { :id => 1 },
+          :queue_start => 10
+        }
+      end
 
-        it "sets the params present in the env" do
-          expect(subject.params).to eq(:id => 1)
-        end
+      it "sets the given env" do
+        expect(subject.env).to eq env
       end
+
+      it "sets the params present in the env" do
+        expect(subject.params).to eq(:id => 1)
+      end
+    end
+  end
+
+  # private
+
+  describe "#background_queue_start" do
+    let(:transaction) { legacy_new_transaction(:request => request) }
+    let(:request) { rack_request(env) }
+    let(:env) { {} }
+    subject { transaction.send(:background_queue_start) }
+
+    context "when request is nil" do
+      let(:request) { nil }
+
+      it { is_expected.to eq nil }
+    end
+
+    context "when env is nil" do
+      before { expect(request).to receive(:env).and_return(nil) }
+
+      it { is_expected.to eq nil }
+    end
+
+    context "when queue start is nil" do
+      it { is_expected.to eq nil }
     end
 
-    # private
+    context "when queue start is set" do
+      before do
+        env[:queue_start] = fixed_time
+      end
+
+      it { is_expected.to eq 1_389_783_600_000 }
+    end
+  end
 
-    describe "#background_queue_start" do
-      subject { transaction.send(:background_queue_start) }
+  describe "#http_queue_start" do
+    let(:transaction) { legacy_new_transaction(:request => request) }
+    let(:request) { rack_request(env) }
+    let(:env) { {} }
+    let(:slightly_earlier_time) { fixed_time - 0.4 }
+    let(:slightly_earlier_time_value) { (slightly_earlier_time * factor).to_i }
+    subject { transaction.send(:http_queue_start) }
 
+    shared_examples "http queue start" do
       context "when request is nil" do
         let(:request) { nil }
 
-        it { is_expected.to eq nil }
+        it { is_expected.to be_nil }
       end
 
       context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
-
-        it { is_expected.to eq nil }
-      end
+        before { expect(request).to receive(:env).and_return(nil) }
 
-      context "when queue start is nil" do
-        it { is_expected.to eq nil }
+        it { is_expected.to be_nil }
       end
 
-      context "when queue start is set" do
-        let(:env) { background_env_with_data }
+      context "with no relevant header set" do
+        let(:env) { {} }
 
-        it { is_expected.to eq 1_389_783_600_000 }
+        it { is_expected.to be_nil }
       end
-    end
 
-    describe "#http_queue_start" do
-      let(:slightly_earlier_time) { fixed_time - 0.4 }
-      let(:slightly_earlier_time_value) { (slightly_earlier_time * factor).to_i }
-      subject { transaction.send(:http_queue_start) }
+      context "with the HTTP_X_REQUEST_START header set" do
+        let(:env) { { "HTTP_X_REQUEST_START" => "t=#{slightly_earlier_time_value}" } }
 
-      shared_examples "http queue start" do
-        context "when request is nil" do
-          let(:request) { nil }
+        it { is_expected.to eq 1_389_783_599_600 }
+
+        context "with unparsable content" do
+          let(:env) { { "HTTP_X_REQUEST_START" => "something" } }
 
           it { is_expected.to be_nil }
         end
 
-        context "when env is nil" do
-          before { expect(transaction.request).to receive(:env).and_return(nil) }
+        context "with unparsable content at the end" do
+          let(:env) { { "HTTP_X_REQUEST_START" => "t=#{slightly_earlier_time_value}aaaa" } }
 
-          it { is_expected.to be_nil }
+          it { is_expected.to eq 1_389_783_599_600 }
         end
 
-        context "with no relevant header set" do
-          let(:env) { {} }
+        context "with a really low number" do
+          let(:env) { { "HTTP_X_REQUEST_START" => "t=100" } }
 
           it { is_expected.to be_nil }
         end
 
-        context "with the HTTP_X_REQUEST_START header set" do
-          let(:env) { { "HTTP_X_REQUEST_START" => "t=#{slightly_earlier_time_value}" } }
+        context "with the alternate HTTP_X_QUEUE_START header set" do
+          let(:env) { { "HTTP_X_QUEUE_START" => "t=#{slightly_earlier_time_value}" } }
 
           it { is_expected.to eq 1_389_783_599_600 }
-
-          context "with unparsable content" do
-            let(:env) { { "HTTP_X_REQUEST_START" => "something" } }
-
-            it { is_expected.to be_nil }
-          end
-
-          context "with unparsable content at the end" do
-            let(:env) { { "HTTP_X_REQUEST_START" => "t=#{slightly_earlier_time_value}aaaa" } }
-
-            it { is_expected.to eq 1_389_783_599_600 }
-          end
-
-          context "with a really low number" do
-            let(:env) { { "HTTP_X_REQUEST_START" => "t=100" } }
-
-            it { is_expected.to be_nil }
-          end
-
-          context "with the alternate HTTP_X_QUEUE_START header set" do
-            let(:env) { { "HTTP_X_QUEUE_START" => "t=#{slightly_earlier_time_value}" } }
-
-            it { is_expected.to eq 1_389_783_599_600 }
-          end
         end
       end
+    end
 
-      context "time in milliseconds" do
-        let(:factor) { 1_000 }
+    context "time in milliseconds" do
+      let(:factor) { 1_000 }
 
-        it_should_behave_like "http queue start"
-      end
+      it_should_behave_like "http queue start"
+    end
 
-      context "time in microseconds" do
-        let(:factor) { 1_000_000 }
+    context "time in microseconds" do
+      let(:factor) { 1_000_000 }
 
-        it_should_behave_like "http queue start"
-      end
+      it_should_behave_like "http queue start"
     end
+  end
 
-    describe "#sanitized_params" do
-      subject { transaction.send(:sanitized_params) }
+  describe "#sanitized_params" do
+    let(:transaction) { new_transaction }
+    subject { transaction.send(:sanitized_params) }
 
-      context "with custom params" do
-        before do
-          transaction.set_params(:foo => "bar", :baz => :bat)
-        end
+    context "with params" do
+      before do
+        transaction.set_params(:foo => "bar", :baz => :bat)
+      end
 
-        it "returns custom params" do
-          is_expected.to eq(:foo => "bar", :baz => :bat)
-        end
+      it "returns params" do
+        is_expected.to eq(:foo => "bar", :baz => :bat)
+      end
 
-        context "with AppSignal filtering" do
-          before { Appsignal.config.config_hash[:filter_parameters] = %w[foo] }
-          after { Appsignal.config.config_hash[:filter_parameters] = [] }
+      context "with AppSignal filtering" do
+        before { Appsignal.config.config_hash[:filter_parameters] = %w[foo] }
+        after { Appsignal.config.config_hash[:filter_parameters] = [] }
 
-          it "returns sanitized custom params" do
-            expect(subject).to eq(:foo => "[FILTERED]", :baz => :bat)
-          end
+        it "returns sanitized custom params" do
+          expect(subject).to eq(:foo => "[FILTERED]", :baz => :bat)
         end
       end
+    end
+
+    context "params from request" do
+      let(:transaction) { legacy_new_transaction(:request => request, :options => options) }
+      let(:options) { {} }
+      let(:request) { rack_request(env) }
+      let(:env) { {} }
 
       context "without request params" do
         before { allow(transaction.request).to receive(:params).and_return(nil) }
@@ -1412,7 +1973,7 @@ describe Appsignal::Transaction do
       end
 
       context "when request params crashes" do
-        before { allow(transaction.request).to receive(:params).and_raise(NoMethodError) }
+        before { expect(request).to receive(:params).and_raise(NoMethodError) }
 
         it { is_expected.to be_nil }
       end
@@ -1431,11 +1992,7 @@ describe Appsignal::Transaction do
       end
 
       context "with an array" do
-        let(:request) do
-          Appsignal::Transaction::GenericRequest.new(
-            background_env_with_data(:params => %w[arg1 arg2])
-          )
-        end
+        let(:request) { legacy_request(:params => %w[arg1 arg2]) }
 
         it { is_expected.to eq %w[arg1 arg2] }
 
@@ -1449,11 +2006,7 @@ describe Appsignal::Transaction do
 
       context "with env" do
         context "with sanitization" do
-          let(:request) do
-            Appsignal::Transaction::GenericRequest.new(
-              http_request_env_with_data(:params => { :foo => :bar })
-            )
-          end
+          let(:request) { legacy_request(:params => { :foo => :bar }) }
 
           it "should call the params sanitizer" do
             expect(subject).to eq(:foo => :bar)
@@ -1461,11 +2014,7 @@ describe Appsignal::Transaction do
         end
 
         context "with AppSignal filtering" do
-          let(:request) do
-            Appsignal::Transaction::GenericRequest.new(
-              http_request_env_with_data(:params => { :foo => :bar, :baz => :bat })
-            )
-          end
+          let(:request) { legacy_request(:params => { :foo => :bar, :baz => :bat }) }
           before { Appsignal.config.config_hash[:filter_parameters] = %w[foo] }
           after { Appsignal.config.config_hash[:filter_parameters] = [] }
 
@@ -1475,93 +2024,139 @@ describe Appsignal::Transaction do
         end
       end
     end
+  end
 
-    describe "#sanitized_environment" do
-      let(:allowlisted_keys) { Appsignal.config[:request_headers] }
-      subject { transaction.send(:sanitized_environment) }
+  describe "#sanitized_environment" do
+    let(:transaction) { legacy_new_transaction(:request => request) }
+    let(:request) { rack_request(env) }
+    let(:env) { {} }
+    let(:allowlisted_keys) { Appsignal.config[:request_headers] }
+    subject { transaction.send(:sanitized_environment) }
 
-      context "when request is nil" do
-        let(:request) { nil }
+    context "when request is nil" do
+      let(:request) { nil }
 
-        it { is_expected.to be_nil }
-      end
+      it { is_expected.to be_nil }
+    end
 
-      context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
+    context "when env is nil" do
+      before { expect(request).to receive(:env).and_return(nil) }
 
-        it { is_expected.to be_nil }
+      it { is_expected.to be_nil }
+    end
+
+    context "when env is present" do
+      let(:env) do
+        {}.tap do |hash|
+          allowlisted_keys.each { |o| hash[o] = 1 } # use all allowlisted keys
+          hash[allowlisted_keys] = nil # don't add if nil
+          hash[:not_allowlisted] = "I will be sanitized"
+        end
       end
 
-      context "when env is present" do
-        let(:env) do
-          {}.tap do |hash|
-            allowlisted_keys.each { |o| hash[o] = 1 } # use all allowlisted keys
-            hash[allowlisted_keys] = nil # don't add if nil
-            hash[:not_allowlisted] = "I will be sanitized"
-          end
+      it "only sets allowlisted keys" do
+        expect(subject.keys).to match_array(allowlisted_keys)
+      end
+
+      context "with configured request_headers" do
+        before do
+          Appsignal.config.config_hash[:request_headers] = %w[CONTENT_LENGTH]
         end
 
         it "only sets allowlisted keys" do
-          expect(subject.keys).to match_array(allowlisted_keys)
+          expect(subject.keys).to match_array(%w[CONTENT_LENGTH])
         end
+      end
+    end
+  end
 
-        context "with configured request_headers" do
-          before do
-            Appsignal.config.config_hash[:request_headers] = %w[CONTENT_LENGTH]
-          end
+  describe "#sanitized_session_data" do
+    let(:transaction) { legacy_new_transaction(:request => request) }
+    let(:request) { rack_request(env) }
+    let(:env) { {} }
+    subject { transaction.send(:sanitized_session_data) }
 
-          it "only sets allowlisted keys" do
-            expect(subject.keys).to match_array(%w[CONTENT_LENGTH])
-          end
-        end
-      end
+    context "when request is nil" do
+      let(:request) { nil }
+
+      it { is_expected.to be_nil }
     end
 
-    describe "#sanitized_session_data" do
-      subject { transaction.send(:sanitized_session_data) }
+    context "when session is nil" do
+      before { expect(transaction.request).to receive(:session).and_return(nil) }
 
-      context "when request is nil" do
-        let(:request) { nil }
+      it { is_expected.to be_nil }
+    end
 
-        it { is_expected.to be_nil }
-      end
+    context "when session is empty" do
+      before { expect(transaction.request).to receive(:session).and_return({}) }
 
-      context "when session is nil" do
-        before { expect(transaction.request).to receive(:session).and_return(nil) }
+      it { is_expected.to eq({}) }
+    end
 
-        it { is_expected.to be_nil }
-      end
+    context "when request class does not have a session method" do
+      let(:request) { Appsignal::Transaction::GenericRequest.new({}) }
+
+      it { is_expected.to be_nil }
+    end
 
-      context "when session is empty" do
-        before { expect(transaction.request).to receive(:session).and_return({}) }
+    context "with a session" do
+      let(:session_data_filter) { [] }
+      before { Appsignal.config[:filter_session_data] = session_data_filter }
+      after { Appsignal.config[:filter_session_data] = [] }
 
-        it { is_expected.to eq({}) }
-      end
+      context "with generic session object" do
+        before do
+          expect(transaction).to respond_to(:request)
+          allow(transaction).to receive_message_chain(
+            :request,
+            :session => { :foo => :bar, :abc => :def }
+          )
+          allow(transaction).to receive_message_chain(:request, :fullpath => :bar)
+        end
+
+        context "without session filtering" do
+          it "keeps the session data intact" do
+            expect(subject).to eq(:foo => :bar, :abc => :def)
+          end
+        end
 
-      context "when request class does not have a session method" do
-        let(:request) { Appsignal::Transaction::GenericRequest.new({}) }
+        context "with session filtering" do
+          let(:session_data_filter) { %w[foo] }
 
-        it { is_expected.to be_nil }
+          it "filters the session data" do
+            expect(subject).to eq(:foo => "[FILTERED]", :abc => :def)
+          end
+        end
       end
 
-      context "with a session" do
-        let(:session_data_filter) { [] }
-        before { Appsignal.config[:filter_session_data] = session_data_filter }
-        after { Appsignal.config[:filter_session_data] = [] }
+      if defined? ActionDispatch::Request::Session
+        context "with ActionDispatch::Request::Session" do
+          let(:action_dispatch_session) do
+            store = Class.new do
+              def load_session(_env)
+                [1, { :foo => :bar, :abc => :def }]
+              end
 
-        context "with generic session object" do
+              def session_exists?(_env)
+                true
+              end
+            end.new
+            ActionDispatch::Request::Session.create(store,
+              ActionDispatch::Request.new("rack.input" => StringIO.new), {})
+          end
           before do
             expect(transaction).to respond_to(:request)
             allow(transaction).to receive_message_chain(
               :request,
-              :session => { :foo => :bar, :abc => :def }
+              :session => action_dispatch_session
             )
             allow(transaction).to receive_message_chain(:request, :fullpath => :bar)
           end
 
           context "without session filtering" do
             it "keeps the session data intact" do
-              expect(subject).to eq(:foo => :bar, :abc => :def)
+              expect(subject).to eq("foo" => :bar, "abc" => :def)
             end
           end
 
@@ -1569,120 +2164,87 @@ describe Appsignal::Transaction do
             let(:session_data_filter) { %w[foo] }
 
             it "filters the session data" do
-              expect(subject).to eq(:foo => "[FILTERED]", :abc => :def)
-            end
-          end
-        end
-
-        if defined? ActionDispatch::Request::Session
-          context "with ActionDispatch::Request::Session" do
-            let(:action_dispatch_session) do
-              store = Class.new do
-                def load_session(_env)
-                  [1, { :foo => :bar, :abc => :def }]
-                end
-
-                def session_exists?(_env)
-                  true
-                end
-              end.new
-              ActionDispatch::Request::Session.create(store,
-                ActionDispatch::Request.new("rack.input" => StringIO.new), {})
-            end
-            before do
-              expect(transaction).to respond_to(:request)
-              allow(transaction).to receive_message_chain(
-                :request,
-                :session => action_dispatch_session
-              )
-              allow(transaction).to receive_message_chain(:request, :fullpath => :bar)
-            end
-
-            context "without session filtering" do
-              it "keeps the session data intact" do
-                expect(subject).to eq("foo" => :bar, "abc" => :def)
-              end
-            end
-
-            context "with session filtering" do
-              let(:session_data_filter) { %w[foo] }
-
-              it "filters the session data" do
-                expect(subject).to eq("foo" => "[FILTERED]", "abc" => :def)
-              end
+              expect(subject).to eq("foo" => "[FILTERED]", "abc" => :def)
             end
           end
         end
+      end
 
-        context "when not sending session data" do
-          before { Appsignal.config[:send_session_data] = false }
+      context "when not sending session data" do
+        before { Appsignal.config[:send_session_data] = false }
 
-          it "does not set any session data on the transaction" do
-            expect(subject).to be_nil
-          end
+        it "does not set any session data on the transaction" do
+          expect(subject).to be_nil
         end
       end
     end
+  end
 
-    describe "#sanitized_metadata" do
-      subject { transaction.send(:sanitized_metadata) }
+  describe "#sanitized_metadata" do
+    let(:transaction) { legacy_new_transaction(:request => request) }
+    let(:request) { rack_request(env) }
+    let(:env) { {} }
+    subject { transaction.send(:sanitized_metadata) }
 
-      context "when request is nil" do
-        let(:request) { nil }
+    context "when request is nil" do
+      let(:request) { nil }
 
-        it { is_expected.to be_nil }
-      end
+      it { is_expected.to be_nil }
+    end
 
-      context "when env is nil" do
-        before { expect(transaction.request).to receive(:env).and_return(nil) }
+    context "when env is nil" do
+      before { expect(request).to receive(:env).and_return(nil) }
 
-        it { is_expected.to be_nil }
-      end
+      it { is_expected.to be_nil }
+    end
 
-      context "when env is present" do
-        let(:env) { { "key" => "value" } }
+    context "when env is present" do
+      let(:env) { { :metadata => { "key" => "value" } } }
 
-        it { is_expected.to eq("key" => "value") }
+      it do
+        is_expected.to eq("key" => "value")
+      end
 
-        context "with filter_metadata option set" do
-          before { Appsignal.config[:filter_metadata] = ["key"] }
-          after { Appsignal.config[:filter_metadata] = [] }
+      context "with filter_metadata option set" do
+        before { Appsignal.config[:filter_metadata] = ["key"] }
+        after { Appsignal.config[:filter_metadata] = [] }
 
-          it "filters out keys listed in the filter_metadata option" do
-            expect(subject.keys).to_not include("key")
-          end
+        it "filters out keys listed in the filter_metadata option" do
+          expect(subject.keys).to_not include("key")
         end
       end
     end
+  end
 
-    describe "#cleaned_backtrace" do
-      subject { transaction.send(:cleaned_backtrace, ["line 1", "line 2"]) }
+  describe "#cleaned_backtrace" do
+    let(:transaction) { new_transaction }
+    subject { transaction.send(:cleaned_backtrace, ["line 1", "line 2"]) }
 
-      it "returns the backtrace" do
-        expect(subject).to eq ["line 1", "line 2"]
-      end
+    it "returns the backtrace" do
+      expect(subject).to eq ["line 1", "line 2"]
+    end
 
-      context "with Rails module but without backtrace_cleaner method" do
-        it "returns the backtrace uncleaned" do
-          stub_const("Rails", Module.new)
-          expect(subject).to eq ["line 1", "line 2"]
-        end
+    context "with Rails module but without backtrace_cleaner method" do
+      it "returns the backtrace uncleaned" do
+        stub_const("Rails", Module.new)
+        expect(subject).to eq ["line 1", "line 2"]
       end
+    end
 
-      if rails_present?
-        context "with rails" do
-          it "cleans the backtrace with the Rails backtrace cleaner" do
-            ::Rails.backtrace_cleaner.add_filter do |line|
-              line.tr("2", "?")
-            end
-            expect(subject).to eq ["line 1", "line ?"]
+    if rails_present?
+      context "with rails" do
+        it "cleans the backtrace with the Rails backtrace cleaner" do
+          ::Rails.backtrace_cleaner.add_filter do |line|
+            line.tr("2", "?")
           end
+          expect(subject).to eq ["line 1", "line ?"]
         end
       end
     end
   end
 
   describe "#cleaned_error_message" do
+    let(:transaction) { new_transaction }
     let(:error) { StandardError.new("Error message") }
     subject { transaction.send(:cleaned_error_message, error) }
 
@@ -1729,6 +2291,7 @@ describe Appsignal::Transaction do
   end
 
   describe ".to_hash / .to_h" do
+    let(:transaction) { new_transaction }
     subject { transaction.to_hash }
 
     context "when extension returns serialized JSON" do
@@ -1737,9 +2300,9 @@ describe Appsignal::Transaction do
           "action" => nil,
           "error" => nil,
           "events" => [],
-          "id" => transaction_id,
+          "id" => kind_of(String),
           "metadata" => {},
-          "namespace" => namespace,
+          "namespace" => default_namespace,
           "sample_data" => {}
         )
       end
@@ -1772,7 +2335,7 @@ describe Appsignal::Transaction do
       subject.set_http_or_background_queue_start
       subject.set_metadata("key", "value")
       subject.set_sample_data("key", "data")
-      subject.sample_data
+      subject._sample
       subject.set_error("a")
     end
   end