[chore][exporter/awsxrayexporter] run make modernize #43240
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Paulo Dias <[email protected]>
Member
Author
|
Moved to draft to check the test errors |
Signed-off-by: Paulo Dias <[email protected]>
…-contrib into chore/exporter/awsxrayexporter Signed-off-by: Paulo Dias <[email protected]>
Signed-off-by: Paulo Dias <[email protected]>
Member
Author
|
Tests fixed. Previous error: https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/18372347836/job/52338400875?pr=43240 |
codeboten
reviewed
Oct 16, 2025
| "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" | ||
| ) | ||
|
|
||
| func setSkipTimestampValidation(tb testing.TB, value bool) { |
Contributor
There was a problem hiding this comment.
was this test failing intermittently before? not sure i understand why the refactor in this PR would have caused the tests to fail where they hadn't before 🤔
Member
Author
There was a problem hiding this comment.
The failure was not caused by this PR. I can reproduce it locally directly from the main branch. 🤔
I ran gotestsum as make run-changed-tests was doing nothing.
❯ ../../.tools/gotestsum --packages="./..." -- -race -timeout 900s -parallel 4 -count=3
∅ internal/metadata
✓ internal/translator (1.647s)
✖ . (3.537s)
=== Failed
=== FAIL: . TestXrayAndW3CSpanTraceResourceExtraction (0.00s)
awsxray_test.go:58:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/awsxray_test.go:58
Error: "[{"name":"/users/junit","id":"0d226912b0c77a4f","start_time":1760650419,"service":{"version":"v1"},"trace_id":"1-68f1650c-ebf18704c6a03c6866925d7d","end_time":1760650509,"http":{"request":{"method":"GET","url":"https://api.example.com/users/junit"},"response":{"status":200,"content_length":0}},"fault":false,"error":false,"throttle":false,"aws":{"xray":{"auto_instrumentation":false},"account_id":"999999998"},"namespace":"remote","parent_id":"1153bc3dcdac2878","type":"subsegment"}
{"name":"signup_aggregator","id":"a1cce7188fd5b544","start_time":1760650419,"service":{"version":"v1"},"trace_id":"1-68f1650c-f848e39bd59de27743b1dea3","end_time":1760650509,"http":{"request":{"x_forwarded_for":true,"method":"GET","url":"https://api.example.com/users/junit","client_ip":"192.168.15.32"},"response":{"status":200,"content_length":0}},"fault":false,"error":false,"throttle":false,"aws":{"xray":{"auto_instrumentation":false},"account_id":"999999998"},"metadata":{"default":{"otel.resource.cloud.account.id":"999999998","otel.resource.cloud.availability_zone":"us-west-1b","otel.resource.cloud.provider":"aws","otel.resource.cloud.region":"us-west-2","otel.resource.container.image.name":"otel/signupaggregator","otel.resource.container.image.tag":"v1","otel.resource.container.name":"signup_aggregator","otel.resource.service.name":"signup_aggregator"}},"parent_id":"f7b0b80664736000"}
]" should have 4 item(s), but has 2
Test: TestXrayAndW3CSpanTraceResourceExtraction
Messages: 4 spans have xray/w3c trace id
=== FAIL: . TestW3CSpanTraceResourceExtraction (0.00s)
awsxray_test.go:64:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/awsxray_test.go:64
Error: "[]" should have 2 item(s), but has 0
Test: TestW3CSpanTraceResourceExtraction
Messages: 2 spans have w3c trace id
=== FAIL: . TestCreateDefaultConfig (0.00s)
factory_test.go:25:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/factory_test.go:25
Error: Not equal:
expected: &awsxrayexporter.Config{AWSSessionSettings:awsutil.AWSSessionSettings{NumberOfWorkers:8, Endpoint:"", RequestTimeoutSeconds:30, MaxRetries:2, NoVerifySSL:false, ProxyAddress:"", Region:"", LocalMode:false, ResourceARN:"", RoleARN:"", ExternalID:""}, IndexedAttributes:[]string(nil), IndexAllAttributes:false, LogGroupNames:[]string(nil), TelemetryConfig:telemetry.Config{Enabled:false, IncludeMetadata:false, Contributors:[]component.ID(nil), Hostname:"", InstanceID:"", ResourceARN:""}, skipTimestampValidation:true}
actual : &awsxrayexporter.Config{AWSSessionSettings:awsutil.AWSSessionSettings{NumberOfWorkers:8, Endpoint:"", RequestTimeoutSeconds:30, MaxRetries:2, NoVerifySSL:false, ProxyAddress:"", Region:"", LocalMode:false, ResourceARN:"", RoleARN:"", ExternalID:""}, IndexedAttributes:[]string(nil), IndexAllAttributes:false, LogGroupNames:[]string(nil), TelemetryConfig:telemetry.Config{Enabled:false, IncludeMetadata:false, Contributors:[]component.ID(nil), Hostname:"", InstanceID:"", ResourceARN:""}, skipTimestampValidation:false}
Diff:
--- Expected
+++ Actual
@@ -25,3 +25,3 @@
},
- skipTimestampValidation: (bool) true
+ skipTimestampValidation: (bool) false
})
Test: TestCreateDefaultConfig
Messages: failed to create default config
=== FAIL: . TestXrayAndW3CSpanTraceResourceExtraction (0.00s)
awsxray_test.go:58:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/awsxray_test.go:58
Error: "[{"name":"/users/junit","id":"b236dfe5ad9cdf1a","start_time":1760650420,"service":{"version":"v1"},"trace_id":"1-68f1650d-fbafea511c2afcd12d12db97","end_time":1760650510,"http":{"request":{"method":"GET","url":"https://api.example.com/users/junit"},"response":{"status":200,"content_length":0}},"fault":false,"error":false,"throttle":false,"aws":{"xray":{"auto_instrumentation":false},"account_id":"999999998"},"namespace":"remote","parent_id":"0774bff62361e3c1","type":"subsegment"}
{"name":"signup_aggregator","id":"a6d7b4df40b42490","start_time":1760650420,"service":{"version":"v1"},"trace_id":"1-68f1650d-421f8106364c110886bab0d2","end_time":1760650510,"http":{"request":{"x_forwarded_for":true,"method":"GET","url":"https://api.example.com/users/junit","client_ip":"192.168.15.32"},"response":{"status":200,"content_length":0}},"fault":false,"error":false,"throttle":false,"aws":{"xray":{"auto_instrumentation":false},"account_id":"999999998"},"metadata":{"default":{"otel.resource.cloud.account.id":"999999998","otel.resource.cloud.availability_zone":"us-west-1b","otel.resource.cloud.provider":"aws","otel.resource.cloud.region":"us-west-2","otel.resource.container.image.name":"otel/signupaggregator","otel.resource.container.image.tag":"v1","otel.resource.container.name":"signup_aggregator","otel.resource.service.name":"signup_aggregator"}},"parent_id":"5b2ae7c011354d24"}
]" should have 4 item(s), but has 2
Test: TestXrayAndW3CSpanTraceResourceExtraction
Messages: 4 spans have xray/w3c trace id
=== FAIL: . TestW3CSpanTraceResourceExtraction (0.00s)
awsxray_test.go:64:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/awsxray_test.go:64
Error: "[]" should have 2 item(s), but has 0
Test: TestW3CSpanTraceResourceExtraction
Messages: 2 spans have w3c trace id
=== FAIL: . TestCreateDefaultConfig (0.00s)
factory_test.go:25:
Error Trace: /repos/opentelemetry-collector-contrib/exporter/awsxrayexporter/factory_test.go:25
Error: Not equal:
expected: &awsxrayexporter.Config{AWSSessionSettings:awsutil.AWSSessionSettings{NumberOfWorkers:8, Endpoint:"", RequestTimeoutSeconds:30, MaxRetries:2, NoVerifySSL:false, ProxyAddress:"", Region:"", LocalMode:false, ResourceARN:"", RoleARN:"", ExternalID:""}, IndexedAttributes:[]string(nil), IndexAllAttributes:false, LogGroupNames:[]string(nil), TelemetryConfig:telemetry.Config{Enabled:false, IncludeMetadata:false, Contributors:[]component.ID(nil), Hostname:"", InstanceID:"", ResourceARN:""}, skipTimestampValidation:true}
actual : &awsxrayexporter.Config{AWSSessionSettings:awsutil.AWSSessionSettings{NumberOfWorkers:8, Endpoint:"", RequestTimeoutSeconds:30, MaxRetries:2, NoVerifySSL:false, ProxyAddress:"", Region:"", LocalMode:false, ResourceARN:"", RoleARN:"", ExternalID:""}, IndexedAttributes:[]string(nil), IndexAllAttributes:false, LogGroupNames:[]string(nil), TelemetryConfig:telemetry.Config{Enabled:false, IncludeMetadata:false, Contributors:[]component.ID(nil), Hostname:"", InstanceID:"", ResourceARN:""}, skipTimestampValidation:false}
Diff:
--- Expected
+++ Actual
@@ -25,3 +25,3 @@
},
- skipTimestampValidation: (bool) true
+ skipTimestampValidation: (bool) false
})
Test: TestCreateDefaultConfig
Messages: failed to create default config
DONE 594 tests, 6 failures in 3.537s
Contributor
|
This PR was marked stale due to lack of activity. It will be closed in 14 days. |
Member
Author
|
/label -stale |
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Run the
make modernizetool.https://pkg.go.dev/golang.org/x/tools/gopls/internal/analysis/modernize