From cede184db949272fad78489e23bd23e8fe1395c6 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 14 Nov 2025 11:36:51 +0530
Subject: [PATCH 01/21] lint: change license header creation logic

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 extras/license_header.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extras/license_header.rb b/extras/license_header.rb
index 50ae5a0f..c2aa9092 100644
--- a/extras/license_header.rb
+++ b/extras/license_header.rb
@@ -14,7 +14,6 @@ class LicenseHeader < Base
         HEADER = '(c) Copyright IBM Corp.'.freeze
         HEADER_TEMPLATE = <<~HERE.freeze
           # (c) Copyright IBM Corp. %d
-          # (c) Copyright Instana Inc. %d
         HERE
 
         def on_new_investigation

From cef311949cb3ddbf53f409f3de55869d42a30dca Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 14 Nov 2025 12:51:58 +0530
Subject: [PATCH 02/21] feat: base structure for bunny instrumentation

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/activators/bunny.rb      | 22 ++++++++++++++++
 lib/instana/instrumentation/bunny.rb | 38 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 lib/instana/activators/bunny.rb
 create mode 100644 lib/instana/instrumentation/bunny.rb

diff --git a/lib/instana/activators/bunny.rb b/lib/instana/activators/bunny.rb
new file mode 100644
index 00000000..a5d19de4
--- /dev/null
+++ b/lib/instana/activators/bunny.rb
@@ -0,0 +1,22 @@
+# (c) Copyright IBM Corp. 2025
+
+module Instana
+  module Activators
+    class Bunny < Activator
+      def can_instrument?
+        defined?(::Bunny) &&
+          defined?(::Bunny::Queue) &&
+          defined?(::Bunny::Exchange) &&
+          ::Instana.config[:bunny][:enabled]
+      end
+
+      def instrument
+        require 'instana/instrumentation/bunny'
+
+        ::Bunny::Exchange.prepend(::Instana::Instrumentation::BunnyProducer)
+
+        true
+      end
+    end
+  end
+end
diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
new file mode 100644
index 00000000..afe9a01e
--- /dev/null
+++ b/lib/instana/instrumentation/bunny.rb
@@ -0,0 +1,38 @@
+# (c) Copyright IBM Corp. 2025
+
+module Instana
+  module Instrumentation
+    module BunnyProducer
+      def publish(payload, options = {})
+        if ::Instana.tracer.tracing?
+          exchange_name = name.empty? ? 'default' : name
+          routing_key = options[:routing_key] || ''
+
+          kvs = {
+            rabbitmq: {
+              sort: 'entry',
+              address: channel.connection.host,
+              key: routing_key,
+              exchange: exchange_name
+            }
+          }
+
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+            # Inject trace context into message headers
+            options[:headers] ||= {}
+            options[:headers]['X-Instana-T'] = span.context.trace_id
+            options[:headers]['X-Instana-S'] = span.context.span_id
+            options[:headers]['X-Instana-L'] = span.context.level.to_s
+
+            super(payload, options)
+          end
+        else
+          super(payload, options)
+        end
+      rescue
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        raise
+      end
+    end
+  end
+end

From f16d667ba98631c8726243f33f6d0ddb67cf54a2 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Tue, 18 Nov 2025 10:56:07 +0530
Subject: [PATCH 03/21] feat(bunny): capture exception and increase error count
 on span

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index afe9a01e..7c6a253e 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -4,6 +4,7 @@ module Instana
   module Instrumentation
     module BunnyProducer
       def publish(payload, options = {})
+        current_span = nil
         if ::Instana.tracer.tracing?
           exchange_name = name.empty? ? 'default' : name
           routing_key = options[:routing_key] || ''
@@ -17,7 +18,8 @@ def publish(payload, options = {})
             }
           }
 
-          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do |span|
+            current_span = span
             # Inject trace context into message headers
             options[:headers] ||= {}
             options[:headers]['X-Instana-T'] = span.context.trace_id
@@ -30,6 +32,7 @@ def publish(payload, options = {})
           super(payload, options)
         end
       rescue
+        current_span&.record_exception(e)
         ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         raise
       end

From 138691f51c5f022e51a790402f473ad72e778497 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Tue, 18 Nov 2025 19:30:38 +0530
Subject: [PATCH 04/21] feat(bunny): change attribute sort

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 7c6a253e..11ff657e 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -11,7 +11,7 @@ def publish(payload, options = {})
 
           kvs = {
             rabbitmq: {
-              sort: 'entry',
+              sort: 'publish',
               address: channel.connection.host,
               key: routing_key,
               exchange: exchange_name
@@ -32,9 +32,9 @@ def publish(payload, options = {})
           super(payload, options)
         end
       rescue
-        current_span&.record_exception(e)
-        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-        raise
+        # current_span&.record_exception(e)
+        # ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        # raise
       end
     end
   end

From a17beb1db419b8336873230d983d165c7e0fc28f Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Tue, 18 Nov 2025 21:35:27 +0530
Subject: [PATCH 05/21] feat(bunny): error handling is done in in_span

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 11ff657e..8b19f8ff 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -4,7 +4,6 @@ module Instana
   module Instrumentation
     module BunnyProducer
       def publish(payload, options = {})
-        current_span = nil
         if ::Instana.tracer.tracing?
           exchange_name = name.empty? ? 'default' : name
           routing_key = options[:routing_key] || ''
@@ -18,8 +17,7 @@ def publish(payload, options = {})
             }
           }
 
-          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do |span|
-            current_span = span
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
             # Inject trace context into message headers
             options[:headers] ||= {}
             options[:headers]['X-Instana-T'] = span.context.trace_id
@@ -32,7 +30,6 @@ def publish(payload, options = {})
           super(payload, options)
         end
       rescue
-        # current_span&.record_exception(e)
         # ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         # raise
       end

From 3f6f953a0a188a9e6d5602e499b79a8a90b4e0a8 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Wed, 19 Nov 2025 14:12:50 +0530
Subject: [PATCH 06/21] feat(bunny): add instrumentation for pop method

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/activators/bunny.rb      |  1 +
 lib/instana/instrumentation/bunny.rb | 55 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/lib/instana/activators/bunny.rb b/lib/instana/activators/bunny.rb
index a5d19de4..badb3ea3 100644
--- a/lib/instana/activators/bunny.rb
+++ b/lib/instana/activators/bunny.rb
@@ -14,6 +14,7 @@ def instrument
         require 'instana/instrumentation/bunny'
 
         ::Bunny::Exchange.prepend(::Instana::Instrumentation::BunnyProducer)
+        ::Bunny::Queue.prepend(::Instana::Instrumentation::BunnyConsumer)
 
         true
       end
diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 8b19f8ff..169874d3 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -34,5 +34,60 @@ def publish(payload, options = {})
         # raise
       end
     end
+
+    module BunnyConsumer
+      def pop(options = {})
+        delivery_info, properties, payload = super(options)
+
+        return [delivery_info, properties, payload] unless delivery_info
+
+        headers = properties.headers
+        {
+          trace_id: headers['X-Instana-T'],
+          span_id: headers['X-Instana-S'],
+          level: headers['X-Instana-L']&.to_i
+        }.reject { |_, v| v.nil? } || {}
+
+        if ::Instana.tracer.tracing? || headers
+          queue_name = name
+          exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
+
+          kvs = {
+            rabbitmq: {
+              sort: 'consume',
+              address: channel.connection.host,
+              queue: queue_name,
+              exchange: exchange_name,
+              key: delivery_info.routing_key
+            }
+          }
+
+          if headers[:trace_id]
+            instana_context = ::Instana::SpanContext.new(
+              trace_id: headers[:trace_id],
+              span_id: headers[:span_id],
+              level: headers[:level]
+            )
+            span = OpenTelemetry::Trace.non_recording_span(instana_context)
+
+            Trace.with_span(span) do
+              ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+                # Return the message for processing
+                [delivery_info, properties, payload]
+              end
+            end
+          else
+            ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+              [delivery_info, properties, payload]
+            end
+          end
+        else
+          [delivery_info, properties, payload]
+        end
+      rescue
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        raise
+      end
+    end
   end
 end

From d9753a91538aef37a42c61c8b50debd8998c9b19 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Wed, 19 Nov 2025 15:42:58 +0530
Subject: [PATCH 07/21] feat(bunny): add config and span kind

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/config.rb          | 1 +
 lib/instana/trace/span_kind.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/instana/config.rb b/lib/instana/config.rb
index c37766b1..6521a8a4 100644
--- a/lib/instana/config.rb
+++ b/lib/instana/config.rb
@@ -64,6 +64,7 @@ def initialize(logger: ::Instana.logger, agent_host: ENV['INSTANA_AGENT_HOST'],
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }
+      @config[:bunny]              = { :enabled => true }
       @config[:dalli]              = { :enabled => true }
       @config[:excon]              = { :enabled => true }
       @config[:grpc]               = { :enabled => true }
diff --git a/lib/instana/trace/span_kind.rb b/lib/instana/trace/span_kind.rb
index 2f56c64a..6e42b6d1 100644
--- a/lib/instana/trace/span_kind.rb
+++ b/lib/instana/trace/span_kind.rb
@@ -9,7 +9,7 @@ module Instana
   module SpanKind
     # Instana specific spans
     REGISTERED_SPANS = [:actioncontroller, :actionview, :activerecord, :excon,
-                        :memcache, :'net-http', :rack, :render, :'rpc-client',
+                        :memcache, :'net-http', :rack, :rabbitmq, :render, :'rpc-client',
                         :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
                         :"aws.lambda.invoke", :mongo, :sequel].freeze

From 38024550185fcbd7a85417e3737f7b7b7960d642 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Wed, 19 Nov 2025 20:50:40 +0530
Subject: [PATCH 08/21] test(bunny): add tests to publish and pop methods

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 test/instrumentation/bunny_test.rb | 112 +++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 test/instrumentation/bunny_test.rb

diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
new file mode 100644
index 00000000..08b823d4
--- /dev/null
+++ b/test/instrumentation/bunny_test.rb
@@ -0,0 +1,112 @@
+# (c) Copyright IBM Corp. 2025
+
+require 'test_helper'
+
+class BunnyTest < Minitest::Test
+  def setup
+    skip unless defined?(::Bunny)
+
+    @connection = ::Bunny.new(host: ENV['RABBITMQ_HOST'] || 'localhost')
+    begin
+      @connection.start
+    rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::TCPConnectionFailed => e
+      skip "RabbitMQ is not running: #{e.message}"
+    end
+    @channel = @connection.create_channel
+    @exchange = @channel.default_exchange
+    @queue = @channel.queue('instana.test.queue', auto_delete: true)
+  end
+
+  def teardown
+    return unless defined?(::Bunny)
+
+    @queue.delete if @queue && @channel&.open?
+    @channel.close if @channel&.open?
+    @connection.close if @connection&.open?
+  end
+
+  def test_publish_with_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test message', routing_key: @queue.name)
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+    test_span = spans[1]
+
+    # Verify parent-child relationship
+    assert_equal test_span[:s], rabbitmq_span[:p]
+
+    # Verify RabbitMQ span details
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'publish', rabbitmq_span[:data][:rabbitmq][:sort]
+    assert_equal @queue.name, rabbitmq_span[:data][:rabbitmq][:key]
+    assert_equal 'default', rabbitmq_span[:data][:rabbitmq][:exchange]
+    assert rabbitmq_span[:data][:rabbitmq][:address]
+  end
+
+  def test_publish_injects_trace_headers
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test message', routing_key: @queue.name)
+    end
+
+    # Retrieve the message
+    delivery_info, properties, _payload = @queue.pop
+
+    refute_nil delivery_info
+    refute_nil properties
+    refute_nil properties.headers
+
+    # Verify trace context headers are present
+    assert properties.headers['X-Instana-T']
+    assert properties.headers['X-Instana-S']
+    assert properties.headers['X-Instana-L']
+  end
+
+  def test_publish_without_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish without active trace
+    @exchange.publish('test message', routing_key: @queue.name)
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 0, spans.length
+
+    # Message should still be delivered
+    delivery_info, _properties, payload = @queue.pop
+    refute_nil delivery_info
+    assert_equal 'test message', payload
+  end
+
+  def test_publish_with_custom_exchange
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    custom_exchange = @channel.topic('instana.test.exchange', auto_delete: true)
+    @queue.bind(custom_exchange, routing_key: 'test.key')
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      custom_exchange.publish('test message', routing_key: 'test.key')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'instana.test.exchange', rabbitmq_span[:data][:rabbitmq][:exchange]
+    assert_equal 'test.key', rabbitmq_span[:data][:rabbitmq][:key]
+
+    custom_exchange.delete
+  end
+end

From d97caaaf2fbbac3b29897dd16759edac40264830 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Thu, 20 Nov 2025 10:09:12 +0530
Subject: [PATCH 09/21] feat(bunny): instrument subscribe method

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 55 ++++++++++++++++++++++++++++
 test/instrumentation/bunny_test.rb   | 29 +++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 169874d3..3ecb7f63 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -88,6 +88,61 @@ def pop(options = {})
         ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         raise
       end
+
+      def subscribe(options = {}, &block)
+        if block_given?
+          wrapped_block = lambda do |delivery_info, properties, payload|
+            headers = properties.headers
+            {
+              trace_id: headers['X-Instana-T'],
+              span_id: headers['X-Instana-S'],
+              level: headers['X-Instana-L']&.to_i
+            }.reject { |_, v| v.nil? } || {}
+            if ::Instana.tracer.tracing? || headers
+              queue_name = name
+              exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
+
+              kvs = {
+                rabbitmq: {
+                  sort: 'consume',
+                  address: channel.connection.host,
+                  queue: queue_name,
+                  exchange: exchange_name,
+                  key: delivery_info.routing_key
+                }
+              }
+
+              if headers[:trace_id]
+                instana_context = ::Instana::SpanContext.new(
+                  trace_id: headers[:trace_id],
+                  span_id: headers[:span_id],
+                  level: headers[:level]
+                )
+                span = OpenTelemetry::Trace.non_recording_span(instana_context)
+
+                Trace.with_span(span) do
+                  ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+                    block.call(delivery_info, properties, payload)
+                  end
+                end
+              else
+                ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+                  block.call(delivery_info, properties, payload)
+                end
+              end
+            else
+              block.call(delivery_info, properties, payload)
+            end
+          end
+
+          super(options, &wrapped_block)
+        else
+          super(options, &block)
+        end
+      rescue => e
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        raise
+      end
     end
   end
 end
diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index 08b823d4..df506dcb 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -25,6 +25,12 @@ def teardown
     @connection.close if @connection&.open?
   end
 
+  def test_config_defaults
+    assert ::Instana.config[:bunny].is_a?(Hash)
+    assert ::Instana.config[:bunny].key?(:enabled)
+    assert_equal true, ::Instana.config[:bunny][:enabled]
+  end
+
   def test_publish_with_tracing
     skip unless defined?(::Bunny)
     clear_all!
@@ -109,4 +115,27 @@ def test_publish_with_custom_exchange
 
     custom_exchange.delete
   end
+
+  def test_subscribe_with_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message first
+    ::Instana.tracer.in_span(:rabbitmq_producer) do
+      @exchange.publish('test message', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Subscribe and process one message
+    message_received = false
+    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+      message_received = true
+    end
+
+    # Give it a moment to process
+    sleep 0.1
+
+    assert message_received
+  end
 end

From dd5e6e1183b80b3f6955cbd4a972d3ac5542cfa6 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Thu, 20 Nov 2025 12:51:47 +0530
Subject: [PATCH 10/21] feat(bunny): move context extraction logic to separate
 method

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 58 +++++++++++++++-------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 3ecb7f63..bb9b01ee 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -17,7 +17,7 @@ def publish(payload, options = {})
             }
           }
 
-          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do |span|
             # Inject trace context into message headers
             options[:headers] ||= {}
             options[:headers]['X-Instana-T'] = span.context.trace_id
@@ -30,8 +30,8 @@ def publish(payload, options = {})
           super(payload, options)
         end
       rescue
-        # ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-        # raise
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        raise
       end
     end
 
@@ -41,14 +41,7 @@ def pop(options = {})
 
         return [delivery_info, properties, payload] unless delivery_info
 
-        headers = properties.headers
-        {
-          trace_id: headers['X-Instana-T'],
-          span_id: headers['X-Instana-S'],
-          level: headers['X-Instana-L']&.to_i
-        }.reject { |_, v| v.nil? } || {}
-
-        if ::Instana.tracer.tracing? || headers
+        if ::Instana.tracer.tracing? || extract_context_from_headers(properties)
           queue_name = name
           exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
 
@@ -62,11 +55,14 @@ def pop(options = {})
             }
           }
 
-          if headers[:trace_id]
+          # Extract trace context from message headers
+          context = extract_context_from_headers(properties)
+
+          if context[:trace_id]
             instana_context = ::Instana::SpanContext.new(
-              trace_id: headers[:trace_id],
-              span_id: headers[:span_id],
-              level: headers[:level]
+              trace_id: context[:trace_id],
+              span_id: context[:span_id],
+              level: context[:level]
             )
             span = OpenTelemetry::Trace.non_recording_span(instana_context)
 
@@ -92,13 +88,7 @@ def pop(options = {})
       def subscribe(options = {}, &block)
         if block_given?
           wrapped_block = lambda do |delivery_info, properties, payload|
-            headers = properties.headers
-            {
-              trace_id: headers['X-Instana-T'],
-              span_id: headers['X-Instana-S'],
-              level: headers['X-Instana-L']&.to_i
-            }.reject { |_, v| v.nil? } || {}
-            if ::Instana.tracer.tracing? || headers
+            if ::Instana.tracer.tracing? || extract_context_from_headers(properties)
               queue_name = name
               exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
 
@@ -112,11 +102,14 @@ def subscribe(options = {}, &block)
                 }
               }
 
-              if headers[:trace_id]
+              # Extract trace context from message headers
+              context = extract_context_from_headers(properties)
+
+              if context[:trace_id]
                 instana_context = ::Instana::SpanContext.new(
-                  trace_id: headers[:trace_id],
-                  span_id: headers[:span_id],
-                  level: headers[:level]
+                  trace_id: context[:trace_id],
+                  span_id: context[:span_id],
+                  level: context[:level]
                 )
                 span = OpenTelemetry::Trace.non_recording_span(instana_context)
 
@@ -143,6 +136,19 @@ def subscribe(options = {}, &block)
         ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         raise
       end
+
+      private
+
+      def extract_context_from_headers(properties)
+        return {} unless properties && properties.headers
+
+        headers = properties.headers
+        {
+          trace_id: headers['X-Instana-T'],
+          span_id: headers['X-Instana-S'],
+          level: headers['X-Instana-L']&.to_i
+        }.reject { |_, v| v.nil? }
+      end
     end
   end
 end

From e6fa5062e9d537db0b60f15aca9c0fa26aff87b8 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 21 Nov 2025 10:47:48 +0530
Subject: [PATCH 11/21] test(bunny): add more tests

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 test/instrumentation/bunny_test.rb | 75 ++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index df506dcb..b582c8c2 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -138,4 +138,79 @@ def test_subscribe_with_tracing
 
     assert message_received
   end
+
+  def test_consume_with_context_propagation
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # First, publish a message with trace context
+    trace_id = nil
+    span_id = nil
+
+    ::Instana.tracer.in_span(:rabbitmq_producer) do |span|
+      trace_id = span.context.trace_id
+      span_id = span.context.span_id
+      @exchange.publish('test message', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Now consume the message
+    delivery_info, properties, payload = @queue.pop
+
+    # Simulate consumer processing with context extraction
+    if properties && properties.headers
+      context = {
+        trace_id: properties.headers['X-Instana-T'],
+        span_id: properties.headers['X-Instana-S'],
+        level: properties.headers['X-Instana-L']&.to_i
+      }
+
+      # Verify context was propagated
+      # The trace_id should match (same trace)
+      assert_equal trace_id, context[:trace_id]
+      # The span_id in the header is the rabbitmq span's ID (child of rabbitmq_producer)
+      # so it won't match the parent's span_id, but we verify it exists
+      refute_nil context[:span_id]
+      refute_equal span_id, context[:span_id] # Should be different (child span)
+      refute_nil context[:level]
+    end
+  end
+
+  def test_error_handling_in_publish
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Close channel to force an error
+    @channel.close
+
+    error_raised = nil
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test message', routing_key: @queue.name)
+    rescue => e
+      error_raised = e
+    end
+
+    # Verify error was raised
+    refute_nil error_raised
+
+    # Should record both spans (parent and rabbitmq span with error)
+    spans = ::Instana.processor.queued_spans
+    assert spans.length >= 2
+
+    # Find the rabbitmq span
+    rabbitmq_span = spans.find { |s| s[:n] == :rabbitmq }
+    refute_nil rabbitmq_span, "RabbitMQ span should be present"
+
+    # Verify error is recorded in the span
+    assert_equal true, rabbitmq_span[:error], "Span should have error flag set"
+    assert_equal 1, rabbitmq_span[:ec], "Error count should be 1"
+
+    # Verify error message is logged in span data
+    assert rabbitmq_span[:data][:log], "Span should have log data"
+    log_entry = rabbitmq_span[:data][:log]
+    assert log_entry[:message], "Log should have a message"
+    assert_equal error_raised.message, log_entry[:message], "Log message should contain the actual error message"
+    assert_equal error_raised.class.to_s, log_entry[:parameters], "Log parameters should contain error class"
+  end
 end

From bee02a2ea91b73ef7940f73617533f7852293dc4 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 21 Nov 2025 14:23:28 +0530
Subject: [PATCH 12/21] lint(bunny): fix linting failures

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 test/instrumentation/bunny_test.rb | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index b582c8c2..3fc674bf 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -129,7 +129,7 @@ def test_subscribe_with_tracing
 
     # Subscribe and process one message
     message_received = false
-    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+    @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, _payload|
       message_received = true
     end
 
@@ -156,25 +156,25 @@ def test_consume_with_context_propagation
     clear_all!
 
     # Now consume the message
-    delivery_info, properties, payload = @queue.pop
+    _, properties, = @queue.pop
 
     # Simulate consumer processing with context extraction
-    if properties && properties.headers
-      context = {
-        trace_id: properties.headers['X-Instana-T'],
-        span_id: properties.headers['X-Instana-S'],
-        level: properties.headers['X-Instana-L']&.to_i
-      }
-
-      # Verify context was propagated
-      # The trace_id should match (same trace)
-      assert_equal trace_id, context[:trace_id]
-      # The span_id in the header is the rabbitmq span's ID (child of rabbitmq_producer)
-      # so it won't match the parent's span_id, but we verify it exists
-      refute_nil context[:span_id]
-      refute_equal span_id, context[:span_id] # Should be different (child span)
-      refute_nil context[:level]
-    end
+    return unless properties && properties.headers
+
+    context = {
+      trace_id: properties.headers['X-Instana-T'],
+      span_id: properties.headers['X-Instana-S'],
+      level: properties.headers['X-Instana-L']&.to_i
+    }
+
+    # Verify context was propagated
+    # The trace_id should match (same trace)
+    assert_equal trace_id, context[:trace_id]
+    # The span_id in the header is the rabbitmq span's ID (child of rabbitmq_producer)
+    # so it won't match the parent's span_id, but we verify it exists
+    refute_nil context[:span_id]
+    refute_equal span_id, context[:span_id] # Should be different (child span)
+    refute_nil context[:level]
   end
 
   def test_error_handling_in_publish

From c41810e36b3ba93bafe0a6acbcf70ebab4594185 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 21 Nov 2025 14:23:28 +0530
Subject: [PATCH 13/21] lint(bunny): fix linting failures

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index bb9b01ee..05cd4830 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -87,7 +87,7 @@ def pop(options = {})
 
       def subscribe(options = {}, &block)
         if block_given?
-          wrapped_block = lambda do |delivery_info, properties, payload|
+          wrapped_block = lambda do |delivery_info, properties, payload| # rubocop:disable Metrics/BlockLength
             if ::Instana.tracer.tracing? || extract_context_from_headers(properties)
               queue_name = name
               exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange

From 8abaf0de8d6242a74a890d9e91e6a5e7ac7cb2ee Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Fri, 21 Nov 2025 16:54:10 +0530
Subject: [PATCH 14/21] feat(bunny): add rabbitmq as entry and exit spans

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/trace/span_kind.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/instana/trace/span_kind.rb b/lib/instana/trace/span_kind.rb
index 6e42b6d1..61e3bec2 100644
--- a/lib/instana/trace/span_kind.rb
+++ b/lib/instana/trace/span_kind.rb
@@ -13,9 +13,9 @@ module SpanKind
                         :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
                         :"aws.lambda.invoke", :mongo, :sequel].freeze
-    ENTRY_SPANS = [:rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
+    ENTRY_SPANS = [:rack, :rabbitm, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
                    :'aws.lambda.entry'].freeze
-    EXIT_SPANS = [:activerecord, :excon, :'net-http', :'resque-client',
+    EXIT_SPANS = [:activerecord, :excon, :'net-http', :rabbitm, :'resque-client',
                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
                   :"aws.lambda.invoke", :mongo, :sequel].freeze
     HTTP_SPANS = [:rack, :excon, :'net-http'].freeze

From cdf81b63cc5b4fb959eee8eb5f4e0b31ccac78a3 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Mon, 24 Nov 2025 14:24:09 +0530
Subject: [PATCH 15/21] test(bunny): add more test cases

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 test/instrumentation/bunny_test.rb | 360 ++++++++++++++++++++++++++++-
 1 file changed, 359 insertions(+), 1 deletion(-)

diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index 3fc674bf..5064fd8d 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class BunnyTest < Minitest::Test
+class BunnyTest < Minitest::Test # rubocop:disable Metrics/ClassLength
   def setup
     skip unless defined?(::Bunny)
 
@@ -213,4 +213,362 @@ def test_error_handling_in_publish
     assert_equal error_raised.message, log_entry[:message], "Log message should contain the actual error message"
     assert_equal error_raised.class.to_s, log_entry[:parameters], "Log parameters should contain error class"
   end
+
+  def test_exception_handling_in_publish_without_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Verify that exceptions are properly raised even when not tracing
+    @channel.close
+
+    exception_raised = false
+    begin
+      @exchange.publish('test message', routing_key: @queue.name)
+    rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
+      exception_raised = true
+      assert e.message.length > 0, "Exception should have a message"
+    end
+
+    assert exception_raised, "Exception should be raised when publishing to closed channel"
+  end
+
+  def test_exception_handling_in_pop_without_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message first
+    @exchange.publish('test message', routing_key: @queue.name)
+
+    # Close channel before consuming
+    @channel.close
+
+    exception_raised = false
+    begin
+      @queue.pop
+    rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
+      exception_raised = true
+      assert e.message.length > 0, "Exception should have a message"
+    end
+
+    assert exception_raised, "Exception should be raised when consuming from closed channel"
+  end
+
+  def test_exception_in_subscribe_block
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Verify exceptions in subscribe blocks are handled properly
+    @exchange.publish('test message', routing_key: @queue.name)
+
+    exception_caught = false
+    error_message = nil
+
+    @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, _payload|
+      begin
+        raise StandardError, "Test exception in consumer"
+      rescue => e
+        exception_caught = true
+        error_message = e.message
+      end
+    end
+
+    sleep 0.2
+
+    assert exception_caught, "Exception should be caught in subscribe block"
+    assert_equal "Test exception in consumer", error_message
+  end
+
+  def test_pop_with_tracing
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message first
+    @exchange.publish('test message for pop', routing_key: @queue.name)
+
+    # Pop the message with active tracing
+    ::Instana.tracer.in_span(:rabbitmq_consumer_test) do
+      delivery_info, properties, payload = @queue.pop
+
+      refute_nil delivery_info
+      assert_equal 'test message for pop', payload
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+    consumer_span = spans[1]
+
+    # Verify parent-child relationship
+    assert_equal consumer_span[:s], rabbitmq_span[:p]
+
+    # Verify RabbitMQ consume span details
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+    assert_equal @queue.name, rabbitmq_span[:data][:rabbitmq][:queue]
+    assert_equal 'default', rabbitmq_span[:data][:rabbitmq][:exchange]
+    assert rabbitmq_span[:data][:rabbitmq][:address]
+  end
+
+  def test_pop_with_trace_context_extraction
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message with trace context
+    original_trace_id = nil
+    original_span_id = nil
+
+    @queue.purge
+    ::Instana.tracer.in_span(:rabbitmq_producer) do |span|
+      original_trace_id = span.context.trace_id
+      original_span_id = span.context.span_id
+      @exchange.publish('test message with context', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Pop the message - should extract and continue the trace
+    delivery_info, properties, payload = @queue.pop
+
+    refute_nil delivery_info
+    assert_equal 'test message with context', payload
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    rabbitmq_span = spans[0]
+
+    # Verify the span continues the original trace
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+    assert_equal original_trace_id, rabbitmq_span[:t]
+  end
+
+  def test_pop_empty_queue
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Purge the queue to ensure it's empty
+    @queue.purge
+
+    # Pop from empty queue - returns nil for all values
+    delivery_info, properties, payload = @queue.pop
+
+    assert_nil delivery_info
+    assert_nil properties
+    assert_nil payload
+
+    # No spans should be created for empty pop (delivery_info is nil, returns early)
+    spans = ::Instana.processor.queued_spans
+    assert_equal 0, spans.length
+  end
+
+  def test_subscribe_with_trace_context_extraction
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message with trace context
+    original_trace_id = nil
+    ::Instana.tracer.in_span(:rabbitmq_producer) do |span|
+      original_trace_id = span.context.trace_id
+      @exchange.publish('test subscribe context', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Subscribe and process the message
+    message_received = false
+    received_payload = nil
+
+    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+      message_received = true
+      received_payload = payload
+    end
+
+    # Give it time to process
+    sleep 0.2
+
+    assert message_received
+    assert_equal 'test subscribe context', received_payload
+
+    spans = ::Instana.processor.queued_spans
+    assert spans.length >= 1
+
+    rabbitmq_span = spans.find { |s| s[:n] == :rabbitmq }
+    refute_nil rabbitmq_span
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+    assert_equal original_trace_id, rabbitmq_span[:t]
+  end
+
+  def test_subscribe_without_block
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message
+    @exchange.publish('test no block', routing_key: @queue.name)
+
+    # Subscribe without a block should return a consumer
+    consumer = @queue.subscribe(manual_ack: false, block: false)
+
+    refute_nil consumer
+    assert consumer.is_a?(Bunny::Consumer)
+
+    # Clean up
+    consumer.cancel if consumer
+  end
+
+  def test_error_handling_in_pop
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message
+    @exchange.publish('test error pop', routing_key: @queue.name)
+
+    # Close the channel to force an error during pop
+    @channel.close
+
+    error_raised = false
+    begin
+      @queue.pop
+    rescue => e
+      error_raised = true
+    end
+
+    assert error_raised, "Exception should be raised when channel is closed"
+  end
+
+  def test_error_handling_in_subscribe
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message
+    @exchange.publish('test error subscribe', routing_key: @queue.name)
+
+    # Subscribe with a block that raises an error
+    error_in_block = false
+
+    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+      error_in_block = true
+      raise StandardError, "Intentional error in subscribe block"
+    end
+
+    # Give it time to process and error
+    sleep 0.2
+
+    assert error_in_block, "Block should have been called and raised error"
+  end
+
+  def test_publish_with_empty_exchange_name
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Default exchange has empty name
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test empty exchange', routing_key: @queue.name)
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+    assert_equal 'default', rabbitmq_span[:data][:rabbitmq][:exchange]
+  end
+
+  def test_publish_with_nil_routing_key
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test nil routing key')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+    assert_equal '', rabbitmq_span[:data][:rabbitmq][:key]
+  end
+
+  def test_multiple_messages_consume
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish multiple messages
+    3.times do |i|
+      @exchange.publish("consume message #{i}", routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Pop all messages with tracing
+    messages = []
+    ::Instana.tracer.in_span(:rabbitmq_consumer_batch) do
+      3.times do
+        delivery_info, properties, payload = @queue.pop
+        messages << payload if payload
+      end
+    end
+
+    assert_equal 3, messages.length
+
+    spans = ::Instana.processor.queued_spans
+    # Should have 1 parent span + 3 rabbitmq consume spans
+    assert_equal 4, spans.length
+
+    rabbitmq_spans = spans.select { |s| s[:n] == :rabbitmq }
+    assert_equal 3, rabbitmq_spans.length
+
+    rabbitmq_spans.each do |span|
+      assert_equal 'consume', span[:data][:rabbitmq][:sort]
+    end
+  end
+
+  def test_publish_with_additional_headers
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test with headers',
+                       routing_key: @queue.name,
+                       headers: { 'custom-header' => 'custom-value' })
+    end
+
+    # Retrieve the message
+    delivery_info, properties, payload = @queue.pop
+
+    refute_nil properties
+    refute_nil properties.headers
+
+    # Verify both custom and trace headers are present
+    assert_equal 'custom-value', properties.headers['custom-header']
+    assert properties.headers['X-Instana-T']
+    assert properties.headers['X-Instana-S']
+    assert properties.headers['X-Instana-L']
+  end
+
+  def test_consume_with_custom_exchange
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    custom_exchange = @channel.topic('instana.test.consume.exchange', auto_delete: true)
+    @queue.bind(custom_exchange, routing_key: 'consume.key')
+
+    # Publish to custom exchange
+    custom_exchange.publish('test consume custom', routing_key: 'consume.key')
+
+    # Pop with tracing
+    ::Instana.tracer.in_span(:rabbitmq_consumer_test) do
+      delivery_info, properties, payload = @queue.pop
+      assert_equal 'test consume custom', payload
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rabbitmq_span = spans[0]
+    assert_equal 'instana.test.consume.exchange', rabbitmq_span[:data][:rabbitmq][:exchange]
+    assert_equal 'consume.key', rabbitmq_span[:data][:rabbitmq][:key]
+
+    custom_exchange.delete
+  end
 end

From bb805058c42279e2d3679fd4960998f54736afce Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Tue, 25 Nov 2025 13:08:51 +0530
Subject: [PATCH 16/21] ci(bunny):add apprisals and gemfiles

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 Appraisals                 |  8 ++++++++
 gemfiles/bunny_223.gemfile | 16 ++++++++++++++++
 gemfiles/bunny_224.gemfile | 16 ++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 gemfiles/bunny_223.gemfile
 create mode 100644 gemfiles/bunny_224.gemfile

diff --git a/Appraisals b/Appraisals
index 9390133e..ab9041f9 100644
--- a/Appraisals
+++ b/Appraisals
@@ -122,3 +122,11 @@ end
 appraise 'mongo-216' do
   gem 'mongo', '>= 2.16', '< 3'
 end
+
+appraise 'bunny-223' do
+  gem 'bunny', '~> 2.23.0'
+end
+
+appraise 'bunny-224' do
+  gem 'bunny', '>= 2.24', '< 3.0'
+end
diff --git a/gemfiles/bunny_223.gemfile b/gemfiles/bunny_223.gemfile
new file mode 100644
index 00000000..6cea55a3
--- /dev/null
+++ b/gemfiles/bunny_223.gemfile
@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2025
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack"
+gem "rackup"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "bunny", "~> 2.23.0"
+
+gemspec path: "../"
diff --git a/gemfiles/bunny_224.gemfile b/gemfiles/bunny_224.gemfile
new file mode 100644
index 00000000..8dc7c7ae
--- /dev/null
+++ b/gemfiles/bunny_224.gemfile
@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2025
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack"
+gem "rackup"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "bunny", '>= 2.24', '< 3.0'
+
+gemspec path: "../"

From 4f252ead131ee95b10b800b5413ed215442dca65 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Thu, 27 Nov 2025 12:33:30 +0530
Subject: [PATCH 17/21] ci(bunny): add rabbitmq tests to ci

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82cbd883..5400178e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,6 +16,8 @@ library_gemfile: &library_gemfile
     - "./gemfiles/graphql_20.gemfile"
     - "./gemfiles/grpc_10.gemfile"
     - "./gemfiles/net_http_01.gemfile"
+    - "./gemfiles/bunny_223.gemfile"
+    - "./gemfiles/bunny_224.gemfile"
     - "./gemfiles/rack_20.gemfile"
     - "./gemfiles/rack_30.gemfile"
     - "./gemfiles/redis_40.gemfile"
@@ -56,6 +58,7 @@ executors:
       - image: quay.io/minio/minio
         command: ["server", "/data"]
       - image: s12v/sns
+      - image: public.ecr.aws/docker/library/rabbitmq:latest
       - image: public.ecr.aws/sprig/elasticmq-native
       - image: public.ecr.aws/docker/library/mongo:5-focal
   mysql2:

From da7f8c8381f613c3b05a0e6b354e3da76e307a92 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Thu, 27 Nov 2025 22:40:21 +0530
Subject: [PATCH 18/21] test(bunny): fix failing tests

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 test/activator_test.rb             | 2 +-
 test/instrumentation/bunny_test.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/activator_test.rb b/test/activator_test.rb
index 4e9257df..7f068df9 100644
--- a/test/activator_test.rb
+++ b/test/activator_test.rb
@@ -43,7 +43,7 @@ def test_unlimited_activated_set
     ENV.delete('INSTANA_ACTIVATE_SET')
     subject = activated_set
     assert_instance_of Set, subject
-    assert_equal 32, subject.length
+    assert_equal 33, subject.length
   ensure
     ENV.delete('INSTANA_ACTIVATE_SET')
   end
diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index 5064fd8d..9c9e8587 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -15,6 +15,7 @@ def setup
     @channel = @connection.create_channel
     @exchange = @channel.default_exchange
     @queue = @channel.queue('instana.test.queue', auto_delete: true)
+    @queue.purge
   end
 
   def teardown

From 4e1612d50df2c53e2e8926fd6a662f7b95e53288 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Mon, 1 Dec 2025 10:21:58 +0530
Subject: [PATCH 19/21] test(bunny): fix lints and remove dependency on bundler

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 instana.gemspec                    |  2 +-
 test/instrumentation/bunny_test.rb | 34 ++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/instana.gemspec b/instana.gemspec
index e29578da..08715f53 100644
--- a/instana.gemspec
+++ b/instana.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
   spec.platform      = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::RUBY
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  # spec.add_development_dependency "bundler", "=> 2.0"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.20"
   spec.add_development_dependency "appraisal"
diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index 9c9e8587..ac320d6c 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -227,7 +227,7 @@ def test_exception_handling_in_publish_without_tracing
       @exchange.publish('test message', routing_key: @queue.name)
     rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
       exception_raised = true
-      assert e.message.length > 0, "Exception should have a message"
+      assert e.message.length.positive?, "Exception should have a message"
     end
 
     assert exception_raised, "Exception should be raised when publishing to closed channel"
@@ -248,7 +248,7 @@ def test_exception_handling_in_pop_without_tracing
       @queue.pop
     rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
       exception_raised = true
-      assert e.message.length > 0, "Exception should have a message"
+      assert e.message.length.positive?, "Exception should have a message"
     end
 
     assert exception_raised, "Exception should be raised when consuming from closed channel"
@@ -265,12 +265,10 @@ def test_exception_in_subscribe_block
     error_message = nil
 
     @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, _payload|
-      begin
-        raise StandardError, "Test exception in consumer"
-      rescue => e
-        exception_caught = true
-        error_message = e.message
-      end
+      raise StandardError, "Test exception in consumer"
+    rescue => e
+      exception_caught = true
+      error_message = e.message
     end
 
     sleep 0.2
@@ -288,7 +286,7 @@ def test_pop_with_tracing
 
     # Pop the message with active tracing
     ::Instana.tracer.in_span(:rabbitmq_consumer_test) do
-      delivery_info, properties, payload = @queue.pop
+      delivery_info, _, payload = @queue.pop
 
       refute_nil delivery_info
       assert_equal 'test message for pop', payload
@@ -329,7 +327,7 @@ def test_pop_with_trace_context_extraction
     clear_all!
 
     # Pop the message - should extract and continue the trace
-    delivery_info, properties, payload = @queue.pop
+    delivery_info, _, payload = @queue.pop
 
     refute_nil delivery_info
     assert_equal 'test message with context', payload
@@ -381,7 +379,7 @@ def test_subscribe_with_trace_context_extraction
     message_received = false
     received_payload = nil
 
-    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+    @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, payload|
       message_received = true
       received_payload = payload
     end
@@ -431,7 +429,7 @@ def test_error_handling_in_pop
     error_raised = false
     begin
       @queue.pop
-    rescue => e
+    rescue
       error_raised = true
     end
 
@@ -448,7 +446,7 @@ def test_error_handling_in_subscribe
     # Subscribe with a block that raises an error
     error_in_block = false
 
-    @queue.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+    @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, _payload|
       error_in_block = true
       raise StandardError, "Intentional error in subscribe block"
     end
@@ -505,7 +503,7 @@ def test_multiple_messages_consume
     messages = []
     ::Instana.tracer.in_span(:rabbitmq_consumer_batch) do
       3.times do
-        delivery_info, properties, payload = @queue.pop
+        _, _, payload = @queue.pop
         messages << payload if payload
       end
     end
@@ -530,12 +528,12 @@ def test_publish_with_additional_headers
 
     ::Instana.tracer.in_span(:rabbitmq_test) do
       @exchange.publish('test with headers',
-                       routing_key: @queue.name,
-                       headers: { 'custom-header' => 'custom-value' })
+                        routing_key: @queue.name,
+                        headers: { 'custom-header' => 'custom-value' })
     end
 
     # Retrieve the message
-    delivery_info, properties, payload = @queue.pop
+    _, properties, = @queue.pop
 
     refute_nil properties
     refute_nil properties.headers
@@ -559,7 +557,7 @@ def test_consume_with_custom_exchange
 
     # Pop with tracing
     ::Instana.tracer.in_span(:rabbitmq_consumer_test) do
-      delivery_info, properties, payload = @queue.pop
+      _, _, payload = @queue.pop
       assert_equal 'test consume custom', payload
     end
 

From e84fe1b8deb2237e9d7b4a347f622cc68283aa53 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Mon, 1 Dec 2025 10:24:35 +0530
Subject: [PATCH 20/21] feat(bunny): fix typo mistake rabbitmq

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/trace/span_kind.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/instana/trace/span_kind.rb b/lib/instana/trace/span_kind.rb
index 61e3bec2..d6bc29d3 100644
--- a/lib/instana/trace/span_kind.rb
+++ b/lib/instana/trace/span_kind.rb
@@ -13,9 +13,9 @@ module SpanKind
                         :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
                         :"aws.lambda.invoke", :mongo, :sequel].freeze
-    ENTRY_SPANS = [:rack, :rabbitm, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
+    ENTRY_SPANS = [:rack, :rabbitmq, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
                    :'aws.lambda.entry'].freeze
-    EXIT_SPANS = [:activerecord, :excon, :'net-http', :rabbitm, :'resque-client',
+    EXIT_SPANS = [:activerecord, :excon, :'net-http', :rabbitmq, :'resque-client',
                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
                   :"aws.lambda.invoke", :mongo, :sequel].freeze
     HTTP_SPANS = [:rack, :excon, :'net-http'].freeze

From 132f62dd1c7b8cd6177fef4cd1907dfa9aabdea7 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <Arjun.Rajappa@ibm.com>
Date: Tue, 2 Dec 2025 18:07:10 +0530
Subject: [PATCH 21/21] feat(bunny): refactor to remove code duplication

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
---
 lib/instana/instrumentation/bunny.rb | 130 +++++++---------
 test/instrumentation/bunny_test.rb   | 222 +++++++++++++++++++++++++++
 2 files changed, 274 insertions(+), 78 deletions(-)

diff --git a/lib/instana/instrumentation/bunny.rb b/lib/instana/instrumentation/bunny.rb
index 05cd4830..dc7cdeed 100644
--- a/lib/instana/instrumentation/bunny.rb
+++ b/lib/instana/instrumentation/bunny.rb
@@ -29,7 +29,7 @@ def publish(payload, options = {})
         else
           super(payload, options)
         end
-      rescue
+      rescue => e
         ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         raise
       end
@@ -41,89 +41,18 @@ def pop(options = {})
 
         return [delivery_info, properties, payload] unless delivery_info
 
-        if ::Instana.tracer.tracing? || extract_context_from_headers(properties)
-          queue_name = name
-          exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
-
-          kvs = {
-            rabbitmq: {
-              sort: 'consume',
-              address: channel.connection.host,
-              queue: queue_name,
-              exchange: exchange_name,
-              key: delivery_info.routing_key
-            }
-          }
-
-          # Extract trace context from message headers
-          context = extract_context_from_headers(properties)
-
-          if context[:trace_id]
-            instana_context = ::Instana::SpanContext.new(
-              trace_id: context[:trace_id],
-              span_id: context[:span_id],
-              level: context[:level]
-            )
-            span = OpenTelemetry::Trace.non_recording_span(instana_context)
-
-            Trace.with_span(span) do
-              ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
-                # Return the message for processing
-                [delivery_info, properties, payload]
-              end
-            end
-          else
-            ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
-              [delivery_info, properties, payload]
-            end
-          end
-        else
+        trace_rabbitmq_consume(delivery_info, properties) do
           [delivery_info, properties, payload]
         end
-      rescue
-        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+      rescue => e
+        log_error(e)
         raise
       end
 
       def subscribe(options = {}, &block)
         if block_given?
-          wrapped_block = lambda do |delivery_info, properties, payload| # rubocop:disable Metrics/BlockLength
-            if ::Instana.tracer.tracing? || extract_context_from_headers(properties)
-              queue_name = name
-              exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
-
-              kvs = {
-                rabbitmq: {
-                  sort: 'consume',
-                  address: channel.connection.host,
-                  queue: queue_name,
-                  exchange: exchange_name,
-                  key: delivery_info.routing_key
-                }
-              }
-
-              # Extract trace context from message headers
-              context = extract_context_from_headers(properties)
-
-              if context[:trace_id]
-                instana_context = ::Instana::SpanContext.new(
-                  trace_id: context[:trace_id],
-                  span_id: context[:span_id],
-                  level: context[:level]
-                )
-                span = OpenTelemetry::Trace.non_recording_span(instana_context)
-
-                Trace.with_span(span) do
-                  ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
-                    block.call(delivery_info, properties, payload)
-                  end
-                end
-              else
-                ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do
-                  block.call(delivery_info, properties, payload)
-                end
-              end
-            else
+          wrapped_block = lambda do |delivery_info, properties, payload|
+            trace_rabbitmq_consume(delivery_info, properties) do
               block.call(delivery_info, properties, payload)
             end
           end
@@ -133,12 +62,53 @@ def subscribe(options = {}, &block)
           super(options, &block)
         end
       rescue => e
-        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        log_error(e)
         raise
       end
 
       private
 
+      def trace_rabbitmq_consume(delivery_info, properties, &block)
+        return yield unless ::Instana.tracer.tracing? || extract_context_from_headers(properties)
+
+        kvs = build_consume_attributes(delivery_info)
+        context = extract_context_from_headers(properties)
+
+        if context[:trace_id]
+          trace_with_context(context, kvs, &block)
+        else
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs, &block)
+        end
+      end
+
+      def build_consume_attributes(delivery_info)
+        queue_name = name
+        exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
+
+        {
+          rabbitmq: {
+            sort: 'consume',
+            address: channel.connection.host,
+            queue: queue_name,
+            exchange: exchange_name,
+            key: delivery_info.routing_key
+          }
+        }
+      end
+
+      def trace_with_context(context, kvs, &block)
+        instana_context = ::Instana::SpanContext.new(
+          trace_id: context[:trace_id],
+          span_id: context[:span_id],
+          level: context[:level]
+        )
+        span = OpenTelemetry::Trace.non_recording_span(instana_context)
+
+        Trace.with_span(span) do
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs, &block)
+        end
+      end
+
       def extract_context_from_headers(properties)
         return {} unless properties && properties.headers
 
@@ -149,6 +119,10 @@ def extract_context_from_headers(properties)
           level: headers['X-Instana-L']&.to_i
         }.reject { |_, v| v.nil? }
       end
+
+      def log_error(error)
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{error.message}" }
+      end
     end
   end
 end
diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index ac320d6c..98500c8e 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -570,4 +570,226 @@ def test_consume_with_custom_exchange
 
     custom_exchange.delete
   end
+
+  def test_publish_error_with_span_error_recording
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Create a scenario where publish will fail
+    @channel.close
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test message', routing_key: @queue.name)
+    rescue
+      # Expected to raise
+    end
+
+    spans = ::Instana.processor.queued_spans
+    rabbitmq_span = spans.find { |s| s[:n] == :rabbitmq }
+
+    # Verify error was properly recorded
+    refute_nil rabbitmq_span
+    assert_equal true, rabbitmq_span[:error]
+    assert_equal 1, rabbitmq_span[:ec]
+  end
+
+  def test_subscribe_with_manual_ack
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message with trace context
+    ::Instana.tracer.in_span(:rabbitmq_producer) do
+      @exchange.publish('test manual ack', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Subscribe with manual acknowledgment
+    message_received = false
+    @queue.subscribe(manual_ack: true, block: false) do |delivery_info, _properties, payload|
+      message_received = true
+      assert_equal 'test manual ack', payload
+      @channel.ack(delivery_info.delivery_tag)
+    end
+
+    sleep 0.2
+
+    assert message_received
+
+    spans = ::Instana.processor.queued_spans
+    rabbitmq_span = spans.find { |s| s[:n] == :rabbitmq }
+    refute_nil rabbitmq_span
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+  end
+
+  def test_pop_extracts_all_context_fields
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish with full trace context
+    ::Instana.tracer.in_span(:rabbitmq_producer) do |_span|
+      @exchange.publish('test full context', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Pop and verify all context fields are extracted
+    _, properties, = @queue.pop
+
+    refute_nil properties.headers['X-Instana-T']
+    refute_nil properties.headers['X-Instana-S']
+    refute_nil properties.headers['X-Instana-L']
+
+    # Verify the consume span was created with extracted context
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    rabbitmq_span = spans[0]
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+  end
+
+  def test_consume_with_empty_routing_key
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish with empty routing key
+    @exchange.publish('test empty key', routing_key: '')
+
+    ::Instana.tracer.in_span(:rabbitmq_consumer_test) do
+      delivery_info, = @queue.pop
+
+      # Message won't be delivered to queue with empty routing key to default exchange
+      # but we test the instrumentation handles it
+      if delivery_info
+        assert_equal '', delivery_info.routing_key
+      end
+    end
+  end
+
+  def test_multiple_exchanges_and_queues
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Create multiple exchanges and queues
+    exchange1 = @channel.topic('instana.test.exchange1', auto_delete: true)
+    exchange2 = @channel.topic('instana.test.exchange2', auto_delete: true)
+    queue1 = @channel.queue('instana.test.queue1', auto_delete: true)
+    queue2 = @channel.queue('instana.test.queue2', auto_delete: true)
+
+    queue1.bind(exchange1, routing_key: 'key1')
+    queue2.bind(exchange2, routing_key: 'key2')
+
+    ::Instana.tracer.in_span(:rabbitmq_multi_test) do
+      exchange1.publish('message1', routing_key: 'key1')
+      exchange2.publish('message2', routing_key: 'key2')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    # 1 parent + 2 publish spans
+    assert_equal 3, spans.length
+
+    rabbitmq_spans = spans.select { |s| s[:n] == :rabbitmq }
+    assert_equal 2, rabbitmq_spans.length
+
+    # Verify each span has correct exchange
+    exchanges = rabbitmq_spans.map { |s| s[:data][:rabbitmq][:exchange] }.sort
+    assert_equal ['instana.test.exchange1', 'instana.test.exchange2'], exchanges
+
+    # Cleanup
+    queue1.delete
+    queue2.delete
+    exchange1.delete
+    exchange2.delete
+  end
+
+  def test_pop_without_active_trace_but_with_headers
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish with trace context
+    ::Instana.tracer.in_span(:rabbitmq_producer) do
+      @exchange.publish('test no active trace', routing_key: @queue.name)
+    end
+
+    clear_all!
+
+    # Pop without active trace - should still create span from headers
+    delivery_info, _, payload = @queue.pop
+
+    refute_nil delivery_info
+    assert_equal 'test no active trace', payload
+
+    # Should have created a consume span from extracted headers
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    rabbitmq_span = spans[0]
+    assert_equal :rabbitmq, rabbitmq_span[:n]
+    assert_equal 'consume', rabbitmq_span[:data][:rabbitmq][:sort]
+  end
+
+  def test_address_field_in_spans
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    ::Instana.tracer.in_span(:rabbitmq_test) do
+      @exchange.publish('test address', routing_key: @queue.name)
+    end
+
+    spans = ::Instana.processor.queued_spans
+    rabbitmq_span = spans.find { |s| s[:n] == :rabbitmq }
+
+    refute_nil rabbitmq_span
+    refute_nil rabbitmq_span[:data][:rabbitmq][:address]
+    # Address should be the RabbitMQ host
+    assert rabbitmq_span[:data][:rabbitmq][:address].is_a?(String)
+  end
+
+  def test_subscribe_error_handling_with_closed_channel
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message first
+    @exchange.publish('test subscribe error', routing_key: @queue.name)
+
+    # Close the channel to force an error during subscribe
+    @channel.close
+
+    error_raised = false
+    begin
+      # This should trigger the rescue block in subscribe method (lines 65-68)
+      @queue.subscribe(manual_ack: false, block: false) do |_delivery_info, _properties, _payload|
+        # Block should not be reached
+      end
+    rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
+      error_raised = true
+      # Verify the error has a message (log_error should be called)
+      assert e.message.length.positive?
+    end
+
+    assert error_raised, "Exception should be raised and logged when subscribing to closed channel"
+  end
+
+  def test_pop_error_handling_with_logging
+    skip unless defined?(::Bunny)
+    clear_all!
+
+    # Publish a message
+    @exchange.publish('test pop error', routing_key: @queue.name)
+
+    # Close channel to trigger error in pop (lines 48-51)
+    @channel.close
+
+    error_raised = false
+    begin
+      @queue.pop
+    rescue Bunny::ChannelAlreadyClosed, Bunny::ConnectionClosedError => e
+      error_raised = true
+      # The log_error method (line 124-126) should be called internally
+      assert e.message.length.positive?
+    end
+
+    assert error_raised, "Exception should be raised and logged in pop"
+  end
 end