Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fx error by providing optional wrapper for config #30195

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

dustmop
Copy link
Contributor

@dustmop dustmop commented Oct 16, 2024

What does this PR do?

This test still contains a data race, but now it's at least runnable. See the data race using:

go test -tags=otlp,test -race -run TestIntegration

Motivation

Fix issue with fx.

Describe how to test/QA your changes

Code is test only.

Possible Drawbacks / Trade-offs

Additional Notes

This test still contains a data race, but now it's at least runnable. See the data race using:

go test -tags=otlp,test -race -run TestIntegration
@dustmop dustmop added changelog/no-changelog team/opentelemetry OpenTelemetry team qa/done QA done before merge and regressions are covered by tests labels Oct 16, 2024
@dustmop dustmop added this to the 7.59.0 milestone Oct 16, 2024
@dustmop dustmop marked this pull request as ready for review October 16, 2024 18:49
@dustmop dustmop requested a review from a team as a code owner October 16, 2024 18:49
@dustmop dustmop requested a review from songy23 October 16, 2024 18:49
@songy23
Copy link
Member

songy23 commented Oct 16, 2024

The data race is related to an upstream library, see cihub/seelog#182

@dustmop
Copy link
Contributor Author

dustmop commented Oct 17, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Oct 17, 2024

🚂 MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

@dd-devflow
Copy link

dd-devflow bot commented Oct 17, 2024

🚂 MergeQueue: pull request added to the queue

The median merge time in main is 25m.

Use /merge -c to cancel this operation!

@dd-mergequeue dd-mergequeue bot merged commit e9a145c into main Oct 17, 2024
242 checks passed
@dd-mergequeue dd-mergequeue bot deleted the dustin.long/otel-integration-test branch October 17, 2024 15:08
@github-actions github-actions bot modified the milestones: 7.59.0, 7.60.0 Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog qa/done QA done before merge and regressions are covered by tests team/opentelemetry OpenTelemetry team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants