Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[chore] update core modules #33977

Merged
merged 9 commits into from
Jul 9, 2024

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Jul 9, 2024

Signed-off-by: Pablo Baeyens [email protected]Description:

Updates core modules to open-telemetry/opentelemetry-collector@e7ce1d50fb5e. To do this I had to tidy manually by doing:

make for-all CMD="go mod edit -require=go.opentelemetry.io/collector/internal/[email protected] "
make gotidy

to work around #33954

Link to tracking Issue: Fixes #33954

@mx-psi
Copy link
Member Author

mx-psi commented Jul 9, 2024

Filed #10569 for discussing the rename but I think we should still merge this to unblock core updates

@mx-psi mx-psi merged commit 4d61802 into open-telemetry:main Jul 9, 2024
154 checks passed
@mx-psi mx-psi deleted the mx-psi/update-otel-configtls branch July 9, 2024 17:08
@github-actions github-actions bot added this to the next release milestone Jul 9, 2024
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Jul 11, 2024
Signed-off-by: Pablo Baeyens
<[email protected]>**Description:** <Describe what has
changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

Updates core modules to
open-telemetry/opentelemetry-collector@e7ce1d50fb5e. To do this I had to
tidy manually by doing:

```
make for-all CMD="go mod edit -require=go.opentelemetry.io/collector/internal/[email protected] "
make gotidy
```

to work around open-telemetry#33954

**Link to tracking Issue:** Fixes open-telemetry#33954

---------

Signed-off-by: Pablo Baeyens <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update-otel is blocked on ambiguous import
4 participants