Merge branch 'main' into renovabot-otel-commits

.golangci.yml

@@ -259,7 +259,6 @@ linters-settings:
   testifylint:
     enable-all: true
     disable:
-      - expected-actual
       - float-compare
       - formatter
       - require-error

CHANGELOG.md

@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Fixed
 
 - Possible nil dereference panic in `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace`. (#5965)
+- Non-200 HTTP status codes when retrieving sampling rules in `go.opentelemetry.io/contrib/samplers/aws/xray` now return an error. (#5718)
 
 ### Removed
 

bridges/otellogr/convert_test.go

@@ -300,7 +300,7 @@ func TestConvertValue(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, convertValue(tt.value), tt.wantValue)
+			assert.Equal(t, tt.wantValue, convertValue(tt.value))
 		})
 	}
 }

config/metric_test.go

@@ -464,8 +464,8 @@ func TestReader(t *testing.T) {
 			name: "periodic/console-exporter-with-extra-options",
 			reader: MetricReader{
 				Periodic: &PeriodicMetricReader{
-					Interval: newIntPtr(30_000),
-					Timeout:  newIntPtr(5_000),
+					Interval: ptr(30_000),
+					Timeout:  ptr(5_000),
 					Exporter: MetricExporter{
 						Console: Console{},
 					},
@@ -522,7 +522,7 @@ func TestView(t *testing.T) {
 			name: "selector/invalid_type",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("invalid_type")),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("invalid_type")),
 				},
 			},
 			wantErr: "view_selector: instrument_type: invalid value",
@@ -538,12 +538,12 @@ func TestView(t *testing.T) {
 			name: "all selectors match",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -563,12 +563,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match name",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -588,12 +588,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match unit",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -613,12 +613,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match kind",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("histogram")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("histogram")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -638,12 +638,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match meter name",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -663,12 +663,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match meter version",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -688,12 +688,12 @@ func TestView(t *testing.T) {
 			name: "all selectors no match meter schema url",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					InstrumentType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
-					Unit:           newStringPtr("test_unit"),
-					MeterName:      newStringPtr("test_meter_name"),
-					MeterVersion:   newStringPtr("test_meter_version"),
-					MeterSchemaUrl: newStringPtr("test_schema_url"),
+					InstrumentName: ptr("test_name"),
+					InstrumentType: (*ViewSelectorInstrumentType)(ptr("counter")),
+					Unit:           ptr("test_unit"),
+					MeterName:      ptr("test_meter_name"),
+					MeterVersion:   ptr("test_meter_version"),
+					MeterSchemaUrl: ptr("test_schema_url"),
 				},
 			},
 			matchInstrument: &sdkmetric.Instrument{
@@ -713,12 +713,12 @@ func TestView(t *testing.T) {
 			name: "with stream",
 			view: View{
 				Selector: &ViewSelector{
-					InstrumentName: newStringPtr("test_name"),
-					Unit:           newStringPtr("test_unit"),
+					InstrumentName: ptr("test_name"),
+					Unit:           ptr("test_unit"),
 				},
 				Stream: &ViewStream{
-					Name:          newStringPtr("new_name"),
-					Description:   newStringPtr("new_description"),
+					Name:          ptr("new_name"),
+					Description:   ptr("new_description"),
 					AttributeKeys: []string{"foo", "bar"},
 					Aggregation:   &ViewStreamAggregation{Sum: make(ViewStreamAggregationSum)},
 				},
@@ -768,45 +768,45 @@ func TestInstrumentType(t *testing.T) {
 		},
 		{
 			name:     "counter",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("counter")),
+			instType: (*ViewSelectorInstrumentType)(ptr("counter")),
 			wantKind: sdkmetric.InstrumentKindCounter,
 		},
 		{
 			name:     "up_down_counter",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("up_down_counter")),
+			instType: (*ViewSelectorInstrumentType)(ptr("up_down_counter")),
 			wantKind: sdkmetric.InstrumentKindUpDownCounter,
 		},
 		{
 			name:     "histogram",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("histogram")),
+			instType: (*ViewSelectorInstrumentType)(ptr("histogram")),
 			wantKind: sdkmetric.InstrumentKindHistogram,
 		},
 		{
 			name:     "observable_counter",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("observable_counter")),
+			instType: (*ViewSelectorInstrumentType)(ptr("observable_counter")),
 			wantKind: sdkmetric.InstrumentKindObservableCounter,
 		},
 		{
 			name:     "observable_up_down_counter",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("observable_up_down_counter")),
+			instType: (*ViewSelectorInstrumentType)(ptr("observable_up_down_counter")),
 			wantKind: sdkmetric.InstrumentKindObservableUpDownCounter,
 		},
 		{
 			name:     "observable_gauge",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("observable_gauge")),
+			instType: (*ViewSelectorInstrumentType)(ptr("observable_gauge")),
 			wantKind: sdkmetric.InstrumentKindObservableGauge,
 		},
 		{
 			name:     "invalid",
-			instType: (*ViewSelectorInstrumentType)(newStringPtr("invalid")),
+			instType: (*ViewSelectorInstrumentType)(ptr("invalid")),
 			wantErr:  errors.New("instrument_type: invalid value"),
 		},
 	}
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := instrumentKind(tt.instType)
 			if tt.wantErr != nil {
-				require.Equal(t, err, tt.wantErr)
+				require.Equal(t, tt.wantErr, err)
 				require.Zero(t, got)
 			} else {
 				require.NoError(t, err)
@@ -846,9 +846,9 @@ func TestAggregation(t *testing.T) {
 			name: "Base2ExponentialBucketHistogram",
 			aggregation: &ViewStreamAggregation{
 				Base2ExponentialBucketHistogram: &ViewStreamAggregationBase2ExponentialBucketHistogram{
-					MaxSize:      newIntPtr(2),
-					MaxScale:     newIntPtr(3),
-					RecordMinMax: newBoolPtr(true),
+					MaxSize:      ptr(2),
+					MaxScale:     ptr(3),
+					RecordMinMax: ptr(true),
 				},
 			},
 			wantAggregation: sdkmetric.AggregationBase2ExponentialHistogram{
@@ -886,7 +886,7 @@ func TestAggregation(t *testing.T) {
 			aggregation: &ViewStreamAggregation{
 				ExplicitBucketHistogram: &ViewStreamAggregationExplicitBucketHistogram{
 					Boundaries:   []float64{1, 2, 3},
-					RecordMinMax: newBoolPtr(true),
+					RecordMinMax: ptr(true),
 				},
 			},
 			wantAggregation: sdkmetric.AggregationExplicitBucketHistogram{
@@ -949,15 +949,3 @@ func TestAttributeFilter(t *testing.T) {
 		})
 	}
 }
-
-func newBoolPtr(b bool) *bool {
-	return &b
-}
-
-func newIntPtr(i int) *int {
-	return &i
-}
-
-func newStringPtr(str string) *string {
-	return &str
-}

instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod

@@ -11,8 +11,8 @@ replace (
 
 require (
 	github.com/aws/aws-lambda-go v1.47.0
-	github.com/aws/aws-sdk-go-v2/config v1.27.37
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1
+	github.com/aws/aws-sdk-go-v2/config v1.27.38
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.63.2
 	go.opentelemetry.io/contrib/detectors/aws/lambda v0.55.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.55.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0
@@ -25,22 +25,22 @@ require (
 require (
 	github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.35 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.36 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.19 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.35.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.35.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.23.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.31.2 // indirect
 	github.com/aws/smithy-go v1.21.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum

@@ -4,10 +4,10 @@ github.com/aws/aws-sdk-go-v2 v1.31.0 h1:3V05LbxTSItI5kUqNwhJrrrY1BAXxXt0sN0l72Qm
 github.com/aws/aws-sdk-go-v2 v1.31.0/go.mod h1:ztolYtaEUtdpf9Wftr31CJfLVjOnD/CVRkKOOYgF8hA=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 h1:xDAuZTn4IMm8o1LnBZvmrL8JA1io4o3YWNXgohbf20g=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5/go.mod h1:wYSv6iDS621sEFLfKvpPE2ugjTuGlAG7iROg0hLOkfc=
-github.com/aws/aws-sdk-go-v2/config v1.27.37 h1:xaoIwzHVuRWRHFI0jhgEdEGc8xE1l91KaeRDsWEIncU=
-github.com/aws/aws-sdk-go-v2/config v1.27.37/go.mod h1:S2e3ax9/8KnMSyRVNd3sWTKs+1clJ2f1U6nE0lpvQRg=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.35 h1:7QknrZhYySEB1lEXJxGAmuD5sWwys5ZXNr4m5oEz0IE=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.35/go.mod h1:8Vy4kk7at4aPSmibr7K+nLTzG6qUQAUO4tW49fzUV4E=
+github.com/aws/aws-sdk-go-v2/config v1.27.38 h1:mMVyJJuSUdbD4zKXoxDgWrgM60QwlFEg+JhihCq6wCw=
+github.com/aws/aws-sdk-go-v2/config v1.27.38/go.mod h1:6xOiNEn58bj/64MPKx89r6G/el9JZn8pvVbquSqTKK4=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.36 h1:zwI5WrT+oWWfzSKoTNmSyeBKQhsFRJRv+PGW/UZW+Yk=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.36/go.mod h1:3AG/sY1rc9NJrNWcN/3KPU4SIDPGTrd/qegKB0TnFdE=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 h1:kYQ3H1u0ANr9KEKlGs/jTLrBFPo8P8NaH/w7A01NeeM=
@@ -18,8 +18,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 h1:OWYvKL53l1rbsUmW7bQyJVsYU/Ii3bbAAQIIFNbM0Tk=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18/go.mod h1:CUx0G1v3wG6l01tUB+j7Y8kclA8NSqK4ef0YG79a4cg=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.1 h1:DDN8yqYzFUDy2W5zk3tLQNKaO/1t0h3fNixPJacu264=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.1/go.mod h1:k5XW8MoMxsNZ20RJmsokakvENUwQyjv69R9GqrI4xdQ=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.2 h1:EGvR8KwbxUXEUCS4HAgSRcxeFT1/0bqvS5tRR0WZSbM=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.2/go.mod h1:k5XW8MoMxsNZ20RJmsokakvENUwQyjv69R9GqrI4xdQ=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 h1:QFASJGfT8wMXtuP3D5CRmMjARHv9ZmzFUMJznHDOY3w=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5/go.mod h1:QdZ3OmoIjSX+8D1OPAzPxDfjXASbBMDsz9qvtyIhtik=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 h1:rTWjG6AvWekO2B1LHeM3ktU7MqyX9rzWQ7hgzneZW7E=
@@ -30,16 +30,16 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 h1:eb+tFOIl9ZsUe2259/BKPeniKuz4/02zZFH/i4Nf8Rg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18/go.mod h1:GVCC2IJNJTmdlyEsSmofEy7EfJncP7DNnXDzRjJ5Keg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1 h1:TR96r56VwELV0qguNFCuz+/bEpRfnR3ZsS9/IG05C7Q=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.35.1 h1:b6qVeD+AXiUJMVCfnShSxcSJ7i+3RAlOO+gwZPB7Qn8=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.35.1/go.mod h1:WuGxWQhu2LXoPGA2HBIbotpwhM6T4hAz0Ip/HjdxfJg=
-github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 h1:2jrVsMHqdLD1+PA4BA6Nh1eZp0Gsy3mFSB5MxDvcJtU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.23.1/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 h1:0L7yGCg3Hb3YQqnSgBTZM5wepougtL1aEccdcdYhHME=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E=
-github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 h1:8K0UNOkZiK9Uh3HIF6Bx0rcNCftqGCeKmOaR7Gp5BSo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.31.1/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.63.2 h1:1iXmXy8SJzQVMGvo40TSzBYS9ig6BSyXfRIMzLfmBfE=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.63.2/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.35.2 h1:sjw/u/hE4qRrT+5dQjetlXwy9ypkgVi3/RcB8C5n7bc=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.35.2/go.mod h1:WuGxWQhu2LXoPGA2HBIbotpwhM6T4hAz0Ip/HjdxfJg=
+github.com/aws/aws-sdk-go-v2/service/sso v1.23.2 h1:yzi/y/vKlLyzOfG7pSu5ONNGRxHIgLeDrV4w2AMRCo0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.23.2/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.2 h1:3gb6pYhYLjo8rB1h2Tqs61wpjRd3rQymYcVq/pp0yxI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.2/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E=
+github.com/aws/aws-sdk-go-v2/service/sts v1.31.2 h1:O6tyji8mXmBGsHvTCB0VIhrDw19lGTUSbKIyjnw79s8=
+github.com/aws/aws-sdk-go-v2/service/sts v1.31.2/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI=
 github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA=
 github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws_test.go

@@ -76,7 +76,7 @@ func Test_Span_name(t *testing.T) {
 	operation1 := ""
 	operation2 := "Operation"
 
-	assert.Equal(t, spanName(serviceID1, operation1), "")
+	assert.Equal(t, "", spanName(serviceID1, operation1))
 	assert.Equal(t, spanName(serviceID1, operation2), "."+operation2)
 	assert.Equal(t, spanName(serviceID2, operation1), serviceID2)
 	assert.Equal(t, spanName(serviceID2, operation2), serviceID2+"."+operation2)