Skip to content

[chore] Fix update-otel#37706

Merged
bogdandrutu merged 4 commits into
open-telemetry:mainfrom
sincejune:fix-update-otel-task
Feb 7, 2025
Merged

[chore] Fix update-otel#37706
bogdandrutu merged 4 commits into
open-telemetry:mainfrom
sincejune:fix-update-otel-task

Conversation

@sincejune
Copy link
Copy Markdown
Contributor

@sincejune sincejune commented Feb 5, 2025

Description

This PR fixed make update-otel to update builder-config.yaml correctly. This is the workflow we update builder-config.yaml files:

  1. MULTIMOD command to update go.mod
  2. updatehelper function to update builder-config.yaml according to the updated go.mod

However, make otelcontribcol/make oteltestbedcol will overwrite the updated go.mod unexpectedly before step 2.
This PR removes the unexpected make otelcontribcol/make oteltestbedcol commands.

cc @mx-psi

Link to tracking issue

n/a

Testing

n/a

Documentation

n/a

@sincejune sincejune requested a review from a team as a code owner February 5, 2025 13:39
@sincejune sincejune requested a review from ChrsMark February 5, 2025 13:39
@sincejune sincejune mentioned this pull request Feb 5, 2025
Merged
songy23
songy23 approved these changes Feb 5, 2025
View reviewed changes
Copy link
Copy Markdown
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.

cc @dmitryax

@songy23 songy23 added the ci-cd CI, CD, testing, build issues label Feb 5, 2025
@sincejune sincejune mentioned this pull request Feb 5, 2025
Merged
bogdandrutu
bogdandrutu previously requested changes Feb 5, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@bogdandrutu bogdandrutu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Please don't see the reason why was done the way was done.

However, make otelcontribcol/make oteltestbedcol will overwrite the updated go.mod unexpectedly before step 2.
This PR removes the unexpected make otelcontribcol/make oteltestbedcol commands.

Without this the go.mod is not available.

@mx-psi
Copy link
Copy Markdown
Member

mx-psi commented Feb 5, 2025

@bogdandrutu Can we fix the workflow first and then look into this issue?

@bogdandrutu
Copy link
Copy Markdown
Member

bogdandrutu commented Feb 5, 2025

@bogdandrutu Can we fix the workflow first and then look into this issue?

Without this I cannot run the make update-otel, I am confused.

@bogdandrutu
Copy link
Copy Markdown
Member

bogdandrutu commented Feb 5, 2025

Let me explain one more time:
In https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/cmd/otelcontribcol you don't have a go.mod, but the updatehelper requires it. So I am not sure how you intend to make this work.

@bogdandrutu bogdandrutu self-requested a review February 5, 2025 18:12
@bogdandrutu bogdandrutu dismissed their stale review February 5, 2025 18:12

I made my point, can move forward if you think this is the right thing

@sincejune
Copy link
Copy Markdown
Contributor Author

sincejune commented Feb 6, 2025

Please don't see the reason why was done the way was done.

However, make otelcontribcol/make oteltestbedcol will overwrite the updated go.mod unexpectedly before step 2.
This PR removes the unexpected make otelcontribcol/make oteltestbedcol commands.

Without this the go.mod is not available.

@bogdandrutu Thanks! Updated the PR according to your feedback. cc @mx-psi @codeboten

@bogdandrutu bogdandrutu merged commit 499df64 into open-telemetry:main Feb 7, 2025
@github-actions github-actions Bot added this to the next release milestone Feb 7, 2025
chengchuanpeng pushed a commit to chengchuanpeng/opentelemetry-collector-contrib that referenced this pull request Feb 8, 2025
@sincejune @chengchuanpeng
[chore] Fix update-otel (open-telemetry#37706)
61211e9 
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR fixed `make update-otel` to update `builder-config.yaml`
correctly. This is the workflow we update `builder-config.yaml` files:
1. `MULTIMOD` command to update `go.mod`
2. `updatehelper` function to update `builder-config.yaml` according to
the updated `go.mod`

However, `make otelcontribcol/make oteltestbedcol` will overwrite the
updated `go.mod` unexpectedly before step 2.
This PR removes the unexpected `make otelcontribcol/make oteltestbedcol`
commands.

cc @mx-psi 
<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
n/a

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->
@sincejune sincejune mentioned this pull request Feb 8, 2025
Merged
github-merge-queue Bot pushed a commit to open-telemetry/opentelemetry-collector that referenced this pull request Feb 10, 2025
@sincejune
[chore] Update version of component/componentattribute to unblock u…
9a4f66a 
…pd… (#12326)

…ate-otel in contrib

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
I was planning to run `update-otel` in contrib repo to test
open-telemetry/opentelemetry-collector-contrib#37706
before a new release. And found that it's blocked by the newly added
`component/componentattribute` module in #12259

This PR update its version to be latest dev to quickly unblock
`update-otel` task.

cc @bogdandrutu @codeboten @djaglowski @mx-psi 

<!-- Issue number if applicable -->
#### Link to tracking issue
n/a

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a
<!--Please delete paragraphs that you did not use before submitting.-->
@sincejune sincejune mentioned this pull request Feb 10, 2025
Merged
mx-psi added a commit that referenced this pull request Feb 11, 2025
@sincejune @mx-psi
[chore] Update otel version (#37808)
b1ba0ef 
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This is a PR to verify the change in #37706: After running `make
update-otel`, `builder-config.yaml` files are correctly updated in this
PR.

Feel free to close this PR if it's too large to review. (I have no
permission to run the `update-otel` GitHub action and have to run it
manually).
cc @bogdandrutu @codeboten @mx-psi @songy23 
<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Relevant to #37703 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Signed-off-by: Chao <chao.weng@appdynamics.com>
Co-authored-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
@sincejune sincejune deleted the fix-update-otel-task branch February 11, 2025 12:59
khushijain21 pushed a commit to khushijain21/opentelemetry-collector-contrib that referenced this pull request Feb 14, 2025
@sincejune @mx-psi @khushijain21
[chore] Update otel version (open-telemetry#37808)
c73e663 
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This is a PR to verify the change in open-telemetry#37706: After running `make
update-otel`, `builder-config.yaml` files are correctly updated in this
PR.

Feel free to close this PR if it's too large to review. (I have no
permission to run the `update-otel` GitHub action and have to run it
manually).
cc @bogdandrutu @codeboten @mx-psi @songy23 
<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Relevant to open-telemetry#37703 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Signed-off-by: Chao <chao.weng@appdynamics.com>
Co-authored-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codeboten codeboten codeboten approved these changes

@bogdandrutu bogdandrutu bogdandrutu approved these changes

@songy23 songy23 songy23 approved these changes

@ChrsMark ChrsMark Awaiting requested review from ChrsMark ChrsMark is a code owner automatically assigned from open-telemetry/collector-contrib-approvers

Assignees

@dashpole dashpole

Labels

ci-cd CI, CD, testing, build issues

Projects

None yet

Milestone

v0.120.0

Development

Successfully merging this pull request may close these issues.

6 participants

@sincejune @mx-psi @bogdandrutu @codeboten @songy23 @dashpole