Skip to content
This repository has been archived by the owner on Aug 24, 2022. It is now read-only.

update prometheus client library #326

Closed
wants to merge 4 commits into from
Closed

Conversation

idoqo
Copy link
Contributor

@idoqo idoqo commented Mar 7, 2022

Updates prometheus client due to CVE-2022-21698 which causes failure in WhiteSource security checks.

Build: SUBMODULES-2366

@artemgavrilov
Copy link
Contributor

@idoqo CI is failning

Copy link
Contributor

@artemgavrilov artemgavrilov left a comment

Choose a reason for hiding this comment

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

Let's create feature build to make sure that nothing was broken

actions/mysql_query_show_action_test.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
Copy link
Contributor

@ShashankSinha252 ShashankSinha252 left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -55,7 +55,7 @@ func NewMySQLExplainAction(id string, params *agentpb.StartActionRequest_MySQLEx
if params.TlsFiles != nil && params.TlsFiles.Files != nil {
err := tlshelpers.RegisterMySQLCerts(params.TlsFiles.Files)
if err != nil {
log.Error(err)
logrus.Error(err)
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if the move to logrus brings any UX change on binary output front. Let me know if this switch is okay.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I don't think it does either. This was the only place we used it and it wasn't customized in any way. Prometheus' common/log used to be a wrapper around logrus and has been deprecated for a while, it just got removed recently (prometheus/common#306)

@BupycHuk
Copy link
Member

@idoqo please fix merge conflicts

@idoqo
Copy link
Contributor Author

idoqo commented Apr 18, 2022

@idoqo please fix merge conflicts

Actually, main already has the updated package version so I'll go ahead and close this.

@idoqo idoqo closed this Apr 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants