Merge branch 'main' into filter-bag-mem

Author: MrAlias

processors/baggage/baggagetrace/processor.go

@@ -7,15 +7,15 @@ import (
 	"context"
 
 	"go.opentelemetry.io/otel/attribute"
-	otelbaggage "go.opentelemetry.io/otel/baggage"
+	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/sdk/trace"
 )
 
 // Filter returns true if the baggage member should be added to a span.
-type Filter func(member otelbaggage.Member) bool
+type Filter func(member baggage.Member) bool
 
 // AllowAllMembers allows all baggage members to be added to a span.
-var AllowAllMembers Filter = func(otelbaggage.Member) bool { return true }
+var AllowAllMembers Filter = func(baggage.Member) bool { return true }
 
 // SpanProcessor is a [trace.SpanProcessor] implementation that adds baggage
 // members onto a span as attributes.
@@ -45,7 +45,7 @@ func (processor SpanProcessor) OnStart(ctx context.Context, span trace.ReadWrite
 		filter = AllowAllMembers
 	}
 
-	for _, member := range otelbaggage.FromContext(ctx).Members() {
+	for _, member := range baggage.FromContext(ctx).Members() {
 		if filter(member) {
 			span.SetAttributes(attribute.String(member.Key(), member.Value()))
 		}

processors/baggage/baggagetrace/processor_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/otel/attribute"
-	otelbaggage "go.opentelemetry.io/otel/baggage"
+	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
@@ -37,9 +37,9 @@ func NewTestExporter() *testExporter {
 }
 
 func TestSpanProcessorAppendsAllBaggageAttributes(t *testing.T) {
-	baggage, _ := otelbaggage.New()
-	baggage = addEntryToBaggage(t, baggage, "baggage.test", "baggage value")
-	ctx := otelbaggage.ContextWithBaggage(context.Background(), baggage)
+	b, _ := baggage.New()
+	b = addEntryToBaggage(t, b, "baggage.test", "baggage value")
+	ctx := baggage.ContextWithBaggage(context.Background(), b)
 
 	// create trace provider with baggage processor and test exporter
 	exporter := NewTestExporter()
@@ -61,9 +61,9 @@ func TestSpanProcessorAppendsAllBaggageAttributes(t *testing.T) {
 }
 
 func TestSpanProcessorAppendsBaggageAttributesWithHaPrefixPredicate(t *testing.T) {
-	baggage, _ := otelbaggage.New()
-	baggage = addEntryToBaggage(t, baggage, "baggage.test", "baggage value")
-	ctx := otelbaggage.ContextWithBaggage(context.Background(), baggage)
+	b, _ := baggage.New()
+	b = addEntryToBaggage(t, b, "baggage.test", "baggage value")
+	ctx := baggage.ContextWithBaggage(context.Background(), b)
 
 	baggageKeyPredicate := func(m otelbaggage.Member) bool {
 		return strings.HasPrefix(m.Key(), "baggage.")
@@ -89,9 +89,9 @@ func TestSpanProcessorAppendsBaggageAttributesWithHaPrefixPredicate(t *testing.T
 }
 
 func TestSpanProcessorAppendsBaggageAttributesWithRegexPredicate(t *testing.T) {
-	baggage, _ := otelbaggage.New()
-	baggage = addEntryToBaggage(t, baggage, "baggage.test", "baggage value")
-	ctx := otelbaggage.ContextWithBaggage(context.Background(), baggage)
+	b, _ := baggage.New()
+	b = addEntryToBaggage(t, b, "baggage.test", "baggage value")
+	ctx := baggage.ContextWithBaggage(context.Background(), b)
 
 	expr := regexp.MustCompile(`^baggage\..*`)
 	baggageKeyPredicate := func(m otelbaggage.Member) bool {
@@ -118,10 +118,10 @@ func TestSpanProcessorAppendsBaggageAttributesWithRegexPredicate(t *testing.T) {
 }
 
 func TestOnlyAddsBaggageEntriesThatMatchPredicate(t *testing.T) {
-	baggage, _ := otelbaggage.New()
-	baggage = addEntryToBaggage(t, baggage, "baggage.test", "baggage value")
-	baggage = addEntryToBaggage(t, baggage, "foo", "bar")
-	ctx := otelbaggage.ContextWithBaggage(context.Background(), baggage)
+	b, _ := baggage.New()
+	b = addEntryToBaggage(t, b, "baggage.test", "baggage value")
+	b = addEntryToBaggage(t, b, "foo", "bar")
+	ctx := baggage.ContextWithBaggage(context.Background(), b)
 
 	baggageKeyPredicate := func(m otelbaggage.Member) bool {
 		return m.Key() == "baggage.test"
@@ -146,23 +146,23 @@ func TestOnlyAddsBaggageEntriesThatMatchPredicate(t *testing.T) {
 	require.Equal(t, want, exporter.spans[0].Attributes()[0])
 }
 
-func addEntryToBaggage(t *testing.T, baggage otelbaggage.Baggage, key, value string) otelbaggage.Baggage {
-	member, err := otelbaggage.NewMemberRaw(key, value)
+func addEntryToBaggage(t *testing.T, b baggage.Baggage, key, value string) baggage.Baggage {
+	member, err := baggage.NewMemberRaw(key, value)
 	require.NoError(t, err)
-	baggage, err = baggage.SetMember(member)
+	b, err = b.SetMember(member)
 	require.NoError(t, err)
-	return baggage
+	return b
 }
 
 func TestZeroSpanProcessorNoPanic(t *testing.T) {
 	sp := new(SpanProcessor)
 
-	m, err := otelbaggage.NewMember("key", "val")
+	m, err := baggage.NewMember("key", "val")
 	require.NoError(t, err)
-	b, err := otelbaggage.New(m)
+	b, err := baggage.New(m)
 	require.NoError(t, err)
 
-	ctx := otelbaggage.ContextWithBaggage(context.Background(), b)
+	ctx := baggage.ContextWithBaggage(context.Background(), b)
 	roS := (tracetest.SpanStub{}).Snapshot()
 	rwS := rwSpan{}
 	assert.NotPanics(t, func() {