Merge branch 'main' into deprecate-otelkit

Author: pellared

CHANGELOG.md

@@ -27,6 +27,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   - `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace`
   - `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`
 - Do not modify the origin request in RoundTripper in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`. (#4033)
+- Handle empty value of `OTEL_PROPAGATORS` environment variable the same way as when the variable is unset in `go.opentelemetry.io/contrib/propagators/autoprop`. (#4101)
 
 ### Deprecated
 

exporters/autoexport/registry_test.go

@@ -17,6 +17,7 @@ package autoexport
 import (
 	"context"
 	"fmt"
+	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -59,19 +60,27 @@ func TestRegistryIsConcurrentSafe(t *testing.T) {
 		require.NoError(t, r.store(exporterName, stdoutFactory))
 	})
 
+	var wg sync.WaitGroup
+
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		assert.NotPanics(t, func() {
 			require.ErrorIs(t, r.store(exporterName, stdoutFactory), errDuplicateRegistration)
 		})
 	}()
 
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		assert.NotPanics(t, func() {
 			exp, err := r.load(context.Background(), exporterName)
 			assert.Nil(t, err, "missing exporter in registry")
 			assert.IsType(t, &stdouttrace.Exporter{}, exp)
 		})
 	}()
+
+	wg.Wait()
 }
 
 func TestSubsequentCallsToGetExporterReturnsNewInstances(t *testing.T) {

propagators/autoprop/propagator.go

@@ -82,8 +82,8 @@ var errUnknownPropagator = errors.New("unknown propagator")
 // TextMapPropagator will be returned if "none" is defined anywhere in the
 // environment variable.
 func parseEnv() (propagation.TextMapPropagator, error) {
-	propStrs, defined := os.LookupEnv(otelPropagatorsEnvKey)
-	if !defined {
+	propStrs := os.Getenv(otelPropagatorsEnvKey)
+	if propStrs == "" {
 		return nil, nil
 	}
 	return TextMapPropagator(strings.Split(propStrs, ",")...)

propagators/autoprop/registry_test.go

@@ -16,6 +16,7 @@ package autoprop
 
 import (
 	"fmt"
+	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -50,19 +51,27 @@ func TestRegistryConcurrentSafe(t *testing.T) {
 		require.NoError(t, r.store(propName, noop))
 	})
 
+	var wg sync.WaitGroup
+
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		assert.NotPanics(t, func() {
 			require.ErrorIs(t, r.store(propName, noop), errDupReg)
 		})
 	}()
 
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		assert.NotPanics(t, func() {
 			v, ok := r.load(propName)
 			assert.True(t, ok, "missing propagator in registry")
 			assert.Equal(t, noop, v, "wrong propagator retuned")
 		})
 	}()
+
+	wg.Wait()
 }
 
 func TestRegisterTextMapPropagator(t *testing.T) {

samplers/aws/xray/internal/manifest_test.go

@@ -17,6 +17,7 @@ package internal
 import (
 	"context"
 	"net/url"
+	"sync"
 	"testing"
 	"time"
 
@@ -1492,7 +1493,7 @@ func TestGenerateClientID(t *testing.T) {
 }
 
 // validate no data race is happening when updating rule properties in manifest while matching.
-func TestRaceUpdatingRulesWhileMatching(t *testing.T) {
+func TestUpdatingRulesWhileMatchingConcurrentSafe(t *testing.T) {
 	// getSamplingRules response
 	ruleRecords := samplingRuleRecords{
 		SamplingRule: &ruleProperties{
@@ -1546,7 +1547,9 @@ func TestRaceUpdatingRulesWhileMatching(t *testing.T) {
 	}
 
 	// async rule updates
+	done := make(chan struct{})
 	go func() {
+		defer close(done)
 		for i := 0; i < 100; i++ {
 			m.updateRules(s)
 			time.Sleep(time.Millisecond)
@@ -1559,10 +1562,11 @@ func TestRaceUpdatingRulesWhileMatching(t *testing.T) {
 		require.NoError(t, err)
 		require.False(t, match)
 	}
+	<-done
 }
 
 // validate no data race is happening when updating rule properties and rule targets in manifest while matching.
-func TestRaceUpdatingRulesAndTargetsWhileMatching(t *testing.T) {
+func TestUpdatingRulesAndTargetsWhileMatchingConcurrentSafe(t *testing.T) {
 	// getSamplingRules response to update existing manifest rule
 	ruleRecords := samplingRuleRecords{
 		SamplingRule: &ruleProperties{
@@ -1610,8 +1614,12 @@ func TestRaceUpdatingRulesAndTargetsWhileMatching(t *testing.T) {
 		clock: clock,
 	}
 
+	var wg sync.WaitGroup
+
 	// async rule updates
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		for i := 0; i < 100; i++ {
 			m.updateRules(&getSamplingRulesOutput{
 				SamplingRuleRecords: []*samplingRuleRecords{&ruleRecords},
@@ -1621,7 +1629,9 @@ func TestRaceUpdatingRulesAndTargetsWhileMatching(t *testing.T) {
 	}()
 
 	// async target updates
+	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		for i := 0; i < 100; i++ {
 			manifest := m.deepCopy()
 
@@ -1642,6 +1652,8 @@ func TestRaceUpdatingRulesAndTargetsWhileMatching(t *testing.T) {
 		require.False(t, match)
 		time.Sleep(time.Millisecond)
 	}
+
+	wg.Wait()
 }
 
 // Validate Rules are preserved when a rule is updated with the same ruleProperties.
@@ -1782,7 +1794,7 @@ func TestDoNotPreserveRulesWithDifferentRuleProperties(t *testing.T) {
 }
 
 // validate no data race is when capturing sampling statistics in manifest while sampling.
-func TestRaceUpdatingSamplingStatisticsWhenSampling(t *testing.T) {
+func TestUpdatingSamplingStatisticsWhenSamplingConcurrentSafe(t *testing.T) {
 	// existing rule already present in manifest
 	r1 := Rule{
 		ruleProperties: ruleProperties{
@@ -1819,7 +1831,9 @@ func TestRaceUpdatingSamplingStatisticsWhenSampling(t *testing.T) {
 	}
 
 	// async snapshot updates
+	done := make(chan struct{})
 	go func() {
+		defer close(done)
 		for i := 0; i < 100; i++ {
 			manifest := m.deepCopy()
 
@@ -1838,4 +1852,5 @@ func TestRaceUpdatingSamplingStatisticsWhenSampling(t *testing.T) {
 		_ = r1.Sample(sdktrace.SamplingParameters{}, time.Unix(clock.nowTime+int64(i), 0))
 		time.Sleep(time.Millisecond)
 	}
+	<-done
 }

samplers/aws/xray/internal/rule_test.go

@@ -563,7 +563,7 @@ func TestMatchAgainstManifestRulesNoAttributeMatch(t *testing.T) {
 }
 
 // validate no data race is happening when updating rule properties and rule targets in manifest while sampling.
-func TestRaceUpdatingRulesAndTargetsWhileSampling(t *testing.T) {
+func TestUpdatingRulesAndTargetsWhileSamplingConcurrentSafe(t *testing.T) {
 	// getSamplingRules response to update existing manifest rule
 	ruleRecords := samplingRuleRecords{
 		SamplingRule: &ruleProperties{

samplers/jaegerremote/sampler_remote_test.go

@@ -20,6 +20,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"sync"
 	"testing"
 	"time"
 
@@ -33,7 +34,7 @@ import (
 	oteltrace "go.opentelemetry.io/otel/trace"
 )
 
-func TestRemotelyControlledSampler_updateRace(t *testing.T) {
+func TestRemotelyControlledSampler_updateConcurrentSafe(t *testing.T) {
 	initSampler := newProbabilisticSampler(0.123)
 	fetcher := &testSamplingStrategyFetcher{response: []byte("probabilistic")}
 	parser := new(testSamplingStrategyParser)
@@ -50,31 +51,25 @@ func TestRemotelyControlledSampler_updateRace(t *testing.T) {
 		withUpdaters(updaters...),
 	)
 
+	defer sampler.Close()
+
 	s := makeSamplingParameters(1, "test")
-	end := make(chan struct{})
 
-	accessor := func(f func()) {
-		for {
-			select {
-			case <-end:
-				return
-			default:
-				f()
-			}
-		}
-	}
+	var wg sync.WaitGroup
 
-	go accessor(func() {
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
 		sampler.UpdateSampler()
-	})
+	}()
 
-	go accessor(func() {
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
 		sampler.ShouldSample(s)
-	})
+	}()
 
-	time.Sleep(100 * time.Millisecond)
-	close(end)
-	sampler.Close()
+	wg.Wait()
 }
 
 type testSamplingStrategyFetcher struct {
@@ -200,11 +195,15 @@ func TestRemotelyControlledSampler(t *testing.T) {
 	ticker := &time.Ticker{C: c}
 	// reset closed so the next call to Close() correctly stops the polling goroutine
 	remoteSampler.closed = 0
-	go remoteSampler.pollControllerWithTicker(ticker)
+	done := make(chan struct{})
+	go func() {
+		defer close(done)
+		remoteSampler.pollControllerWithTicker(ticker)
+	}()
 
 	c <- time.Now() // force update based on timer
-	time.Sleep(10 * time.Millisecond)
 	remoteSampler.Close()
+	<-done
 
 	s2, ok := remoteSampler.sampler.(*probabilisticSampler)
 	assert.True(t, ok)