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.

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

pgwire: avoid mentioning "tenants" in pre-serve metric descriptions #109076

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

knz
Copy link
Contributor

@knz knz commented Aug 19, 2023

Found via #109042.
Epic: CRDB-29380
Release note: None

@knz knz requested review from stevendanna and yuzefovich August 19, 2023 15:37
@knz knz requested review from a team as code owners August 19, 2023 15:37
@blathers-crl
Copy link

blathers-crl bot commented Aug 19, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz changed the title pgwire: avoid mentioning "tenants" in pre-serve metric names pgwire: avoid mentioning "tenants" in pre-serve metric descriptions Aug 19, 2023
@knz knz added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Aug 19, 2023
pkg/sql/pgwire/pre_serve.go Outdated Show resolved Hide resolved
pkg/sql/pgwire/pre_serve.go Outdated Show resolved Hide resolved
pkg/sql/pgwire/pre_serve.go Outdated Show resolved Hide resolved
pkg/sql/pgwire/pre_serve.go Outdated Show resolved Hide resolved
pkg/sql/pgwire/pre_serve.go Outdated Show resolved Hide resolved
Measurement: "Memory",
Unit: metric.Unit_BYTES,
}
MetaPreServeCurBytes = metric.Metadata{
Name: "sql.pre_serve.mem.cur",
Help: "Current memory usage for SQL connections prior to routing the connection to a specific tenant",
Help: "Current memory usage for SQL connections prior to routing the connectionto the target SQL server",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
Help: "Current memory usage for SQL connections prior to routing the connectionto the target SQL server",
Help: "Current memory usage for SQL connections prior to routing the connection to the target SQL server",

Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like this one slipped through still.

Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @stevendanna and @yuzefovich)


pkg/sql/pgwire/pre_serve.go line 42 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…

For consistency with the others, you could do:

		Help:        "Number of SQL connections created prior to routing the connection to the target SQL server",

Done.


pkg/sql/pgwire/pre_serve.go line 48 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…
		Help:        "Number of SQL bytes received prior to routing the connection to the target SQL server",

Done.


pkg/sql/pgwire/pre_serve.go line 54 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…
		Help:        "Number of SQL bytes sent prior to routing the connection to the target SQL server",

Done.


pkg/sql/pgwire/pre_serve.go line 60 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…
		Help:        "Number of SQL connection failures prior to routing the connection to the target SQL server",

Done.


pkg/sql/pgwire/pre_serve.go line 66 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…
		Help:        "Memory usage for SQL connections prior to routing the connection to the target SQL server",

Done.


pkg/sql/pgwire/pre_serve.go line 72 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…
		Help:        "Current memory usage for SQL connections prior to routing the connection to the target SQL server",

Done.

@knz knz requested a review from stevendanna August 21, 2023 07:43
@knz knz force-pushed the 20230819-rename-metrics branch from 045ec15 to 34159b7 Compare August 21, 2023 07:43
Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @stevendanna and @yuzefovich)


pkg/sql/pgwire/pre_serve.go line 72 at r1 (raw file):

Previously, stevendanna (Steven Danna) wrote…

Looks like this one slipped through still.

Indeed. Fixed.

@knz knz force-pushed the 20230819-rename-metrics branch from 34159b7 to 8a26dee Compare August 21, 2023 10:54
Copy link
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

Thanks!

@knz
Copy link
Contributor Author

knz commented Aug 21, 2023

TFYR!

bors r=stevendanna

@craig
Copy link
Contributor

craig bot commented Aug 21, 2023

Build succeeded:

@blathers-crl
Copy link

blathers-crl bot commented Aug 21, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error setting reviewers, but backport branch blathers/backport-release-23.1-109076 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/109122/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. []

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@knz knz deleted the 20230819-rename-metrics branch August 21, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants