Rework

.github/workflows/tests.yml

@@ -13,12 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     services:
       rabbitmq:
-        image: rabbitmq
+        image: rabbitmq:management
         env:
           RABBITMQ_DEFAULT_USER: user
           RABBITMQ_DEFAULT_PASS: password
         ports:
           - 5672:5672
+          - 15672:15672
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -27,7 +28,7 @@ jobs:
           check-latest: true
       - name: Tests
         run: |
-          go test -p 1 -mod=readonly -race -v -tags integration -coverprofile=coverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
+          go test -p 1 -mod=readonly -race -v --tags=integration -coverprofile=coverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
           go tool cover -func=coverage.txt
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5

.gitignore

@@ -1,3 +1,4 @@
+.envrc
 .idea
 *.iml
 .testCoverage.txt

.pre-commit-config.yaml

@@ -24,3 +24,19 @@ repos:
       - id: go-test-mod
       - id: go-fumpt
       - id: golangci-lint-mod
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.5.4
+    hooks:
+    - id: insert-license
+      files: \.go$
+      args:
+        - --license-filepath
+        - LICENSE
+        - --comment-style
+        - //
+        - --use-current-year
+  - repo: https://github.com/sparetimecoders/pre-commit-check-signed
+    rev: v0.0.1
+    hooks:
+    - id: check-signed-commit
+      name: check-signed-commit

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 sparetimecoders
+Copyright (c) 2025 sparetimecoders
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -40,7 +40,7 @@ rabbitmq-server:
 		--env RABBITMQ_DEFAULT_USER=user \
 		--env RABBITMQ_DEFAULT_PASS=password \
 		--env RABBITMQ_DEFAULT_VHOST=test \
-		--pull always rabbitmq:3-management
+		--pull always rabbitmq:4-management
 
 .PHONY: stop-rabbitmq-server
 stop-rabbitmq-server:

channel.go

@@ -0,0 +1,56 @@
+// MIT License
+//
+// Copyright (c) 2025 sparetimecoders
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package goamqp
+
+import (
+	"context"
+	"io"
+
+	amqp "github.com/rabbitmq/amqp091-go"
+)
+
+// AmqpChannel wraps the amqp.Channel to allow for mocking
+type AmqpChannel interface {
+	io.Closer
+	QueueBind(queue, key, exchange string, noWait bool, args amqp.Table) error
+	Consume(queue, consumer string, autoAck, exclusive, noLocal, noWait bool, args amqp.Table) (<-chan amqp.Delivery, error)
+	ExchangeDeclare(name, kind string, durable, autoDelete, internal, noWait bool, args amqp.Table) error
+	PublishWithContext(ctx context.Context, exchange, key string, mandatory, immediate bool, msg amqp.Publishing) error
+	QueueDeclare(name string, durable, autoDelete, exclusive, noWait bool, args amqp.Table) (amqp.Queue, error)
+	NotifyPublish(confirm chan amqp.Confirmation) chan amqp.Confirmation
+	NotifyClose(c chan *amqp.Error) chan *amqp.Error
+	Confirm(noWait bool) error
+	// Qos controls how many messages or how many bytes the server will try to keep on
+	// the network for queueConsumers before receiving delivery acks.  The intent of Qos is
+	// to make sure the network buffers stay full between the server and client.
+	// If your consumer work time is reasonably consistent and not much greater
+	// than two times your network round trip time, you will see significant
+	// throughput improvements starting with a prefetch count of 2 or slightly
+	// greater as described by benchmarks on RabbitMQ.
+	//
+	// http://www.rabbitmq.com/blog/2012/04/25/rabbitmq-performance-measurements-part-2/
+	// The default prefetchCount is 20 (and global true) and can be overridden with WithPrefetchLimit
+	Qos(prefetchCount, prefetchSize int, global bool) error
+}
+
+var _ AmqpChannel = &amqp.Channel{}