Merge branch 'develop' into worktree-fix-service-listeners-lock

Author: Aias00

client/client.go

@@ -277,6 +277,12 @@ func generateInvocation(ctx context.Context, methodName string, reqs []any, resp
 		invocation.WithAttachments(attachments),
 	)
 	inv.SetAttribute(constant.CallTypeKey, callType)
+	if opts.ResponseHeader != nil {
+		inv.SetAttribute(constant.ResponseHeaderKey, opts.ResponseHeader)
+	}
+	if opts.ResponseTrailer != nil {
+		inv.SetAttribute(constant.ResponseTrailerKey, opts.ResponseTrailer)
+	}
 
 	return inv, nil
 }

client/client_test.go

@@ -20,6 +20,7 @@ package client
 import (
 	"context"
 	"errors"
+	"net/http"
 	"testing"
 	"time"
 )
@@ -146,7 +147,19 @@ func TestConnectionCallPassesOptions(t *testing.T) {
 	conn := &Connection{refOpts: &ReferenceOptions{invoker: invoker}}
 
 	var resp string
-	res, err := conn.call(context.Background(), []any{"req"}, &resp, "Ping", constant.CallUnary, WithCallRequestTimeout(1500*time.Millisecond), WithCallRetries(3))
+	var responseHeader http.Header
+	var responseTrailer http.Header
+	res, err := conn.call(
+		context.Background(),
+		[]any{"req"},
+		&resp,
+		"Ping",
+		constant.CallUnary,
+		WithCallRequestTimeout(1500*time.Millisecond),
+		WithCallRetries(3),
+		WithResponseHeader(&responseHeader),
+		WithResponseTrailer(&responseTrailer),
+	)
 	require.NoError(t, err)
 	require.Equal(t, invRes, res)
 
@@ -158,6 +171,14 @@ func TestConnectionCallPassesOptions(t *testing.T) {
 
 	requireCallType(t, inv, constant.CallUnary)
 	require.Equal(t, []any{"req", &resp}, inv.ParameterRawValues())
+
+	headerTarget, ok := inv.GetAttribute(constant.ResponseHeaderKey)
+	require.True(t, ok)
+	require.Same(t, &responseHeader, headerTarget)
+
+	trailerTarget, ok := inv.GetAttribute(constant.ResponseTrailerKey)
+	require.True(t, ok)
+	require.Same(t, &responseTrailer, trailerTarget)
 }
 
 func TestCallUnary(t *testing.T) {

client/options.go

@@ -18,6 +18,7 @@
 package client
 
 import (
+	"net/http"
 	"strconv"
 	"time"
 )
@@ -999,8 +1000,10 @@ func SetClientRouters(routers []*global.RouterConfig) ClientOption {
 
 // todo: need to be consistent with MethodConfig
 type CallOptions struct {
-	RequestTimeout string
-	Retries        string
+	RequestTimeout  string
+	Retries         string
+	ResponseHeader  *http.Header
+	ResponseTrailer *http.Header
 }
 
 type CallOption func(*CallOptions)
@@ -1022,3 +1025,21 @@ func WithCallRetries(retries int) CallOption {
 		opts.Retries = strconv.Itoa(retries)
 	}
 }
+
+// WithResponseHeader configures a target to receive response headers.
+// Currently, only Triple unary calls populate this option (including error
+// responses when metadata is available).
+func WithResponseHeader(header *http.Header) CallOption {
+	return func(opts *CallOptions) {
+		opts.ResponseHeader = header
+	}
+}
+
+// WithResponseTrailer configures a target to receive response trailers.
+// Currently, only Triple unary calls populate this option (including error
+// responses when metadata is available).
+func WithResponseTrailer(trailer *http.Header) CallOption {
+	return func(opts *CallOptions) {
+		opts.ResponseTrailer = trailer
+	}
+}

common/constant/key.go

@@ -157,6 +157,8 @@ const (
 	CycleReportKey                     = "cycle.report"
 	DefaultBlackListRecoverBlock       = 16
 	CallTypeKey                        = "call-type"
+	ResponseHeaderKey                  = "response-header"
+	ResponseTrailerKey                 = "response-trailer"
 	CallUnary                          = "unary"
 	CallClientStream                   = "client-stream"
 	CallServerStream                   = "server-stream"

filter/graceful_shutdown/compat.go common/constant/shutdown.gofilter/graceful_shutdown/compat.go renamed to common/constant/shutdown.go

@@ -15,32 +15,16 @@
  * limitations under the License.
  */
 
-package graceful_shutdown
+package constant
 
 import (
-	"go.uber.org/atomic"
+	"time"
 )
 
-import (
-	"dubbo.apache.org/dubbo-go/v3/config"
-	"dubbo.apache.org/dubbo-go/v3/global"
+const (
+	DefaultShutdownConfigTimeout                     = 60 * time.Second
+	DefaultShutdownConfigStepTimeout                 = 3 * time.Second
+	DefaultShutdownConfigNotifyTimeout               = 5 * time.Second
+	DefaultShutdownConfigConsumerUpdateWaitTime      = 3 * time.Second
+	DefaultShutdownConfigOfflineRequestWindowTimeout = 3 * time.Second
 )
-
-func compatGlobalShutdownConfig(c *config.ShutdownConfig) *global.ShutdownConfig {
-	if c == nil {
-		return nil
-	}
-	cfg := &global.ShutdownConfig{
-		Timeout:                     c.Timeout,
-		StepTimeout:                 c.StepTimeout,
-		NotifyTimeout:               c.NotifyTimeout,
-		ConsumerUpdateWaitTime:      c.ConsumerUpdateWaitTime,
-		RejectRequestHandler:        c.RejectRequestHandler,
-		InternalSignal:              c.InternalSignal,
-		OfflineRequestWindowTimeout: c.OfflineRequestWindowTimeout,
-		RejectRequest:               atomic.Bool{},
-	}
-	cfg.RejectRequest.Store(c.RejectRequest.Load())
-
-	return cfg
-}