Skip to content

[chore] Update core dependencies #40452

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

Merged
merged 9 commits into from
Jun 3, 2025
Merged

Conversation

opentelemetrybot
Copy link
Contributor

This PR updates the opentelemetry-collector dependency to the latest release

@jackgopack4
Copy link
Contributor

tests are failing due to open-telemetry/opentelemetry-collector#13134, I can open up another PR off of this one to fix those tests

@mx-psi mx-psi mentioned this pull request Jun 3, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Renames TLSSetting to TLS. Counterpart to
open-telemetry/opentelemetry-collector#13115
@mx-psi
Copy link
Member

mx-psi commented Jun 3, 2025

tests are failing due to open-telemetry/opentelemetry-collector#13134, I can open up another PR off of this one to fix those tests

Sorry I was in the middle of fixing tests myself, I just merged #40455

@mx-psi
Copy link
Member

mx-psi commented Jun 3, 2025

Looks like two commits were used by update-otel, I will file a PR so that it uses a single one

Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

I will approve for the update-otel changes, but since this also has changes I manually authored I want more reviews before merging

@mx-psi
Copy link
Member

mx-psi commented Jun 3, 2025

Okay it looks like three commits were used....

Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

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

still need to fix versions & lint

go.opentelemetry.io/collector/component v1.33.1-0.20250603105141-605011a1fea8
go.opentelemetry.io/collector/component/componenttest v0.127.1-0.20250603105141-605011a1fea8
go.opentelemetry.io/collector/consumer v1.33.1-0.20250603085401-72878a1e9786
go.opentelemetry.io/collector/pdata v1.33.1-0.20250603105141-605011a1fea8
Copy link
Contributor

Choose a reason for hiding this comment

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

looks llike there is some inconsistency re: versions. I believe all of them should be set to either v1.33.1-0.20250603105141-605011a1fea8 or v0.127.1-0.20250603105141-605011a1fea8

go.opentelemetry.io/collector/internal/telemetry v0.127.1-0.20250603105141-605011a1fea8 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.127.1-0.20250603105141-605011a1fea8 // indirect
go.opentelemetry.io/collector/pipeline v0.127.1-0.20250603105141-605011a1fea8 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.127.1-0.20250603112025-e1f670844604 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

- **rg e1f670844604 --glob '*.mod' -l | xargs sd
v0.127.1-0.20250603112025-e1f670844604 v0.127.1-0.20250603105141-60501
1a1fea8**
- **[chore] Make all versions consistent**

<!--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. -->
#### Link to tracking issue
Fixes

<!--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.-->
@mx-psi
Copy link
Member

mx-psi commented Jun 3, 2025

Thanks @jackgopack4, I think this last commit should have fixed those

@songy23
Copy link
Member

songy23 commented Jun 3, 2025

needs make generate

@jackgopack4
Copy link
Contributor

Thanks @jackgopack4, I think this last commit should have fixed those

makes sense, looks like just gofmt/golint issues now

<!--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. -->
#### Link to tracking issue
Fixes

<!--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.-->
Copy link
Contributor

@jackgopack4 jackgopack4 left a comment

Choose a reason for hiding this comment

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

lgtm

@songy23
Copy link
Member

songy23 commented Jun 3, 2025

merging to unblock core collector

@songy23 songy23 merged commit c9e3f1a into main Jun 3, 2025
189 of 191 checks passed
@songy23 songy23 deleted the opentelemetrybot/update-otel-1748949804 branch June 3, 2025 22:50
@github-actions github-actions bot added this to the next release milestone Jun 3, 2025
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.

6 participants