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.

Sign up for GitHub

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

Jump to bottom

premain: enable JSON formatted logs if EDG_LOG_FORMAT=json #766

Merged
merged 3 commits into from
Nov 20, 2024
Merged

premain: enable JSON formatted logs if EDG_LOG_FORMAT=json #766

merged 3 commits into from
Nov 20, 2024

Conversation

daniel-weisse
Copy link
Member

Proposed changes

  • Fix two log messages of the marble-injector being incorrectly written at info level instead of error level
  • Enable JSON formatted logging for MarbleRun PreMain in case the EDG_LOG_FORMAT env variable is set to json
    • To ensure all log statements issued by the PreMain are JSON formatted, if enabled, changes to EGo and ERT are also required. ERT logs non JSON messages during bootup, e.g. here, and EGo does the same

Additional info

  • AB#4868

@netlify Netlify
Copy link

netlify bot commented Nov 19, 2024 •
edited
Loading

✅ Deploy Preview for marblerun-docs ready!

Name Link
🔨 Latest commit 1a35095
🔍 Latest deploy log https://app.netlify.com/sites/marblerun-docs/deploys/673de6fe064b860008d51ce0
😎 Deploy Preview https://deploy-preview-766--marblerun-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

thomasten
thomasten requested changes Nov 20, 2024
View reviewed changes
Copy link
Member

@thomasten thomasten left a comment

Choose a reason for hiding this comment

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

I can take care of ERT/EGo

docs/docs/workflows/add-service.md Outdated Show resolved Hide resolved
injector/injector.go Outdated Show resolved Hide resolved
marble/premain/premain.go Outdated Show resolved Hide resolved
thomasten
thomasten approved these changes Nov 20, 2024
View reviewed changes
injector/injector.go Show resolved Hide resolved
@daniel-weisse daniel-weisse merged commit 82ce121 into master Nov 20, 2024
10 checks passed
@daniel-weisse daniel-weisse deleted the dw/premain-json-log branch November 20, 2024 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thomasten thomasten thomasten approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@daniel-weisse @thomasten