check baggage contents in IT

Signed-off-by: Cassandra Coyle <[email protected]>

Author: cicoyle

tests/integration/suite/daprd/tracing/baggage/grpc.go

@@ -15,6 +15,7 @@ package baggage
 
 import (
 	"context"
+	"strings"
 	"sync/atomic"
 	"testing"
 
@@ -40,17 +41,20 @@ type grpcBaggage struct {
 	grpcapp *procgrpc.App
 	daprd   *daprd.Daprd
 
-	baggage atomic.Bool
+	baggage     atomic.Bool
+	baggageVals atomic.Value
 }
 
 func (g *grpcBaggage) Setup(t *testing.T) []framework.Option {
 	g.grpcapp = procgrpc.New(t,
 		procgrpc.WithOnInvokeFn(func(ctx context.Context, in *common.InvokeRequest) (*common.InvokeResponse, error) {
 			if md, ok := grpcMetadata.FromIncomingContext(ctx); ok {
-				if _, exists := md["baggage"]; exists {
+				if baggage, exists := md["baggage"]; exists {
 					g.baggage.Store(true)
+					g.baggageVals.Store(strings.Join(baggage, ","))
 				} else {
 					g.baggage.Store(false)
+					g.baggageVals.Store("")
 				}
 			}
 			return nil, nil
@@ -86,6 +90,7 @@ func (g *grpcBaggage) Run(t *testing.T, ctx context.Context) {
 		require.NoError(t, err)
 		require.NotNil(t, svcresp)
 		assert.False(t, g.baggage.Load())
+		assert.Equal(t, "", g.baggageVals.Load())
 	})
 
 	t.Run("baggage header provided", func(t *testing.T) {
@@ -102,20 +107,22 @@ func (g *grpcBaggage) Run(t *testing.T, ctx context.Context) {
 			},
 		}
 
+		baggageVal := "key1=value1,key2=value2"
 		ctx = grpcMetadata.AppendToOutgoingContext(t.Context(),
-			"baggage", "key1=value1,key2=value2",
+			"baggage", baggageVal,
 		)
 		svcresp, err := client.InvokeService(ctx, &svcreq)
 		require.NoError(t, err)
 		require.NotNil(t, svcresp)
 		assert.True(t, g.baggage.Load())
+		assert.Equal(t, baggageVal, g.baggageVals.Load())
 
 		// Verify baggage header is in response metadata
 		md, ok := grpcMetadata.FromOutgoingContext(ctx)
 		require.True(t, ok)
 		baggage := md.Get("baggage")
 		require.Len(t, baggage, 1)
-		assert.Equal(t, "key1=value1,key2=value2", baggage[0])
+		assert.Equal(t, baggageVal, baggage[0])
 	})
 
 	t.Run("invalid baggage header", func(t *testing.T) {

tests/integration/suite/daprd/tracing/baggage/http.go

@@ -40,16 +40,19 @@ type httpBaggage struct {
 	httpapp *prochttp.HTTP
 	daprd   *daprd.Daprd
 
-	baggage atomic.Bool
+	baggage     atomic.Bool
+	baggageVals atomic.Value
 }
 
 func (h *httpBaggage) Setup(t *testing.T) []framework.Option {
 	handler := http.NewServeMux()
 	handler.HandleFunc("/test", func(w http.ResponseWriter, r *http.Request) {
-		if baggage := r.Header.Get("baggage"); baggage != "" {
+		if baggage := r.Header.Values("baggage"); len(baggage) > 0 {
 			h.baggage.Store(true)
+			h.baggageVals.Store(strings.Join(baggage, ","))
 		} else {
 			h.baggage.Store(false)
+			h.baggageVals.Store("")
 		}
 		w.Write([]byte(`OK`))
 	})
@@ -76,6 +79,7 @@ func (h *httpBaggage) Run(t *testing.T, ctx context.Context) {
 		defer appresp.Body.Close()
 		assert.Equal(t, http.StatusOK, appresp.StatusCode)
 		assert.False(t, h.baggage.Load())
+		assert.Equal(t, "", h.baggageVals.Load())
 	})
 
 	t.Run("baggage header provided", func(t *testing.T) {
@@ -84,16 +88,18 @@ func (h *httpBaggage) Run(t *testing.T, ctx context.Context) {
 		appreq, err := http.NewRequestWithContext(t.Context(), http.MethodPost, appURL, strings.NewReader("{\"operation\":\"get\"}"))
 		require.NoError(t, err)
 
-		appreq.Header.Set("baggage", "key1=value1,key2=value2")
+		baggageVal := "key1=value1,key2=value2"
+		appreq.Header.Set("baggage", baggageVal)
 
 		appresp, err := httpClient.Do(appreq)
 		require.NoError(t, err)
 		defer appresp.Body.Close()
 		assert.Equal(t, http.StatusOK, appresp.StatusCode)
 		assert.True(t, h.baggage.Load())
+		assert.Equal(t, baggageVal, h.baggageVals.Load())
 
 		// Verify baggage header is in response
-		assert.Equal(t, "key1=value1,key2=value2", appresp.Header.Get("baggage"))
+		assert.Equal(t, baggageVal, appresp.Header.Get("baggage"))
 	})
 
 	t.Run("invalid baggage header", func(t *testing.T) {