fix: OpenTelemetry schema URL panic #2012
Merged
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
disq
commented
Dec 18, 2024
| if schemaURL == "" { | ||
| schemaURL = semconv.SchemaURL | ||
| } | ||
| r, err := resource.Merge( |
Member
Author
There was a problem hiding this comment.
This method always returns r (even with err, which the single value can be ErrSchemaURLConflict) so we could also do if r != nil { return r } panic(err) but in that case the resource's schema URL could be empty.
mnorbury
approved these changes
Dec 18, 2024
Member
|
Is there a reproduction for the panic? Based on the panic stack: The issue is from an old SDK version (introduced in https://github.com/cloudquery/plugin-sdk/pull/1634/files) and fixed via https://github.com/cloudquery/plugin-sdk/pull/1605/files and https://github.com/cloudquery/plugin-sdk/pull/1607/files |
Member
|
OK something doesn't add up as |
erezrokah
approved these changes
Dec 19, 2024
Member
erezrokah
left a comment
erezrokah
left a comment
There was a problem hiding this comment.
OK let's go with this fix though not sure how the mismatch can happen, probably related to the logic in https://github.com/open-telemetry/opentelemetry-go/blob/82c57cb8dd23ab537e60fbd1625bbb88b163f222/sdk/resource/resource.go#L230
kodiakhq bot
pushed a commit
that referenced
this pull request
Dec 19, 2024
🤖 I have created a release *beep* *boop* --- ## [4.72.1](v4.72.0...v4.72.1) (2024-12-19) ### Bug Fixes * **deps:** Update aws-sdk-go-v2 monorepo ([#2007](#2007)) ([7f3818d](7f3818d)) * **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.13.5 ([#2015](#2015)) ([9b6e9f2](9b6e9f2)) * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.26.1 ([#2010](#2010)) ([b12dc10](b12dc10)) * **deps:** Update module golang.org/x/net to v0.33.0 [SECURITY] ([#2014](#2014)) ([7360bd2](7360bd2)) * **deps:** Update module google.golang.org/grpc to v1.69.0 ([#2008](#2008)) ([aae018f](aae018f)) * OpenTelemetry schema URL panic ([#2012](#2012)) ([b616279](b616279)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
resource.Mergereturns an error only when schemas don't match.