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

Prepare v0.40.0 #6428

Merged
merged 2 commits into from
Nov 25, 2021
Merged

Conversation

jpkrohling
Copy link
Member

@jpkrohling jpkrohling commented Nov 24, 2021

Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this PR wait until the 0.40.0 tag is completed in core?

@jpkrohling
Copy link
Member Author

jpkrohling commented Nov 24, 2021

Should this PR wait until the 0.40.0 tag is completed in core?

This is the first step in the release doc, I suppose this is only to make sure the current collector core won't break contrib. It does say to get this reviewed/merged though :-)

https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/release.md#releasing-opentelemetry-collector

Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 somewhat surprised this broke the correctness tests

@codeboten
Copy link
Contributor

🤔 somewhat surprised this broke the correctness tests

Ah i see, i missed this change: open-telemetry/opentelemetry-collector@62a6552

@jpkrohling
Copy link
Member Author

I just added a new commit to this PR, fixing the change from GetStateChannel to GetState.

@codeboten
Copy link
Contributor

Looks like the prometheus change broke the tests

panic: test timed out after 5m0s

goroutine 150178 [running]:
testing.(*M).startAlarm.func1()
	/opt/hostedtoolcache/go/1.17.3/x64/src/testing/testing.go:1788 +0xbb
created by time.goFunc
	/opt/hostedtoolcache/go/1.17.3/x64/src/time/sleep.go:180 +0x4a

@jpkrohling
Copy link
Member Author

True, I just restarted the test thinking it was a flaky test, but I need to look deeper into this.

@jpkrohling jpkrohling force-pushed the jpkrohling/core/issue4477 branch 3 times, most recently from 70ccb44 to 258f999 Compare November 25, 2021 09:03
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling jpkrohling force-pushed the jpkrohling/core/issue4477 branch from 258f999 to aa45736 Compare November 25, 2021 09:33
@jpkrohling jpkrohling changed the title Updated core to v0.40.0 candidate Updated core to v0.40.0 Nov 25, 2021
@jpkrohling jpkrohling changed the title Updated core to v0.40.0 Prepare v0.40.0 Nov 25, 2021
@jpkrohling
Copy link
Member Author

I fixed the Prometheus tests and a couple of missing go.mod entries for items in this repo (Memcached, for instance). The other changes are made by the steps listed in the release procedure. Given that I've had approval by @codeboten already, I'm merging this to proceed with the release.

@jpkrohling jpkrohling merged commit bb95489 into open-telemetry:main Nov 25, 2021
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw your message on Slack, wanted to say it looks good even if already merged :)

@jpkrohling
Copy link
Member Author

jpkrohling commented Nov 25, 2021

Thanks! I wasn't sure someone was working today :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prepare contrib release Update contrib to the latest core
4 participants