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

release-24.2: license: unredact logs written by license enforcer #135016

Merged
merged 1 commit into from
Nov 13, 2024
Merged

release-24.2: license: unredact logs written by license enforcer #135016

merged 1 commit into from
Nov 13, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 12, 2024 •
edited by rafiss
Loading

Backport 1/1 commits from #134875 on behalf of @rafiss.

/cc @cockroachdb/release

This makes it so log messages are not redacted unnecessarily.

  • Use redact.StringBuilder instead of strings.Builder.
  • Avoid using .String() arguments for log.Infof, since strings are always redacted.
  • Mark license type as a redact.SafeValue.

Epic: None
Release note: None

Release justification: low risk change for log redaction

@rafiss
license: unredact logs written by license enforcer
f321fcc 
This makes it so log messages are not redacted unnecessarily.

- Use redact.StringBuilder instead of strings.Builder.
- Avoid using `.String()` arguments for log.Infof, since strings are
  always redacted.
- Mark license type as a redact.SafeValue.

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner November 12, 2024 20:27
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.2-134875 branch from a816805 to f321fcc Compare November 12, 2024 20:27
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Nov 12, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 12, 2024
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 12, 2024
@blathers-crl blathers-crl bot requested a review from spilchen November 12, 2024 20:27
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Dedej-Bergin
Dedej-Bergin approved these changes Nov 12, 2024
View reviewed changes
Copy link
Contributor

@Dedej-Bergin Dedej-Bergin left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @spilchen)

@rafiss rafiss merged commit b977c25 into release-24.2 Nov 13, 2024
19 of 20 checks passed
@rafiss rafiss deleted the blathers/backport-release-24.2-134875 branch November 13, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dedej-Bergin Dedej-Bergin Dedej-Bergin approved these changes

@spilchen spilchen spilchen approved these changes

Assignees

@rafiss rafiss

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @spilchen @Dedej-Bergin @rafiss