Rename Consumer Feature to Consumer SettleStrategy (#82)

* Renames the consumer “feature” configuration to a settle-strategy  like the same naming used by other AMQP 1.0 clients.

Changes:

* Replace ConsumerFeature/ConsumerOptions.Feature with ConsumerSettleStrategy/ConsumerOptions.SettleStrategy and rename DefaultSettle to ExplicitSettle.
* Replace RequesterOptions.DirectReplyTo bool with RequesterOptions.SettleStrategy ConsumerSettleStrategy.
Update tests, examples, AGENTS guidance, and changelog to reflect the new API names.

---------

Signed-off-by: Gabriele Santomaggio <G.santomaggio@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: Gsantomaggio

AGENTS.md

@@ -66,7 +66,10 @@ docs/examples/             # Example code demonstrating usage
   - `initialCredits()` - Initial credits (defaults to 256)
   - `linkFilters()` - Link filters for stream consumers
   - `id()` - Consumer ID
-  - `isDirectReplyToEnable()` - Enable direct reply-to for RPC
+  - `validate()` - Validates the configured consumer options
+  - `isDirectReplyToEnable()` - Indicates whether Direct Reply-To is enabled for this consumer
+  - `preSettled()` - Indicates whether the consumer operates in pre-settled mode
+  - Settle strategy is configured via `ConsumerOptions.SettleStrategy` or `RequesterOptions.SettleStrategy` using the `ConsumerSettleStrategy` enum: `ExplicitSettle`, `DirectReplyTo`, `PreSettled`
 
 ### Queue Specifications
 

CHANGELOG.md

@@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
 ## 0.5.0 - 2026-01-22
 - [Release 0.5.0](https://github.com/rabbitmq/rabbitmq-amqp-go-client/releases/tag/v0.5.0)
 
+### Breaking changes
+- **RequesterOptions**: Replaced `DirectReplyTo bool` with `SettleStrategy ConsumerSettleStrategy`. Use `SettleStrategy: rabbitmqamqp.DirectReplyTo` for direct-reply-to, or leave zero value for default (dedicated reply queue). Aligns consumer/requester configuration with other AMQP 1.0 clients.
+- **ConsumerOptions / amqp_types**: Renamed `ConsumerFeature` to `ConsumerSettleStrategy`, `DefaultSettle` to `ExplicitSettle`, and `Feature` field to `SettleStrategy`. Aligns with the unified settle strategy API used in other AMQP 1.0 clients.
+
 ### Added
 - Add WebSocket transport support for AMQP 1.0 connections by @vedanthnyk25 in [#78](https://github.com/rabbitmq/rabbitmq-amqp-go-client/pull/78)
 - Add Sec-WebSocket-Protocol to the HTTP header by @Gsantomaggio in [#79](https://github.com/rabbitmq/rabbitmq-amqp-go-client/pull/79)

docs/examples/pre_settled/pre_settled.go

@@ -55,7 +55,7 @@ func main() {
 	// create consumer with pre-settled mode enabled
 
 	consumer, err := amqpConnection.NewConsumer(context.TODO(), "pre-settled-queue", &rmq.ConsumerOptions{
-		Feature: rmq.PreSettled,
+		SettleStrategy: rmq.PreSettled,
 	})
 	if err != nil {
 		rmq.Error("Error creating consumer", err)

docs/examples/rpc_echo_server/main.go

@@ -1,3 +1,13 @@
+// RabbitMQ AMQP 1.0 Go Client: https://github.com/rabbitmq/rabbitmq-amqp-go-client
+// RabbitMQ AMQP 1.0 documentation: https://www.rabbitmq.com/docs/amqp
+// The example is demonstrating how to implement a simple RPC echo server and client using RabbitMQ AMQP 1.0 Go Client.
+// It uses DirectReplyTo for the client to receive responses without needing to declare a reply queue.
+// DirectReplyTo is the recommended way to receive replies for RPC clients.
+// The server listens for messages on a request queue and responds with the same message (echo).
+// The client sends messages to the request queue and waits for the echoed response.
+// The example also includes graceful shutdown handling when the user presses Ctrl+C.
+// Example path:https://github.com/rabbitmq/rabbitmq-amqp-go-client/tree/main/docs/examples/rpc_echo_server/main.go
+
 package main
 
 import (
@@ -66,9 +76,11 @@ func main() {
 
 	requester, err := clientConn.NewRequester(context.TODO(), &rabbitmqamqp.RequesterOptions{
 		RequestQueueName: requestQueue,
-		// Enable Direct Reply To feature
-		// see: https://www.rabbitmq.com/direct-reply-to.html
-		DirectReplyTo: true,
+		// Use DirectReplyTo so replies are received via RabbitMQ direct-reply-to (no reply queue declared).
+		// See: https://www.rabbitmq.com/docs/direct-reply-to#overview
+		// That's the recommended way to receive replies for RPC clients,
+		// as it avoids the overhead of declaring and consuming from a reply queue.
+		SettleStrategy: rabbitmqamqp.DirectReplyTo,
 	})
 	if err != nil {
 		panic(err)

pkg/rabbitmqamqp/amqp_connection.go

@@ -276,7 +276,7 @@ func (a *AmqpConnection) NewRequester(ctx context.Context, options *RequesterOpt
 
 	replyQueueName := options.ReplyToQueueName
 	queueName := ""
-	if !options.DirectReplyTo {
+	if options.SettleStrategy != DirectReplyTo {
 
 		if len(replyQueueName) == 0 {
 			replyQueueName = generateNameWithDefaultPrefix()
@@ -333,13 +333,9 @@ func (a *AmqpConnection) NewRequester(ctx context.Context, options *RequesterOpt
 		done:                   make(chan struct{}),
 	}
 
-	feature := DefaultSettle
-	if options.DirectReplyTo {
-		feature = DirectReplyTo
-	}
 	// Create consumer for receiving replies
 	consumer, err := a.NewConsumer(ctx, queueName, &ConsumerOptions{
-		Feature: feature,
+		SettleStrategy: options.SettleStrategy,
 	})
 	if err != nil {
 		_ = publisher.Close(ctx) // cleanup publisher on failure

pkg/rabbitmqamqp/amqp_consumer_test.go

@@ -43,7 +43,7 @@ var _ = Describe("NewConsumer tests", func() {
 		Expect(err).To(BeNil())
 		Expect(queue).NotTo(BeNil())
 		publishMessages(qName, 10)
-		consumer, err := connection.NewConsumer(context.Background(), qName, &ConsumerOptions{Feature: DefaultSettle})
+		consumer, err := connection.NewConsumer(context.Background(), qName, &ConsumerOptions{SettleStrategy: ExplicitSettle})
 		Expect(err).To(BeNil())
 		Expect(consumer).NotTo(BeNil())
 		Expect(consumer).To(BeAssignableToTypeOf(&Consumer{}))
@@ -247,7 +247,7 @@ var _ = Describe("Consumer direct reply to", func() {
 		Expect(err).To(BeNil())
 
 		consumer, err := connection.NewConsumer(context.Background(), "", &ConsumerOptions{
-			Feature: DirectReplyTo,
+			SettleStrategy: DirectReplyTo,
 		})
 		Expect(err).To(BeNil())
 		Expect(consumer).NotTo(BeNil())
@@ -331,7 +331,7 @@ var _ = Describe("Consumer pre-settled", func() {
 		// Create consumer with pre-settled enabled
 		consumer, err := connection.NewConsumer(context.Background(), qName, &ConsumerOptions{
 			InitialCredits: initialCredits,
-			Feature:        PreSettled,
+			SettleStrategy: PreSettled,
 		})
 		Expect(err).To(BeNil())
 		Expect(consumer).NotTo(BeNil())

pkg/rabbitmqamqp/amqp_exchange_test.go

@@ -22,7 +22,7 @@ var _ = Describe("AMQP Exchange test ", func() {
 	})
 
 	It("AMQP Exchange Declare with Default and Delete should succeed", func() {
-		const exchangeName = "AMQP Exchange Declare and Delete with DefaultSettle should succeed"
+		const exchangeName = "AMQP Exchange Declare and Delete with ExplicitSettle should succeed"
 		exchangeInfo, err := management.DeclareExchange(context.TODO(), &DirectExchangeSpecification{
 			Name: exchangeName,
 		})

pkg/rabbitmqamqp/amqp_types.go

@@ -111,15 +111,17 @@ func (mo *managementOptions) preSettled() bool {
 	return false
 }
 
-type ConsumerFeature byte
+// ConsumerSettleStrategy configures how the consumer receives and settles messages.
+// Aligns with the settle strategy concept used across AMQP 1.0 clients.
+type ConsumerSettleStrategy byte
 
 const (
-	// DefaultSettle means that the consumer will be created with the default settings.
-	// message settle mode will be the default one (explicit settle) via IDeliveryContext
-	DefaultSettle ConsumerFeature = iota
+	// ExplicitSettle means that the consumer will be created with the default settings.
+	// Message settle mode will be explicit via IDeliveryContext (accept, discard, requeue).
+	ExplicitSettle ConsumerSettleStrategy = iota
 	// DirectReplyTo means that the consumer will be created with the direct reply to feature enabled.
-	// see https://www.rabbitmq.com/docs/direct-reply-to#overview message settle mode will be auto-settled
-	//for direct reply to consumers.
+	// See https://www.rabbitmq.com/docs/direct-reply-to#overview. Message settle mode will be auto-settled
+	// for direct reply to consumers.
 	DirectReplyTo
 	// PreSettled means that the consumer will be created with the pre-settled delivery mode.
 	// The server settles the deliveries as soon as they are sent to the consumer,
@@ -136,9 +138,9 @@ type ConsumerOptions struct {
 	// The id of the consumer
 	Id string
 
-	// Feature represents the feature that should be enabled for the consumer.
-	// see ConsumerFeature for more details.
-	Feature ConsumerFeature
+	// SettleStrategy configures how messages are received and settled.
+	// See ConsumerSettleStrategy for more details.
+	SettleStrategy ConsumerSettleStrategy
 }
 
 func (aco *ConsumerOptions) linkName() string {
@@ -159,19 +161,19 @@ func (aco *ConsumerOptions) id() string {
 
 func (aco *ConsumerOptions) validate(available *featuresAvailable) error {
 	// direct reply to is supported since RabbitMQ 4.2.0
-	if aco.Feature == DirectReplyTo && !available.is42rMore {
+	if aco.SettleStrategy == DirectReplyTo && !available.is42rMore {
 		return fmt.Errorf("direct reply to feature is not supported. You need RabbitMQ 4.2 or later")
 	}
 
 	return nil
 }
 
 func (aco *ConsumerOptions) isDirectReplyToEnable() bool {
-	return aco.Feature == DirectReplyTo
+	return aco.SettleStrategy == DirectReplyTo
 }
 
 func (aco *ConsumerOptions) preSettled() bool {
-	return aco.Feature == PreSettled
+	return aco.SettleStrategy == PreSettled
 }
 
 type IOffsetSpecification interface {

pkg/rabbitmqamqp/requester.go

@@ -123,9 +123,11 @@ type RequesterOptions struct {
 	// Optional. If not set, a default timeout of 30 seconds will be used.
 	RequestTimeout time.Duration
 
-	// If true, the requester will set the 'Direct-Reply-To' feature for RabbitMQ.
-	// see: https://www.rabbitmq.com/direct-reply-to.html
-	DirectReplyTo bool
+	// SettleStrategy configures how the reply consumer receives messages.
+	// Use ExplicitSettle for a dedicated reply queue (default).
+	// Use DirectReplyTo to enable RabbitMQ direct-reply-to (no reply queue declared).
+	// See: https://www.rabbitmq.com/docs/direct-reply-to#overview
+	SettleStrategy ConsumerSettleStrategy
 }
 
 type outstandingRequest struct {