From 24b9bc6d7c81f0618243ccb2956deb039a80d736 Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <arjun.rajappa@ibm.com>
Date: Wed, 6 May 2026 11:48:15 +0530
Subject: [PATCH 1/2] chore: add support to rabbitmq 4.3 release

Signed-off-by: Arjun Rajappa <arjun.rajappa@ibm.com>
---
 .circleci/config.yml               |  6 +++---
 gemfiles/bunny_300.gemfile         | 16 ++++++++++++++++
 test/instrumentation/bunny_test.rb |  6 +++---
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 gemfiles/bunny_300.gemfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27453c73..910732c3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,7 @@ library_gemfile: &library_gemfile
     - "./gemfiles/mongo_216.gemfile"
     - "./gemfiles/mongo_219.gemfile"
 executors:
-  ruby_33_lint:
+  ruby_34_lint:
     docker:
       - image: public.ecr.aws/docker/library/ruby:3.4
   base:
@@ -58,7 +58,7 @@ executors:
       - image: quay.io/minio/minio
         command: ["server", "/data"]
       - image: s12v/sns
-      - image: public.ecr.aws/docker/library/rabbitmq:4.2
+      - 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:
@@ -233,7 +233,7 @@ jobs:
       - setup
       - run_tests
   lint:
-    executor: ruby_33_lint
+    executor: ruby_34_lint
     environment:
       BUNDLE_GEMFILE: "./gemfiles/rubocop_162.gemfile"
     steps:
diff --git a/gemfiles/bunny_300.gemfile b/gemfiles/bunny_300.gemfile
new file mode 100644
index 00000000..7446a4db
--- /dev/null
+++ b/gemfiles/bunny_300.gemfile
@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2026
+
+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", '>= 3.0'
+
+gemspec path: "../"
diff --git a/test/instrumentation/bunny_test.rb b/test/instrumentation/bunny_test.rb
index ef60abfe..9cb7bc4a 100644
--- a/test/instrumentation/bunny_test.rb
+++ b/test/instrumentation/bunny_test.rb
@@ -16,7 +16,7 @@ def setup
     end
     @channel = @connection.create_channel
     @exchange = @channel.default_exchange
-    @queue = @channel.queue('instana.test.queue', auto_delete: true)
+    @queue = @channel.queue('instana.test.queue', auto_delete: true, exclusive: true)
     @queue.purge
   end
 
@@ -676,8 +676,8 @@ def test_multiple_exchanges_and_queues
     # 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 = @channel.queue('instana.test.queue1', auto_delete: true, exclusive: true)
+    queue2 = @channel.queue('instana.test.queue2', auto_delete: true, exclusive: true)
 
     queue1.bind(exchange1, routing_key: 'key1')
     queue2.bind(exchange2, routing_key: 'key2')

From 0f3ee9b016baef5df17a2e6cffa45dd07f7dc38c Mon Sep 17 00:00:00 2001
From: Arjun Rajappa <arjun.rajappa@ibm.com>
Date: Wed, 6 May 2026 18:49:03 +0530
Subject: [PATCH 2/2] chore: start testing bunny gem > 3.0

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 910732c3..f607a245 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,7 @@ library_gemfile: &library_gemfile
     - "./gemfiles/net_http_01.gemfile"
     - "./gemfiles/bunny_223.gemfile"
     - "./gemfiles/bunny_224.gemfile"
+    - "./gemfiles/bunny_300.gemfile"
     - "./gemfiles/rack_20.gemfile"
     - "./gemfiles/rack_30.gemfile"
     - "./gemfiles/redis_40.gemfile"