Skip to content

[11.0-stable] backport: Make newlogd keep the original msg text and fields#3733

Merged
eriknordmark merged 2 commits intolf-edge:11.0-stablefrom
europaul:backport/11.0/bring-back-additional-fields-to-logs
Feb 9, 2024
Merged

[11.0-stable] backport: Make newlogd keep the original msg text and fields#3733
eriknordmark merged 2 commits intolf-edge:11.0-stablefrom
europaul:backport/11.0/bring-back-additional-fields-to-logs

Conversation

@europaul
Copy link
Contributor

@europaul europaul commented Feb 5, 2024

No description provided.

…text and fields

Signed-off-by: Paul Gaiduk <paulg@zededa.com>
@europaul europaul requested a review from deitch as a code owner February 5, 2024 21:18
@europaul europaul requested a review from eriknordmark February 5, 2024 21:23
@codecov
Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4972221) 20.30% compared to head (df61816) 20.30%.

Additional details and impacted files
@@             Coverage Diff              @@
##           11.0-stable    #3733   +/-   ##
============================================
  Coverage        20.30%   20.30%           
============================================
  Files              212      212           
  Lines            46071    46071           
============================================
+ Hits              9354     9355    +1     
- Misses           36034    36035    +1     
+ Partials           683      681    -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

LGTM

@eriknordmark
Copy link
Contributor

I see that eden tests are failing due to references to #cloud-config i.e., the tests assume that this support is present in 11.0-stable, which it doesn't seem to be. Are we referring to the wrong version/tag of the eden tests?

@europaul
Copy link
Contributor Author

europaul commented Feb 6, 2024

I see that eden tests are failing due to references to #cloud-config i.e., the tests assume that this support is present in 11.0-stable, which it doesn't seem to be. Are we referring to the wrong version/tag of the eden tests?

Thank you for noticing this @eriknordmark! Although the Eden version is set correctly to use the workflow from release 0.9.2, it still checks out the repository (including test files) from the latest master. I'm gonna look into this and present a fix, but this will probably have nothing to do with this PR.

@eriknordmark
Copy link
Contributor

Thank you for noticing this @eriknordmark! Although the Eden version is set correctly to use the workflow from release 0.9.2, it still checks out the repository (including test files) from the latest master. I'm gonna look into this and present a fix, but this will probably have nothing to do with this PR.

I wonder if there is some fluke because the PR with the idential backport to 10.4-stable didn't trip on this.
I'll re-run eden once it has all failed.

@europaul
Copy link
Contributor Author

europaul commented Feb 7, 2024

Thank you for noticing this @eriknordmark! Although the Eden version is set correctly to use the workflow from release 0.9.2, it still checks out the repository (including test files) from the latest master. I'm gonna look into this and present a fix, but this will probably have nothing to do with this PR.

I wonder if there is some fluke because the PR with the idential backport to 10.4-stable didn't trip on this. I'll re-run eden once it has all failed.

The workflow has changed in 11.0-stable to use the workflow from Eden which works like this

When checking out the repository that triggered a workflow, this defaults to the reference or SHA for that event. Otherwise, uses the default branch.

So since we trigger that workflow from outside it just uses the latest master.

@eriknordmark
Copy link
Contributor

So since we trigger that workflow from outside it just uses the latest master.

Can you check with @uncleDecart if we can come up with a better scheme. He and Avi has just redone the Eden workflows in master and I don't know if that would help or hinder coming up with a scheme for running the correct version of the eden tests for a stable branch. In any case I suspect we will need a general solution to this for future LTS releases.

Copy link
Member

@uncleDecart uncleDecart left a comment

Choose a reason for hiding this comment

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

Trying to re-trigger eden tests 🪄

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

Run eden

Since using a tagged version of Eden doesn't allow for backporting on
Eden's side, we created a branch with a similar name and are now
using that branch in the workflow.

Signed-off-by: Paul Gaiduk <paulg@zededa.com>
@europaul europaul force-pushed the backport/11.0/bring-back-additional-fields-to-logs branch from 755cc61 to df61816 Compare February 9, 2024 10:03
Copy link
Member

@uncleDecart uncleDecart left a comment

Choose a reason for hiding this comment

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

Hadouken 🔥 (running eden test)

Copy link
Member

@uncleDecart uncleDecart left a comment

Choose a reason for hiding this comment

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

🏃 🏃 🏃

@eriknordmark eriknordmark merged commit c092835 into lf-edge:11.0-stable Feb 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants