-
Notifications
You must be signed in to change notification settings - Fork 1.7k
assert: check early in Eventually, EventuallyWithT, and Never #1427
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
assert: check early in Eventually, EventuallyWithT, and Never #1427
Conversation
This PR changes more than what it claims. Please keep it focused on #1424 and move the changes related to the tick separately. Because it seems that runs of the condition will not overlap anymore. |
d4ebae4
to
dc3af0f
Compare
I intend to merge #1395 first. Could you help with your own review now, and we will work on your own changes after the merge? |
assert/assertions_test.go
Outdated
condition := func(t *CollectT) { <-time.After(time.Millisecond) } | ||
|
||
done := make(chan struct{}) | ||
go func() { | ||
defer close(done) | ||
True(t, EventuallyWithT(mockT, condition, 1000*time.Millisecond, 100*time.Millisecond)) | ||
}() | ||
|
||
select { | ||
case <-done: | ||
case <-time.After(10 * time.Millisecond): | ||
Fail(t, `condition not satisfied quickly enough`) | ||
} |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great idea!
assert/assertions_test.go
Outdated
condition := func() bool { <-time.After(time.Millisecond); return true } | ||
|
||
done := make(chan struct{}) | ||
go func() { | ||
defer close(done) | ||
True(t, Eventually(mockT, condition, 1000*time.Millisecond, 100*time.Millisecond)) | ||
}() | ||
|
||
select { | ||
case <-done: | ||
case <-time.After(10 * time.Millisecond): | ||
Fail(t, `condition not satisfied quickly enough`) | ||
} |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
dc3af0f
to
7ec44f8
Compare
// Check that a long running condition doesn't block Eventually. | ||
// See issue 805 (and its long tail of following issues) | ||
func TestEventuallyTimeout(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test isn't new; I just moved it so that all of the Eventually*
tests are grouped together rather than having the Never*
tests in between them
@cszczepaniak I just merged #1481 which uses |
@dolmen sounds good. I don't think that affects this PR, though. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving for visibility
@cszczepaniak Please rebase as this requires to resolve merge conflicts. |
82097f1
to
bae586f
Compare
The test was not correct to begin with and a change in the assert.Eventually implementation exposed the bug: stretchr/testify#1427 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
The tests were not correct to begin with and a change in the assert.Eventually implementation exposed the bug: stretchr/testify#1427 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
* Bump github.com/stretchr/testify from 1.10.0 to 1.11.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix race in Test[TCP|UDP]CollectingProcess_ReceiveDataRecord The tests were not correct to begin with and a change in the assert.Eventually implementation exposed the bug: stretchr/testify#1427 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Antonin Bas <antonin.bas@broadcom.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Antonin Bas <antonin.bas@broadcom.com>
A couple tests are using `assert.Equal()` inside a `require.Eventually()`. `assert.Equal()` will cause the test to fail if the assertion is not met. This conflicts with the intention of retrying the equality check in the test. These tests started failing due to a new behavior in `github.com/stretchr/testify` v1.11.0 that started executing the function passed to `require.Eventually()`/`assert.Eventually()` without any initial delay: stretchr/testify#1427 The tests were previously passing by chance due to the timing of how long `github.com/stretchr/testify` was waiting to try the function in `Eventually()` for the first time. Signed-off-by: Ryan Turner <ryan.turner253@icloud.com>
…nercloud/fleeting-plugin-hetzner!273) This MR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/stretchr/testify](https://github.com/stretchr/testify) | `v1.10.0` -> `v1.11.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>stretchr/testify (github.com/stretchr/testify)</summary> ### [`v1.11.0`](https://github.com/stretchr/testify/releases/tag/v1.11.0) [Compare Source](stretchr/testify@v1.10.0...v1.11.0) #### What's Changed ##### Functional Changes v1.11.0 Includes a number of performance improvements. - Call stack perf change for CallerInfo by [@​mikeauclair](https://github.com/mikeauclair) in [#​1614](stretchr/testify#1614) - Lazily render mock diff output on successful match by [@​mikeauclair](https://github.com/mikeauclair) in [#​1615](stretchr/testify#1615) - assert: check early in Eventually, EventuallyWithT, and Never by [@​cszczepaniak](https://github.com/cszczepaniak) in [#​1427](stretchr/testify#1427) - assert: add IsNotType by [@​bartventer](https://github.com/bartventer) in [#​1730](stretchr/testify#1730) - assert.JSONEq: shortcut if same strings by [@​dolmen](https://github.com/dolmen) in [#​1754](stretchr/testify#1754) - assert.YAMLEq: shortcut if same strings by [@​dolmen](https://github.com/dolmen) in [#​1755](stretchr/testify#1755) - assert: faster and simpler isEmpty using reflect.Value.IsZero by [@​dolmen](https://github.com/dolmen) in [#​1761](stretchr/testify#1761) - suite: faster methods filtering (internal refactor) by [@​dolmen](https://github.com/dolmen) in [#​1758](stretchr/testify#1758) ##### Fixes - assert.ErrorAs: log target type by [@​craig65535](https://github.com/craig65535) in [#​1345](stretchr/testify#1345) - Fix failure message formatting for Positive and Negative asserts in [#​1062](stretchr/testify#1062) - Improve ErrorIs message when error is nil but an error was expected by [@​tsioftas](https://github.com/tsioftas) in [#​1681](stretchr/testify#1681) - fix Subset/NotSubset when calling with mixed input types by [@​siliconbrain](https://github.com/siliconbrain) in [#​1729](stretchr/testify#1729) - Improve ErrorAs failure message when error is nil by [@​ccoVeille](https://github.com/ccoVeille) in [#​1734](stretchr/testify#1734) - mock.AssertNumberOfCalls: improve error msg by [@​3scalation](https://github.com/3scalation) in [#​1743](stretchr/testify#1743) ##### Documentation, Build & CI - docs: Fix typo in README by [@​alexandear](https://github.com/alexandear) in [#​1688](stretchr/testify#1688) - Replace deprecated io/ioutil with io and os by [@​alexandear](https://github.com/alexandear) in [#​1684](stretchr/testify#1684) - Document consequences of calling t.FailNow() by [@​greg0ire](https://github.com/greg0ire) in [#​1710](stretchr/testify#1710) - chore: update docs for Unset [#​1621](stretchr/testify#1621) by [@​techfg](https://github.com/techfg) in [#​1709](stretchr/testify#1709) - README: apply gofmt to examples by [@​alexandear](https://github.com/alexandear) in [#​1687](stretchr/testify#1687) - refactor: use %q and %T to simplify fmt.Sprintf by [@​alexandear](https://github.com/alexandear) in [#​1674](stretchr/testify#1674) - Propose Christophe Colombier (ccoVeille) as approver by [@​brackendawson](https://github.com/brackendawson) in [#​1716](stretchr/testify#1716) - Update documentation for the Error function in assert or require package by [@​architagr](https://github.com/architagr) in [#​1675](stretchr/testify#1675) - assert: remove deprecated build constraints by [@​alexandear](https://github.com/alexandear) in [#​1671](stretchr/testify#1671) - assert: apply gofumpt to internal test suite by [@​ccoVeille](https://github.com/ccoVeille) in [#​1739](stretchr/testify#1739) - CI: fix shebang in .ci.\*.sh scripts by [@​dolmen](https://github.com/dolmen) in [#​1746](stretchr/testify#1746) - assert,require: enable parallel testing on (almost) all top tests by [@​dolmen](https://github.com/dolmen) in [#​1747](stretchr/testify#1747) - suite.Passed: add one more status test report by [@​Ararsa-Derese](https://github.com/Ararsa-Derese) in [#​1706](stretchr/testify#1706) - Add Helper() method in internal mocks and assert.CollectT by [@​dolmen](https://github.com/dolmen) in [#​1423](stretchr/testify#1423) - assert.Same/NotSame: improve usage of Sprintf by [@​ccoVeille](https://github.com/ccoVeille) in [#​1742](stretchr/testify#1742) - mock: enable parallel testing on internal testsuite by [@​dolmen](https://github.com/dolmen) in [#​1756](stretchr/testify#1756) - suite: cleanup use of 'testing' internals at runtime by [@​dolmen](https://github.com/dolmen) in [#​1751](stretchr/testify#1751) - assert: check test failure message for Empty and NotEmpty by [@​ccoVeille](https://github.com/ccoVeille) in [#​1745](stretchr/testify#1745) - deps: fix dependency cycle with objx (again) by [@​dolmen](https://github.com/dolmen) in [#​1567](stretchr/testify#1567) - assert.Empty: comprehensive doc of "Empty"-ness rules by [@​dolmen](https://github.com/dolmen) in [#​1753](stretchr/testify#1753) - doc: improve godoc of top level 'testify' package by [@​dolmen](https://github.com/dolmen) in [#​1760](stretchr/testify#1760) - assert.ErrorAs: simplify retrieving the type name by [@​ccoVeille](https://github.com/ccoVeille) in [#​1740](stretchr/testify#1740) - assert.EqualValues: improve test coverage to 100% by [@​dolmen](https://github.com/dolmen) in [#​1763](stretchr/testify#1763) - suite.Run: simplify running of Setup/TeardownSuite by [@​renzoarreaza](https://github.com/renzoarreaza) in [#​1769](stretchr/testify#1769) - assert.CallerInfo: micro optimization by using LastIndexByte by [@​dolmen](https://github.com/dolmen) in [#​1767](stretchr/testify#1767) - assert.CallerInfo: micro cleanup by [@​dolmen](https://github.com/dolmen) in [#​1768](stretchr/testify#1768) - assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing by [@​dolmen](https://github.com/dolmen) in [#​1766](stretchr/testify#1766) - suite.Run: refactor handling of stats for improved readability by [@​dolmen](https://github.com/dolmen) in [#​1764](stretchr/testify#1764) - tests: improve captureTestingT helper by [@​ccoVeille](https://github.com/ccoVeille) in [#​1741](stretchr/testify#1741) - build(deps): bump actions/checkout from 4 to 5 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​1778](stretchr/testify#1778) #### New Contributors - [@​greg0ire](https://github.com/greg0ire) made their first contribution in [#​1710](stretchr/testify#1710) - [@​techfg](https://github.com/techfg) made their first contribution in [#​1709](stretchr/testify#1709) - [@​mikeauclair](https://github.com/mikeauclair) made their first contribution in [#​1614](stretchr/testify#1614) - [@​cszczepaniak](https://github.com/cszczepaniak) made their first contribution in [#​1427](stretchr/testify#1427) - [@​architagr](https://github.com/architagr) made their first contribution in [#​1675](stretchr/testify#1675) - [@​tsioftas](https://github.com/tsioftas) made their first contribution in [#​1681](stretchr/testify#1681) - [@​siliconbrain](https://github.com/siliconbrain) made their first contribution in [#​1729](stretchr/testify#1729) - [@​bartventer](https://github.com/bartventer) made their first contribution in [#​1730](stretchr/testify#1730) - [@​Ararsa-Derese](https://github.com/Ararsa-Derese) made their first contribution in [#​1706](stretchr/testify#1706) - [@​renzoarreaza](https://github.com/renzoarreaza) made their first contribution in [#​1769](stretchr/testify#1769) - [@​3scalation](https://github.com/3scalation) made their first contribution in [#​1743](stretchr/testify#1743) **Full Changelog**: <stretchr/testify@v1.10.0...v1.11.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjgyLjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/stretchr/testify](https://github.com/stretchr/testify) | `v1.10.0` -> `v1.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>stretchr/testify (github.com/stretchr/testify)</summary> ### [`v1.11.1`](https://github.com/stretchr/testify/releases/tag/v1.11.1) [Compare Source](stretchr/testify@v1.11.0...v1.11.1) This release fixes [#​1785](stretchr/testify#1785) introduced in v1.11.0 where expected argument values implementing the stringer interface (`String() string`) with a method which mutates their value, when passed to mock.Mock.On (`m.On("Method", <expected>).Return()`) or actual argument values passed to mock.Mock.Called may no longer match one another where they previously did match. The behaviour prior to v1.11.0 where the stringer is always called is restored. Future testify releases may not call the stringer method at all in this case. #### What's Changed - Backport [#​1786](stretchr/testify#1786) to release/1.11: mock: revert to pre-v1.11.0 argument matching behavior for mutating stringers by [@​brackendawson](https://github.com/brackendawson) in [#​1788](stretchr/testify#1788) **Full Changelog**: <stretchr/testify@v1.11.0...v1.11.1> ### [`v1.11.0`](https://github.com/stretchr/testify/releases/tag/v1.11.0) [Compare Source](stretchr/testify@v1.10.0...v1.11.0) #### What's Changed ##### Functional Changes v1.11.0 Includes a number of performance improvements. - Call stack perf change for CallerInfo by [@​mikeauclair](https://github.com/mikeauclair) in [#​1614](stretchr/testify#1614) - Lazily render mock diff output on successful match by [@​mikeauclair](https://github.com/mikeauclair) in [#​1615](stretchr/testify#1615) - assert: check early in Eventually, EventuallyWithT, and Never by [@​cszczepaniak](https://github.com/cszczepaniak) in [#​1427](stretchr/testify#1427) - assert: add IsNotType by [@​bartventer](https://github.com/bartventer) in [#​1730](stretchr/testify#1730) - assert.JSONEq: shortcut if same strings by [@​dolmen](https://github.com/dolmen) in [#​1754](stretchr/testify#1754) - assert.YAMLEq: shortcut if same strings by [@​dolmen](https://github.com/dolmen) in [#​1755](stretchr/testify#1755) - assert: faster and simpler isEmpty using reflect.Value.IsZero by [@​dolmen](https://github.com/dolmen) in [#​1761](stretchr/testify#1761) - suite: faster methods filtering (internal refactor) by [@​dolmen](https://github.com/dolmen) in [#​1758](stretchr/testify#1758) ##### Fixes - assert.ErrorAs: log target type by [@​craig65535](https://github.com/craig65535) in [#​1345](stretchr/testify#1345) - Fix failure message formatting for Positive and Negative asserts in [#​1062](stretchr/testify#1062) - Improve ErrorIs message when error is nil but an error was expected by [@​tsioftas](https://github.com/tsioftas) in [#​1681](stretchr/testify#1681) - fix Subset/NotSubset when calling with mixed input types by [@​siliconbrain](https://github.com/siliconbrain) in [#​1729](stretchr/testify#1729) - Improve ErrorAs failure message when error is nil by [@​ccoVeille](https://github.com/ccoVeille) in [#​1734](stretchr/testify#1734) - mock.AssertNumberOfCalls: improve error msg by [@​3scalation](https://github.com/3scalation) in [#​1743](stretchr/testify#1743) ##### Documentation, Build & CI - docs: Fix typo in README by [@​alexandear](https://github.com/alexandear) in [#​1688](stretchr/testify#1688) - Replace deprecated io/ioutil with io and os by [@​alexandear](https://github.com/alexandear) in [#​1684](stretchr/testify#1684) - Document consequences of calling t.FailNow() by [@​greg0ire](https://github.com/greg0ire) in [#​1710](stretchr/testify#1710) - chore: update docs for Unset [#​1621](stretchr/testify#1621) by [@​techfg](https://github.com/techfg) in [#​1709](stretchr/testify#1709) - README: apply gofmt to examples by [@​alexandear](https://github.com/alexandear) in [#​1687](stretchr/testify#1687) - refactor: use %q and %T to simplify fmt.Sprintf by [@​alexandear](https://github.com/alexandear) in [#​1674](stretchr/testify#1674) - Propose Christophe Colombier (ccoVeille) as approver by [@​brackendawson](https://github.com/brackendawson) in [#​1716](stretchr/testify#1716) - Update documentation for the Error function in assert or require package by [@​architagr](https://github.com/architagr) in [#​1675](stretchr/testify#1675) - assert: remove deprecated build constraints by [@​alexandear](https://github.com/alexandear) in [#​1671](stretchr/testify#1671) - assert: apply gofumpt to internal test suite by [@​ccoVeille](https://github.com/ccoVeille) in [#​1739](stretchr/testify#1739) - CI: fix shebang in .ci.\*.sh scripts by [@​dolmen](https://github.com/dolmen) in [#​1746](stretchr/testify#1746) - assert,require: enable parallel testing on (almost) all top tests by [@​dolmen](https://github.com/dolmen) in [#​1747](stretchr/testify#1747) - suite.Passed: add one more status test report by [@​Ararsa-Derese](https://github.com/Ararsa-Derese) in [#​1706](stretchr/testify#1706) - Add Helper() method in internal mocks and assert.CollectT by [@​dolmen](https://github.com/dolmen) in [#​1423](stretchr/testify#1423) - assert.Same/NotSame: improve usage of Sprintf by [@​ccoVeille](https://github.com/ccoVeille) in [#​1742](stretchr/testify#1742) - mock: enable parallel testing on internal testsuite by [@​dolmen](https://github.com/dolmen) in [#​1756](stretchr/testify#1756) - suite: cleanup use of 'testing' internals at runtime by [@​dolmen](https://github.com/dolmen) in [#​1751](stretchr/testify#1751) - assert: check test failure message for Empty and NotEmpty by [@​ccoVeille](https://github.com/ccoVeille) in [#​1745](stretchr/testify#1745) - deps: fix dependency cycle with objx (again) by [@​dolmen](https://github.com/dolmen) in [#​1567](stretchr/testify#1567) - assert.Empty: comprehensive doc of "Empty"-ness rules by [@​dolmen](https://github.com/dolmen) in [#​1753](stretchr/testify#1753) - doc: improve godoc of top level 'testify' package by [@​dolmen](https://github.com/dolmen) in [#​1760](stretchr/testify#1760) - assert.ErrorAs: simplify retrieving the type name by [@​ccoVeille](https://github.com/ccoVeille) in [#​1740](stretchr/testify#1740) - assert.EqualValues: improve test coverage to 100% by [@​dolmen](https://github.com/dolmen) in [#​1763](stretchr/testify#1763) - suite.Run: simplify running of Setup/TeardownSuite by [@​renzoarreaza](https://github.com/renzoarreaza) in [#​1769](stretchr/testify#1769) - assert.CallerInfo: micro optimization by using LastIndexByte by [@​dolmen](https://github.com/dolmen) in [#​1767](stretchr/testify#1767) - assert.CallerInfo: micro cleanup by [@​dolmen](https://github.com/dolmen) in [#​1768](stretchr/testify#1768) - assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing by [@​dolmen](https://github.com/dolmen) in [#​1766](stretchr/testify#1766) - suite.Run: refactor handling of stats for improved readability by [@​dolmen](https://github.com/dolmen) in [#​1764](stretchr/testify#1764) - tests: improve captureTestingT helper by [@​ccoVeille](https://github.com/ccoVeille) in [#​1741](stretchr/testify#1741) - build(deps): bump actions/checkout from 4 to 5 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​1778](stretchr/testify#1778) #### New Contributors - [@​greg0ire](https://github.com/greg0ire) made their first contribution in [#​1710](stretchr/testify#1710) - [@​techfg](https://github.com/techfg) made their first contribution in [#​1709](stretchr/testify#1709) - [@​mikeauclair](https://github.com/mikeauclair) made their first contribution in [#​1614](stretchr/testify#1614) - [@​cszczepaniak](https://github.com/cszczepaniak) made their first contribution in [#​1427](stretchr/testify#1427) - [@​architagr](https://github.com/architagr) made their first contribution in [#​1675](stretchr/testify#1675) - [@​tsioftas](https://github.com/tsioftas) made their first contribution in [#​1681](stretchr/testify#1681) - [@​siliconbrain](https://github.com/siliconbrain) made their first contribution in [#​1729](stretchr/testify#1729) - [@​bartventer](https://github.com/bartventer) made their first contribution in [#​1730](stretchr/testify#1730) - [@​Ararsa-Derese](https://github.com/Ararsa-Derese) made their first contribution in [#​1706](stretchr/testify#1706) - [@​renzoarreaza](https://github.com/renzoarreaza) made their first contribution in [#​1769](stretchr/testify#1769) - [@​3scalation](https://github.com/3scalation) made their first contribution in [#​1743](stretchr/testify#1743) **Full Changelog**: <stretchr/testify@v1.10.0...v1.11.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjgyLjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJLaW5kL0Nob3JlIl19--> <!--start release-notes-assistant--> <!--URL:https://code.forgejo.org/forgejo/runner--> - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/915): <!--number 915 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3N0cmV0Y2hyL3Rlc3RpZnkgdG8gdjEuMTEuMQ==-->Update module github.com/stretchr/testify to v1.11.1<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/915 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org> Co-authored-by: Renovate Bot <bot@kriese.eu> Co-committed-by: Renovate Bot <bot@kriese.eu>
With testify 0.11.0, eventually usage is stricter. stretchr/testify#1427 Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>
* Bump github.com/stretchr/testify from 1.10.0 to 1.11.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix unit tests that improperly use assert.Equal() A couple tests are using `assert.Equal()` inside a `require.Eventually()`. `assert.Equal()` will cause the test to fail if the assertion is not met. This conflicts with the intention of retrying the equality check in the test. These tests started failing due to a new behavior in `github.com/stretchr/testify` v1.11.0 that started executing the function passed to `require.Eventually()`/`assert.Eventually()` without any initial delay: stretchr/testify#1427 The tests were previously passing by chance due to the timing of how long `github.com/stretchr/testify` was waiting to try the function in `Eventually()` for the first time. Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * Fix other usages of Eventually() Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * Update to github.com/stretchr/testify v1.11.1 Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * Use EventuallyWithTf() Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * Use EventuallyWithTf() Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * go mod tidy Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> * Fix other usages of Eventually() Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Ryan Turner <ryan.turner253@icloud.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Turner <ryan.turner253@icloud.com> Co-authored-by: Ryan Turner <rturner3@users.noreply.github.com>
…ted fixes (#42516) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> Updates #42458 to adapt to stretchr/testify#1427 #### Link to tracking issue Fixes #42486 Fixes #42411 <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> Ran each test 100 times locally and made sure it passed
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> Updates #42458 to adapt to stretchr/testify#1427
…take 2) (#9243) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/9241 AssertExistsAndLoadBean has a side effect on its argument. When retrying in a loop, it must use the non modified argument, otherwise it is bound to return the same row as the first failure and render the retry useless. Refs forgejo/forgejo#9236 --- Without this fix it fails 100% of the time locally on testify v1.11 because it runs the test before waiting stretchr/testify#1427 Co-authored-by: Earl Warren <contact@earl-warren.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9243 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
…take 2) (#9242) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/9241 AssertExistsAndLoadBean has a side effect on its argument. When retrying in a loop, it must use the non modified argument, otherwise it is bound to return the same row as the first failure and render the retry useless. Refs forgejo/forgejo#9236 --- Without this fix it fails 100% of the time locally on testify v1.11 because it runs the test before waiting stretchr/testify#1427 Co-authored-by: Earl Warren <contact@earl-warren.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9242 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
The tests were not correct to begin with, and a change in the `assert.Eventually` implementation exposed the bug: stretchr/testify#1427 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
#7448) * fix(deps): update module github.com/stretchr/testify to v1.11.1 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix race conditions in unit tests The tests were not correct to begin with, and a change in the `assert.Eventually` implementation exposed the bug: stretchr/testify#1427 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Antonin Bas <antonin.bas@broadcom.com> Co-author 6855 ed-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Antonin Bas <antonin.bas@broadcom.com>
* [receiver/k8sevents] add scope name & version in logs (#42435) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description logs now report scope name and version <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #42426 <!--Describe what testing was performed and which tests were added.--> #### Testing added a new test `TestScopeNameAndVersion` in `receiver/k8seventsreceiver/k8s_event_to_logdata_test.go` Co-authored-by: Christos Markou <chrismarkou92@gmail.com> * [processor/resourcedetection] Add support for hetzner cloud (#42477) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This PR adds support for resource detection in Hetzner Cloud. I have not added the Hetzner cloud into semantic conventions, but I can open a PR for it. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #42476 <!--Describe what testing was performed and which tests were added.--> #### Testing Added tests to cover most of the cases, and I personally tested on a Hetzner server. ``` 2025-09-03T17:31:23.666+0100 info service@v0.134.0/service.go:211 Starting otelcontribcol... {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribcol", "service.version": "0.134.0-dev"}, "Version": "0.134.0-dev", "NumCPU": 8} 2025-09-03T17:31:23.666+0100 info extensions/extensions.go:41 Starting extensions... {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribcol", "service.version": "0.134.0-dev"}} 2025-09-03T17:31:23.666+0100 info internal/resourcedetection.go:137 began detecting resource information {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribcol", "service.version": "0.134.0-dev"}, "otelcol.component.id": "resourcedetection", "otelcol.component.kind": "processor", "otelcol.pipeline.id": "metrics", "otelcol.signal": "metrics"} 2025-09-03T17:31:23.672+0100 info internal/resourcedetection.go:188 detected resource information {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribcol", "service.version": "0.134.0-dev"}, "otelcol.component.id": "resourcedetection", "otelcol.component.kind": "processor", "otelcol.pipeline.id": "metrics", "otelcol.signal": "metrics", "resource": {"cloud.availability_zone":"nbg1-dc3","cloud.provider":"hetzner","cloud.region":"eu-central","host.id":"30727666","host.name":"vm1"}} 2025-09-03T17:31:23.672+0100 info service@v0.134.0/service.go:234 Everything is ready. Begin running and processing data. {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribc 3843 ol", "service.version": "0.134.0-dev"}} 2025-09-03T17:31:24.673+0100 info Metrics {"resource": {"service.instance.id": "f054fbb3-ad03-4aef-8c7a-1e38550cfec7", "service.name": "otelcontribcol", "service.version": "0.134.0-dev"}, "otelcol.component.id": "debug", "otelcol.component.kind": "exporter", "otelcol.signal": "metrics", "resource metrics": 3, "metrics": 5, "data points": 73} 2025-09-03T17:31:24.673+0100 info ResourceMetrics #0 Resource SchemaURL: https://opentelemetry.io/schemas/1.9.0 Resource attributes: -> cloud.provider: Str(hetzner) -> host.id: Str(30727666) -> host.name: Str(vm1) -> cloud.region: Str(eu-central) -> cloud.availability_zone: Str(nbg1-dc3) ``` <!--Describe the documentation added.--> #### Documentation Updated the `README.md` with this new detector. <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Paulo Dias <paulodias.gm@gmail.com> * Update module github.com/stretchr/testify to v1.11.1 (#42264) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.10.0` -> `v1.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.11.0` -> `v1.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>stretchr/testify (github.com/stretchr/testify)</summary> ### [`v1.11.1`](https://redirect.github.com/stretchr/testify/releases/tag/v1.11.1) [Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.11.0...v1.11.1) This release fixes [#​1785](https://redirect.github.com/stretchr/testify/issues/1785) introduced in v1.11.0 where expected argument values implementing the stringer interface (`String() string`) with a method which mutates their value, when passed to mock.Mock.On (`m.On("Method", <expected>).Return()`) or actual argument values passed to mock.Mock.Called may no longer match one another where they previously did match. The behaviour prior to v1.11.0 where the stringer is always called is restored. Future testify releases may not call the stringer method at all in this case. #### What's Changed - Backport [#​1786](https://redirect.github.com/stretchr/testify/issues/1786) to release/1.11: mock: revert to pre-v1.11.0 argument matching behavior for mutating stringers by [@​brackendawson](https://redirect.github.com/brackendawson) in [#​1788](https://redirect.github.com/stretchr/testify/pull/1788) **Full Changelog**: <https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1> ### [`v1.11.0`](https://redirect.github.com/stretchr/testify/releases/tag/v1.11.0) [Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.10.0...v1.11.0) #### What's Changed ##### Functional Changes v1.11.0 Includes a number of performance improvements. - Call stack perf change for CallerInfo by [@​mikeauclair](https://redirect.github.com/mikeauclair) in [#​1614](https://redirect.github.com/stretchr/testify/pull/1614) - Lazily render mock diff output on successful match by [@​mikeauclair](https://redirect.github.com/mikeauclair) in [#​1615](https://redirect.github.com/stretchr/testify/pull/1615) - assert: check early in Eventually, EventuallyWithT, and Never by [@​cszczepaniak](https://redirect.github.com/cszczepaniak) in [#​1427](https://redirect.github.com/stretchr/testify/pull/1427) - assert: add IsNotType by [@​bartventer](https://redirect.github.com/bartventer) in [#​1730](https://redirect.github.com/stretchr/testify/pull/1730) - assert.JSONEq: shortcut if same strings by [@​dolmen](https://redirect.github.com/dolmen) in [#​1754](https://redirect.github.com/stretchr/testify/pull/1754) - assert.YAMLEq: shortcut if same strings by [@​dolmen](https://redirect.github.com/dolmen) in [#​1755](https://redirect.github.com/stretchr/testify/pull/1755) - assert: faster and simpler isEmpty using reflect.Value.IsZero by [@​dolmen](https://redirect.github.com/dolmen) in [#​1761](https://redirect.github.com/stretchr/testify/pull/1761) - suite: faster methods filtering (internal refactor) by [@​dolmen](https://redirect.github.com/dolmen) in [#​1758](https://redirect.github.com/stretchr/testify/pull/1758) ##### Fixes - assert.ErrorAs: log target type by [@​craig65535](https://redirect.github.com/craig65535) in [#​1345](https://redirect.github.com/stretchr/testify/pull/1345) - Fix failure message formatting for Positive and Negative asserts in [#​1062](https://redirect.github.com/stretchr/testify/pull/1062) - Improve ErrorIs message when error is nil but an error was expected by [@​tsioftas](https://redirect.github.com/tsioftas) in [#​1681](https://redirect.github.com/stretchr/testify/pull/1681) - fix Subset/NotSubset when calling with mixed input types by [@​siliconbrain](https://redirect.github.com/siliconbrain) in [#​1729](https://redirect.github.com/stretchr/testify/pull/1729) - Improve ErrorAs failure message when error is nil by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1734](https://redirect.github.com/stretchr/testify/pull/1734) - mock.AssertNumberOfCalls: improve error msg by [@​3scalation](https://redirect.github.com/3scalation) in [#​1743](https://redirect.github.com/stretchr/testify/pull/1743) ##### Documentation, Build & CI - docs: Fix typo in README by [@​alexandear](https://redirect.github.com/alexandear) in [#​1688](https://redirect.github.com/stretchr/testify/pull/1688) - Replace deprecated io/ioutil with io and os by [@​alexandear](https://redirect.github.com/alexandear) in [#​1684](https://redirect.github.com/stretchr/testify/pull/1684) - Document consequences of calling t.FailNow() by [@​greg0ire](https://redirect.github.com/greg0ire) in [#​1710](https://redirect.github.com/stretchr/testify/pull/1710) - chore: update docs for Unset [#​1621](https://redirect.github.com/stretchr/testify/issues/1621) by [@​techfg](https://redirect.github.com/techfg) in [#​1709](https://redirect.github.com/stretchr/testify/pull/1709) - README: apply gofmt to examples by [@​alexandear](https://redirect.github.com/alexandear) in [#​1687](https://redirect.github.com/stretchr/testify/pull/1687) - refactor: use %q and %T to simplify fmt.Sprintf by [@​alexandear](https://redirect.github.com/alexandear) in [#​1674](https://redirect.github.com/stretchr/testify/pull/1674) - Propose Christophe Colombier (ccoVeille) as approver by [@​brackendawson](https://redirect.github.com/brackendawson) in [#​1716](https://redirect.github.com/stretchr/testify/pull/1716) - Update documentation for the Error function in assert or require package by [@​architagr](https://redirect.github.com/architagr) in [#​1675](https://redirect.github.com/stretchr/testify/pull/1675) - assert: remove deprecated build constraints by [@​alexandear](https://redirect.github.com/alexandear) in [#​1671](https://redirect.github.com/stretchr/testify/pull/1671) - assert: apply gofumpt to internal test suite by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1739](https://redirect.github.com/stretchr/testify/pull/1739) - CI: fix shebang in .ci.\*.sh scripts by [@​dolmen](https://redirect.github.com/dolmen) in [#​1746](https://redirect.github.com/stretchr/testify/pull/1746) - assert,require: enable parallel testing on (almost) all top tests by [@​dolmen](https://redirect.github.com/dolmen) in [#​1747](https://redirect.github.com/stretchr/testify/pull/1747) - suite.Passed: add one more status test report by [@​Ararsa-Derese](https://redirect.github.com/Ararsa-Derese) in [#​1706](https://redirect.github.com/stretchr/testify/pull/1706) - Add Helper() method in internal mocks and assert.CollectT by [@​dolmen](https://redirect.github.com/dolmen) in [#​1423](https://redirect.github.com/stretchr/testify/pull/1423) - assert.Same/NotSame: improve usage of Sprintf by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1742](https://redirect.github.com/stretchr/testify/pull/1742) - mock: enable parallel testing on internal testsuite by [@​dolmen](https://redirect.github.com/dolmen) in [#​1756](https://redirect.github.com/stretchr/testify/pull/1756) - suite: cleanup use of 'testing' internals at runtime by [@​dolmen](https://redirect.github.com/dolmen) in [#​1751](https://redirect.github.com/stretchr/testify/pull/1751) - assert: check test failure message for Empty and NotEmpty by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1745](https://redirect.github.com/stretchr/testify/pull/1745) - deps: fix dependency cycle with objx (again) by [@​dolmen](https://redirect.github.com/dolmen) in [#​1567](https://redirect.github.com/stretchr/testify/pull/1567) - assert.Empty: comprehensive doc of "Empty"-ness rules by [@​dolmen](https://redirect.github.com/dolmen) in [#​1753](https://redirect.github.com/stretchr/testify/pull/1753) - doc: improve godoc of top level 'testify' package by [@​dolmen](https://redirect.github.com/dolmen) in [#​1760](https://redirect.github.com/stretchr/testify/pull/1760) - assert.ErrorAs: simplify retrieving the type name by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1740](https://redirect.github.com/stretchr/testify/pull/1740) - assert.EqualValues: improve test coverage to 100% by [@​dolmen](https://redirect.github.com/dolmen) in [#​1763](https://redirect.github.com/stretchr/testify/pull/1763) - suite.Run: simplify running of Setup/TeardownSuite by [@​renzoarreaza](https://redirect.github.com/renzoarreaza) in [#​1769](https://redirect.github.com/stretchr/testify/pull/1769) - assert.CallerInfo: micro optimization by using LastIndexByte by [@​dolmen](https://redirect.github.com/dolmen) in [#​1767](https://redirect.github.com/stretchr/testify/pull/1767) - assert.CallerInfo: micro cleanup by [@​dolmen](https://redirect.github.com/dolmen) in [#​1768](https://redirect.github.com/stretchr/testify/pull/1768) - assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing by [@​dolmen](https://redirect.github.com/dolmen) in [#​1766](https://redirect.github.com/stretchr/testify/pull/1766) - suite.Run: refactor handling of stats for improved readability by [@​dolmen](https://redirect.github.com/dolmen) in [#​1764](https://redirect.github.com/stretchr/testify/pull/1764) - tests: improve captureTestingT helper by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1741](https://redirect.github.com/stretchr/testify/pull/1741) - build(deps): bump actions/checkout from 4 to 5 by [@​dependabot](https://redirect.github.com/dependabot)\[bot] in [#​1778](https://redirect.github.com/stretchr/testify/pull/1778) #### New Contributors - [@​greg0ire](https://redirect.github.com/greg0ire) made their first contribution in [#​1710](https://redirect.github.com/stretchr/testify/pull/1710) - [@​techfg](https://redirect.github.com/techfg) made their first contribution in [#​1709](https://redirect.github.com/stretchr/testify/pull/1709) - [@​mikeauclair](https://redirect.github.com/mikeauclair) made their first contribution in [#​1614](https://redirect.github.com/stretchr/testify/pull/1614) - [@​cszczepaniak](https://redirect.github.com/cszczepaniak) made their first contribution in [#​1427](https://redirect.github.com/stretchr/testify/pull/1427) - [@​architagr](https://redirect.github.com/architagr) made their first contribution in [#​1675](https://redirect.github.com/stretchr/testify/pull/1675) - [@​tsioftas](https://redirect.github.com/tsioftas) made their first contribution in [#​1681](https://redirect.github.com/stretchr/testify/pull/1681) - [@​siliconbrain](https://redirect.github.com/siliconbrain) made their first contribution in [#​1729](https://redirect.github.com/stretchr/testify/pull/1729) - [@​bartventer](https://redirect.github.com/bartventer) made their first contribution in [#​1730](https://redirect.github.com/stretchr/testify/pull/1730) - [@​Ararsa-Derese](https://redirect.github.com/Ararsa-Derese) made their first contribution in [#​1706](https://redirect.github.com/stretchr/testify/pull/1706) - [@​renzoarreaza](https://redirect.github.com/renzoarreaza) made their first contribution in [#​1769](https://redirect.github.com/stretchr/testify/pull/1769) - [@​3scalation](https://redirect.github.com/3scalation) made their first contribution in [#​1743](https://redirect.github.com/stretchr/testify/pull/1743) **Full Changelog**: <https://github.com/stretchr/testify/compare/v1.10. D37D 0...v1.11.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuOTEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * [chore][receiver/k8sevents] add k8s Event conversion example into README (#42547) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description It would be nice for the users to see a conversion example directly in README, so they have a better understanding about how the conversion works. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42512 Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com> * [exporter/datadog] Add 'exporter.datadogexporter.InferIntervalForDeltaMetrics' feature gate (#42494) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Adds a new `exporter.datadogexporter.InferIntervalForDeltaMetrics` feature gate. This feature gate will set the interval field for OTLP delta metrics when it can be inferred (i.e. when the difference between Timestamp and StartTimestamp is close enough to a whole number of seconds). Relates to [DataDog/opentelemetry-mapping-go/pull/765](https://github.com/DataDog/opentelemetry-mapping-go/pull/765) * Fix datadogexporter integration test (#42553) #### Description Upgrades the `github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil` dependency in the datadog exporter integration test, which fixes the failure in #42513. * Revert "[chore][.github] Add Ubuntu to scoped-test runs" (#42555) Reverts open-telemetry/opentelemetry-collector-contrib#42532 we still need to identify the problem causing this, but this PR changed the behavior of the scoped-test run, which stopped reporting back in. Reverting the change is a possible fix. Running this revert PR to check if reverting helps and identifies for sure that it is the issue. * [chore][cmd/opampsupervisor] Add manual time.Sleep call (#42551) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> Updates #42458 to adapt to https://github.com/stretchr/testify/pull/1427 * [chore] Update core dependencies (#42559) This PR updates the opentelemetry-collector modules to open-telemetry/opentelemetry-collector@3166bac6544faa327ac8d24c14793578701b6fea --------- Signed-off-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * [chore] remove batch from various examples (#42562) This updates existing examples to remove the batch processor to reduce dependency on it. Part of https://github.com/open-telemetry/opentelemetry-collector/issues/13766 Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> * [chore] Prepare release 0.135.0 (#42564) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * [chore] fix broken opencensus links CHANGELOG.md (#42566) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description pins now-removed component announcement links to the tagged version where the components were announced <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/17561312676/job/49878257899?pr=42564 <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.--> * chore(deps): update golang:1.25 docker digest to 0caf875 (#42574) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang | stage | digest | `5502b0e` -> `0caf875` | | golang | final | digest | `5502b0e` -> `0caf875` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [chore][.github] Add ubuntu run to scoped-tests with proper matrix (#42572) Initial change #42532 to add Ubuntu to `scoped-tests` didn't take into account that it was necessary to preserve a job with name `scoped-tests` to satisfy merge requirements. Restores the initial change plus follows the pattern of other GH workflows in the repo that run jobs leveraging strategy/matrix. cc @mx-psi @atoulme * fix(deps): update module github.com/huaweicloud/huaweicloud-sdk-go-v3 to v0.1.167 (#42576) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/huaweicloud/huaweicloud-sdk-go-v3](https://redirect.github.com/huaweicloud/huaweicloud-sdk-go-v3) | `v0.1.166` -> `v0.1.167` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>huaweicloud/huaweicloud-sdk-go-v3 (github.com/huaweicloud/huaweicloud-sdk-go-v3)</summary> ### [`v0.1.167`](https://redirect.github.com/huaweicloud/huaweicloud-sdk-go-v3/releases/tag/v0.1.167) [Compare Source](https://redirect.github.com/huaweicloud/huaweicloud-sdk-go-v3/compare/v0.1.166...v0.1.167) Release 0.1.167 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com> * chore(deps): update github-actions deps (#42575) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/github-script](https://redirect.github.com/actions/github-script) | action | digest | `60a0d83` -> `f28e40c` | | [actions/github-script](https://redirect.github.com/actions/github-script) | action | minor | `v7.0.1` -> `v7.1.0` | | [codecov/codecov-action](https://redirect.github.com/codecov/codecov-action) | action | patch | `v5.5.0` -> `v5.5.1` | | [github/codeql-action](https://redirect.github.com/github/codeql-action) | action | patch | `v3.30.0` -> `v3.30.1` | | [github/codeql-action](https://redirect.github.com/github/codeql-action) | action | digest | `2d92b76` -> `f1f6e5f` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>actions/github-script (actions/github-script)</summary> ### [`v7.1.0`](https://redirect.github.com/actions/github-script/compare/v7.0.1...v7.1.0) [Compare Source](https://redirect.github.com/actions/github-script/compare/v7.0.1...v7.1.0) </details> <details> <summary>codecov/codecov-action (codecov/codecov-action)</summary> ### [`v5.5.1`](https://redirect.github.com/codecov/codecov-action/blob/HEAD/CHANGELOG.md#v551) [Compare Source](https://redirect.github.com/codecov/codecov-action/compare/v5.5.0...v5.5.1) ##### What's Changed - fix: overwrite pr number on fork by [@​thomasrockhu-codecov](https://redirect.github.com/thomasrockhu-codecov) in [#​1871](https://redirect.github.com/codecov/codecov-action/pull/1871) - build(deps): bump actions/checkout from 4.2.2 to 5.0.0 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [#​1868](https://redirect.github.com/codecov/codecov-action/pull/1868) - build(deps): bump github/codeql-action from 3.29.9 to 3.29.11 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [#​1867](https://redirect.github.com/codecov/codecov-action/pull/1867) - fix: update to use local app/ dir by [@​thomasrockhu-codecov](https://redirect.github.com/thomasrockhu-codecov) in [#​1872](https://redirect.github.com/codecov/codecov-action/pull/1872) - docs: fix typo in README by [@​datalater](https://redirect.github.com/datalater) in [#​1866](https://redirect.github.com/codecov/codecov-action/pull/1866) - Document a `codecov-cli` version reference example by [@​webknjaz](https://redirect.github.com/webknjaz) in [#​1774](https://redirect.github.com/codecov/codecov-action/pull/1774) - build(deps): bump github/codeql-action from 3.28.18 to 3.29.9 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [#​1861](https://redirect.github.com/codecov/codecov-action/pull/1861) - build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [#​1833](https://redirect.github.com/codecov/codecov-action/pull/1833) **Full Changelog**: <https://github.com/codecov/codecov-action/compare/v5.5.0..v5.5.1> </details> <details> <summary>github/codeql-action (github/codeql-action)</summary> ### [`v3.30.1`](https://redirect.github.com/github/codeql-action/compare/v3.30.0...v3.30.1) [Compare Source](https://redirect.github.com/github/codeql-action/compare/v3.30.0...v3.30.1) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [cmd/telemetrygen] bump semconv deps (#42567) Updates the semconv for telemetrygen to use 1.37.0 --------- Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com> * fix(deps): update module github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common to v1.1.24 (#42589) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common](https://redirect.github.com/tencentcloud/tencentcloud-sdk-go) | `v1.1.22` -> `v1.1.24` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>tencentcloud/tencentcloud-sdk-go (github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common)</summary> ### [`v1.1.24`](https://redirect.github.com/tencentcloud/tencentcloud-sdk-go/compare/v1.1.23...v1.1.24) [Compare Source](https://redirect.github.com/tencentcloud/tencentcloud-sdk-go/compare/v1.1.23...v1.1.24) ### [`v1.1.23`](https://redirect.github.com/tencentcloud/tencentcloud-sdk-go/compare/v1.1.22...v1.1.23) [Compare Source](https://redirect.github.com/tencentcloud/tencentcloud-sdk-go/compare/v1.1.22...v1.1.23) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update module github.com/prometheus/client_golang to v1.23.2 (#42579) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/prometheus/client_golang](https://redirect.github.com/prometheus/client_golang) | `v1.23.0` -> `v1.23.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus/client_golang (github.com/prometheus/client_golang)</summary> ### [`v1.23.2`](https://redirect.github.com/prometheus/client_golang/releases/tag/v1.23.2): - 2025-09-05 [Compare Source](https://redirect.github.com/prometheus/client_golang/compare/v1.23.1...v1.23.2) This release is made to upgrade to prometheus/common v0.66.1, which drops the dependencies github.com/grafana/regexp and go.uber.org/atomic and replaces gopkg.in/yaml.v2 with go.yaml.in/yaml/v2 (a drop-in replacement). There are no functional changes. <details> <summary>All Changes</summary> - \[release-1.23] Upgrade to prometheus/common\@​v0.66.1 by [@​aknuds1](https://redirect.github.com/aknuds1) in [#​1869](https://redirect.github.com/prometheus/client_golang/pull/1869) - \[release-1.23] Cut v1.23.2 by [@​aknuds1](https://redirect.github.com/aknuds1) in [#​1870](https://redirect.github.com/prometheus/client_golang/pull/1870) </details> **Full Changelog**: <https://github.com/prometheus/client_golang/compare/v1.23.1...v1.23.2> ### [`v1.23.1`](https://redirect.github.com/prometheus/client_golang/releases/tag/v1.23.1): - 2025-09-04 [Compare Source](https://redirect.github.com/prometheus/client_golang/compare/v1.23.0...v1.23.1) This release is made to be compatible with a backwards incompatible API change in prometheus/common v0.66.0. There are no functional changes. <details> <summary>All Changes</summary> * [release-1.23] Upgrade to prometheus/common v0.66 by @​aknuds1 in https://github.com/prometheus/client_golang/pull/1866 * [release-1.23] Cut v1.23.1 by @​aknuds1 in https://github.com/prometheus/client_golang/pull/1867 </details> **Full Changelog**: <https://github.com/prometheus/client_golang/compare/v1.23.0...v1.23.1> </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update module github.com/sap/go-hdb to v1.14.3 (#42583) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/SAP/go-hdb](https://redirect.github.com/SAP/go-hdb) | `v1.14.2` -> `v1.14.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>SAP/go-hdb (github.com/SAP/go-hdb)</summary> ### [`v1.14.3`](https://redirect.github.com/SAP/go-hdb/blob/HEAD/RELEASENOTES.md#v1143) [Compare Source](https://redirect.github.com/SAP/go-hdb/compare/v1.14.2...v1.14.3) - updated dependencies </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Revert "fix(deps): update module github.com/prometheus/client_golang to v1.23.2" (#42592) Reverts open-telemetry/opentelemetry-collector-contrib#42579 * [exporter/awss3] AWS S3 partition timezone config (#42520) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Add `S3PartitionTimezone` config value to be able to change the timezone used for time-based partitioning. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Resolves #42319. <!--Describe what testing was performed and which tests were added.--> #### Testing Updated existing tests to include time location. <!--Describe the documentation added.--> #### Documentation Added new config value to README. <!--Please delete paragraphs that you did not use before submitting.--> --------- Co-authored-by: Antoine Toulme <antoine@toulme.name> * [exporter/elasticsearch] Fix data stream attributes in none mapping mode (#42510) ## Description Fix a bug where the data stream attributes in `none` mapping mode is incorrectly prefixed. ## Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42454. ## Testing Unit tests. --------- Co-authored-by: Vishal Raj <vishal.raj@elastic.co> Co-authored-by: Christos Markou <chrismarkou92@gmail.com> Co-authored-by: Carson Ip <carsonip@users.noreply.github.com> * chore(deps): update golang:1.25 docker digest to d6bdb04 (#42582) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang | stage | digest | `0caf875` -> `d6bdb04` | | golang | final | digest | `0caf875` -> `d6bdb04` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/jackc/pgx/v5 to v5.7.6 (#42577) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/jackc/pgx/v5](https://redirect.github.com/jackc/pgx) | `v5.7.5` -> `v5.7.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>jackc/pgx (github.com/jackc/pgx/v5)</summary> ### [`v5.7.6`](https://redirect.github.com/jackc/pgx/compare/v5.7.5...v5.7.6) [Compare Source](https://redirect.github.com/jackc/pgx/compare/v5.7.5...v5.7.6) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com> * chore(deps): update github-actions deps (#42594) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://redirect.github.com/github/codeql-action) | action | patch | `v3.30.1` -> `v3.30.2` | | [github/codeql-action](https://redirect.github.com/github/codeql-action) | action | digest | `f1f6e5f` -> `d3678e2` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>github/codeql-action (github/codeql-action)</summary> ### [`v3.30.2`](https://redirect.github.com/github/codeql-action/compare/v3.30.1...v3.30.2) [Compare Source](https://redirect.github.com/github/codeql-action/compare/v3.30.1...v3.30.2) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [processor/resourcedetection] run go modernize tool (#42596) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Run the Go [modernize](https://pkg.go.dev/golang.org/x/tools/gopls/internal/analysis/modernize) tool. --------- Signed-off-by: Paulo Dias <paulodias.gm@gmail.com> * [internal/tools] Add support for modernize in Makefile (#42542) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Added a new `modernize` make target to run the Go [modernize](https://pkg.go.dev/golang.org/x/tools/gopls/internal/analysis/modernize) tool. This isn’t part of CI, users need to run it manually when they want to apply modern Go patterns. <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Paulo Dias <paulodias.gm@gmail.com> * [cmd/opampsupervisor] Add support for OpAMP heartbeats (#42533) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This adds support to the supervisor for OpAMP heartbeats. Functionality is implemented in OpAMP Go, only need to set this capability to enable this. <!--Describe what testing was performed and which tests were added.--> #### Testing Added an e2e test to verify heartbeat behavior. <!--Describe the documentation added.--> #### Documentation Updated supervisor readme documentation. * chore(deps): update docker-compose deps (#42603) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [otel/opentelemetry-collector](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases) | minor | `0.133.0` -> `0.135.0` | | [otel/opentelemetry-collector-contrib](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases) | minor | `0.133.0` -> `0.134.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>open-telemetry/opentelemetry-collector-releases (otel/opentelemetry-collector)</summary> ### [`v0.135.0`](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/blob/HEAD/CHANGELOG.md#v01350) [Compare Source](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/compare/v0.134.1...v0.135.0) ### [`v0.134.1`](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/releases/tag/v0.134.1) [Compare Source](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/compare/v0.133.0...v0.134.1) Check the [v0.134.1 contrib changelog](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.134.1) and the [v0.134.1 core changelog](https://redirect.github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.134.1) for changelogs on specific components. #### Changelog - [`1e3852f`](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/commit/1e3852fd04caa17bf46229a6ee4b4ad688d1cf30) \[chore] ignore service.version in comparison ([#​1159](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/issues/1159)) - [`23173dd`](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/commit/23173dd11ca0d3f2dee0491c7173972b1f4e8760) Use correct GORELEASE tags for all the gorelease actions. ([#​1158](https://redirect.github.com/open-telemetry/opentelemetry-collector-releases/issues/1158)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com> * fix(deps): update all github.com/datadog packages (#42604) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/DataDog/datadog-agent/pkg/obfuscate](https://redirect.github.com/DataDog/datadog-agent) | `v0.69.4` -> `v0.70.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-api-client-go/v2](https://redirect.github.com/DataDog/datadog-api-client-go) | `v2.44.0` -> `v2.45.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>DataDog/datadog-api-client-go (github.com/DataDog/datadog-api-client-go/v2)</summary> ### [`v2.45.0`](https://redirect.github.com/DataDog/datadog-api-client-go/releases/tag/v2.45.0) [Compare Source](https://redirect.github.com/DataDog/datadog-api-client-go/compare/v2.44.0...v2.45.0) See ./CHANGELOG.md for details </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * [chore]: Update client_golang to 1.23.2, fixing race in test (#42598) Fixes https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42561 See also: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/42568 Signed-off-by: Owen Williams <owen.williams@grafana.com> --------- Signed-off-by: Owen Williams <owen.williams@grafana.com> * chore(deps): update golang:1.25 docker digest to b773c94 (#42613) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang | stage | digest | `d6bdb04` -> `b773c94` | | golang | final | digest | `d6bdb04` -> `b773c94` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [tailsamplingprocessor] Record cached decisions when record policy (#42535) #### Description Currently, when the record policy feature gate is enabled, and a trace uses a cached sampling decision, we don't record the policy name anywhere. This is not currently possible since the decision cache doesn't store the sampling policy. I plan to submit a few more refactors which will make that possible, but for now it's useful to have _some_ indication of why the trace was sampled, to avoid confusing end users who don't see the attribute for `tailsampling.policy`. * [processor/tailsampling] Expose Sampling Policy interfaces (#42508) #### Description Refactor the tail sampling processor so that the interfaces that define trace data and policy decisions are available publically. This is the first step in allowing extensions to be added to the tail sampling processor to allow custom logic that is not possible/easy to do with OTTL such as pulling information from other sources. #### Link to tracking issue Part of https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31582 #### Testing No behavior changed as this is purely a refactor. All current tests need to continue to pass. * fix(deps): update all github.com/azure packages (#42614) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/Azure/azure-sdk-for-go/sdk/azcore](https://redirect.github.com/Azure/azure-sdk-for-go) | `v1.18.0` -> `v1.19.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/Azure/go-amqp](https://redirect.github.com/Azure/go-amqp) | `v1.4.0` -> `v1.5.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>Azure/go-amqp (github.com/Azure/go-amqp)</summary> ### [`v1.5.0`](https://redirect.github.com/Azure/go-amqp/releases/tag/v1.5.0) [Compare Source](https://redirect.github.com/Azure/go-amqp/compare/v1.4.0...v1.5.0) ##### Features Added - Added support for marshaling and unmarshaling arrays of maps </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update module google.golang.org/protobuf to v1.36.9 (#42602) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [google.golang.org/protobuf](https://redirect.github.com/protocolbuffers/protobuf-go) | `v1.36.8` -> `v1.36.9` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>protocolbuffers/protobuf-go (google.golang.org/protobuf)</summary> ### [`v1.36.9`](https://redirect.github.com/protocolbuffers/protobuf-go/compare/v1.36.8...v1.36.9) [Compare Source](https://redirect.github.com/protocolbuffers/protobuf-go/compare/v1.36.8...v1.36.9) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com> * Deprecate zorkian codepath (#42318) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Removing deprecated zorkian codepath. Previously added a warning: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/42165 <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue (https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/17373) <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.--> * fix(deps): update all opentelemetry-go-contrib packages (#42618) This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [go.opentelemetry.io/contrib/bridges/otelzap](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib) | `v0.12.0` -> `v0.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib) | `v0.62.0` -> `v0.63.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/contrib/otelconf](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib) | `v0.17.0` -> `v0.18.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>open-telemetry/opentelemetry-go-contrib (go.opentelemetry.io/contrib/bridges/otelzap)</summary> ### [`v0.13.0`](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.13.0) [Compare Source](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.12.0...v0.13.0) #### \[0.13.0] - 2020-10-09 #### Added - A Jaeger propagator. ([#​375](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/375)) #### Changed - The `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` package instrumentation no longer accepts a `Tracer` as an argument to the interceptor function. Instead, a new `WithTracerProvider` option is added to configure the `TracerProvider` used when creating the `Tracer` for the instrumentation. ([#​373](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/373)) - The `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` instrumentation now accepts a `TracerProvider` rather than a `Tracer`. ([#​374](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/374)) - Remove `go.opentelemetry.io/otel/sdk` dependency from instrumentation. ([#​381](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/381)) - Use `httpsnoop` in `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux` to ensure `http.ResponseWriter` additional interfaces are preserved. ([#​388](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/388)) ##### Fixed - The `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho.Middleware` no longer sends duplicate errors to the global `ErrorHandler`. ([#​377](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/377), [#​364](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/364)) - The import comment in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` is now correctly quoted. ([#​379](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/379)) - The B3 propagator sets the sample bitmask when the sampling decision is `debug`. ([#​369](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/369)) # Raw changes made between v0.12.0 and v0.13.0 [`af2dfc7`](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/commit/af2dfc7baf3392e81ea4b6938b3a8a5d39cf9db7) Pre release v0.13.0 ([#​391](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/391)) [`a84ddfe`](https://redirect.g…
<!-- * Contributors are encouraged to read our [CONTRIBUTING](/CONTRIBUTING.md) documentation. * Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests. * The pull request: * Should only fix one issue or add one feature at a time. * Must update the test suite for the relevant functionality. * Should pass all status checks before being reviewed or merged. * Commit titles should be prefixed with general area of pull request's change. * Please fill the below sections if possible with relevant information or links. --> ### What does this PR do? Update testify to v1.11.1 https://github.com/stretchr/testify/releases/tag/v1.11.1 ### Motivation Benefit from stretchr/testify#1427 (`assert: check early in Eventually, EventuallyWithT, and Never`). ### Describe how you validated your changes <!-- Validate your changes before merge, ensuring that: * Your PR is tested by static / unit / integrations / e2e tests * Your PR description details which e2e tests cover your changes, if any * The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation. If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge. Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet. --> CI ### Possible Drawbacks / Trade-offs ### Additional Notes <!-- * Anything else we should know when reviewing? * Include benchmarking information here whenever possible. * Include info about alternatives that were considered and why the proposed version was chosen. --> The change means that some assertions now succeed earlier, which can make following assertions fail... I had to fix various tests and increase some timeouts to avoid that. Co-authored-by: pimlu <pimlu@users.noreply.github.com> Co-authored-by: gjulianm <guillermo.julian@datadoghq.com>
var tickC <-chan time.Time | ||
|
||
// Check the condition once first on the initial call. | ||
go checkCond() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@brackendawson I just got impacted in some of our test cases, because the behaviour changes a little here: the checkCond
function was only evaluated after the first tick interval, but that is no longer the case. not sure if that is worth opening an issue though, it also makes sense to check immediately.
(in our case your change pinpointed a race condition in some kubernetes ingress / contour / envoy reconfiguration that we were not aware of 😅 )
Summary
Addresses #1424.
Eventually
andEventuallyWithT
current must always wait at least the polling duration before they can succeed. This PR starts checking the condition immediately. The assertion still fails if the initial check of the condition takes longer than the configured timeout.Changes
Motivation
This will provide a small optimization to callers, because tests can complete more quickly than they did before if conditions are met already.
Related issues