Skip to content

slack-vitess-r15.0.5: misc required backports, pt. 1#361

Merged
timvaillancourt merged 7 commits intoslack-vitess-r15.0.5from
bp-misc-p1-slack-vitess-r15.0.5
May 22, 2024
Merged

slack-vitess-r15.0.5: misc required backports, pt. 1#361
timvaillancourt merged 7 commits intoslack-vitess-r15.0.5from
bp-misc-p1-slack-vitess-r15.0.5

Conversation

@timvaillancourt
Copy link
Copy Markdown

@timvaillancourt timvaillancourt commented May 21, 2024

Description

Backports:

  1. Add VStreamerCount stat to vttablet vitessio/vitess#11978
  2. Implement the RowsColumnTypeScanType interface in the go sql driver vitessio/vitess#12007
  3. Add Uptime metric vitessio/vitess#12712
  4. Add vstream metrics to vtgate vitessio/vitess#13098

Also a fix for a flaky CI test was added

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

timvaillancourt and others added 4 commits May 21, 2024 22:07
* Add `VStreamersActive` stat to `vttablet`

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Improve desc

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Add PR suggestions

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move to *stats.Gauge

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Single defer

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
* Add `Uptime` metric to `vtgate`+`vttablet`

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* move to go/vt/servenv/status.go

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use nanoseconds for uptime

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move Uptime metrics to servenv.go, remove dupe start time.Time

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use serverStart time.Time

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
…or Vitess in order to get the column types (vitessio#12007)

Signed-off-by: Johan Oskarsson <joskarsson@slack-corp.com>

Signed-off-by: Johan Oskarsson <joskarsson@slack-corp.com>
Co-authored-by: Johan Oskarsson <joskarsson@slack-corp.com>
* Add vstream metrics to vtgate

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>

* Update unit test name and use cell variable

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>

* Reset metrics for TestVStreamsCreatedAndLagMetrics, fix data race issue

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>

---------

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>
@salesforce-cla
Copy link
Copy Markdown

Thanks for the contribution! Before we can merge this, we need @johanoskarsson to sign the Salesforce Inc. Contributor License Agreement.

@github-actions github-actions bot added this to the v15.0.5 milestone May 21, 2024
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt marked this pull request as ready for review May 22, 2024 14:47
@timvaillancourt timvaillancourt requested a review from a team as a code owner May 22, 2024 14:47
@timvaillancourt timvaillancourt merged commit e9875f2 into slack-vitess-r15.0.5 May 22, 2024
@timvaillancourt timvaillancourt deleted the bp-misc-p1-slack-vitess-r15.0.5 branch May 22, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants