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

feat(prometheus) add nginx timer metrics #8387

Merged
merged 4 commits into from
Feb 23, 2022
Merged

Conversation

limkevinkuan
Copy link
Contributor

Summary

This adds gauges to track ngx.timer.running_count() and ngx.timer.pending_count() as requested by @rishabh-gupta2.

Issue reference

Fix #7670

@CLAassistant
Copy link

CLAassistant commented Feb 9, 2022

CLA assistant check
All committers have signed the CLA.

@limkevinkuan limkevinkuan marked this pull request as ready for review February 9, 2022 03:19
Copy link
Member

@hbagdi hbagdi left a comment

Choose a reason for hiding this comment

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

LGTM otherwise.

kong/plugins/prometheus/exporter.lua Outdated Show resolved Hide resolved
@mayocream mayocream self-assigned this Feb 9, 2022
This adds gauges to track ngx.timer.running_count() and ngx.timer.pending_count() as requested in Kong#7670.
The tests were accidentally matching in plain mode so '%d+' was not
understood.
@mayocream mayocream merged commit d02d4b1 into Kong:master Feb 23, 2022
kikito pushed a commit that referenced this pull request Feb 24, 2022
* feat(prometheus) add nginx timer metrics

This adds gauges to track ngx.timer.running_count() and ngx.timer.pending_count() as requested in #7670.

* style(prometheus) rename metrics from current timers to just timers

Per suggestion, to avoid confusion.

* fix(prometheus) fix timer tests failing

The tests were accidentally matching in plain mode so '%d+' was not
understood.

* perf(prometheus) localize ngx timer functions
kikito added a commit that referenced this pull request Feb 24, 2022
Several plugins should be bumped because we made changes to them.

On Kong 3.0.0 we will change this so the bundled plugin versions
coincide with Kong version

Bumped because of new features:
* ACME #8114
* Prometheus #8387

Bumped because of new fixes:
* CORS #8401
* oauth2 #8422
* Datadog #8315
kikito pushed a commit that referenced this pull request Feb 24, 2022
* feat(prometheus) add nginx timer metrics

This adds gauges to track ngx.timer.running_count() and ngx.timer.pending_count() as requested in #7670.

* style(prometheus) rename metrics from current timers to just timers

Per suggestion, to avoid confusion.

* fix(prometheus) fix timer tests failing

The tests were accidentally matching in plain mode so '%d+' was not
understood.

* perf(prometheus) localize ngx timer functions
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.

Support for nginx timer count
6 participants