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 wasmx metrics #13681

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Conversation

casimiro
Copy link
Contributor

@casimiro casimiro commented Sep 16, 2024

Summary

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added core/proxy plugins/prometheus cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/wasm Everything relevant to [proxy-]wasm labels Sep 16, 2024
@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Sep 16, 2024
@casimiro casimiro added the pr/wip A work in progress PR opened to receive feedback label Sep 16, 2024
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch 3 times, most recently from cf4e4c3 to d241e68 Compare September 27, 2024 17:48
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch 2 times, most recently from 9d62b9a to 37604f7 Compare October 9, 2024 21:51
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch from 37604f7 to b60e5bb Compare October 9, 2024 22:25
kong/runloop/wasm.lua Outdated Show resolved Hide resolved
kong/plugins/prometheus/exporter.lua Show resolved Hide resolved
kong/plugins/prometheus/exporter.lua Outdated Show resolved Hide resolved
kong/plugins/prometheus/wasmx.lua Outdated Show resolved Hide resolved
kong/plugins/prometheus/wasmx.lua Outdated Show resolved Hide resolved
kong/plugins/prometheus/wasmx.lua Show resolved Hide resolved
kong/plugins/prometheus/wasmx.lua Outdated Show resolved Hide resolved
kong/plugins/prometheus/wasmx.lua Outdated Show resolved Hide resolved
@flrgh flrgh self-requested a review October 16, 2024 16:39
kong/runloop/wasm.lua Outdated Show resolved Hide resolved
.requirements Outdated Show resolved Hide resolved
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch 2 times, most recently from 81f0148 to 5d995c5 Compare October 23, 2024 11:19
@casimiro casimiro requested review from flrgh and samugi October 23, 2024 14:30
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch 2 times, most recently from 3f444c0 to 636717d Compare October 31, 2024 15:54
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch from 636717d to 793ee47 Compare October 31, 2024 22:31
@team-eng-enablement team-eng-enablement removed the author/community PRs from the open-source community (not Kong Inc) label Nov 4, 2024
@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch from 793ee47 to 7745f0a Compare November 4, 2024 19:43
kong/runloop/wasm.lua Outdated Show resolved Hide resolved
Copy link
Contributor

@flrgh flrgh left a comment

Choose a reason for hiding this comment

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

Thanks for all the work you've put into this!

I left a couple inline comments about small things to address before merge, but it's looking good to me.

@casimiro casimiro force-pushed the feat/prometheus-wasmx-metrics branch from 7745f0a to e5ef88d Compare November 8, 2024 14:33
Copy link
Member

@samugi samugi left a comment

Choose a reason for hiding this comment

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

thanks for addressing the feedback and providing additional details, looks good to me

@flrgh
Copy link
Contributor

flrgh commented Nov 18, 2024

rebasing...

@flrgh flrgh force-pushed the feat/prometheus-wasmx-metrics branch from e5ef88d to 09e0704 Compare November 18, 2024 19:50
@flrgh flrgh added this to the 3.9.0 milestone Nov 18, 2024
@flrgh flrgh changed the title feat(prometheus) add wasmx metrics feat(prometheus): add wasmx metrics Nov 18, 2024
@flrgh flrgh merged commit cc7c373 into master Nov 18, 2024
28 checks passed
@flrgh flrgh deleted the feat/prometheus-wasmx-metrics branch November 18, 2024 20:38
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13681-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13681-to-master-to-upstream
git checkout -b cherry-pick-13681-to-master-to-upstream
ancref=$(git merge-base dcf89f39e85bd91fb7a3798c5a36b5d6f384a264 09e0704dc4964f46cf5f00cb66cff5dc27b82f6f)
git cherry-pick -x $ancref..09e0704dc4964f46cf5f00cb66cff5dc27b82f6f

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 18, 2024
@flrgh flrgh removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/proxy core/wasm Everything relevant to [proxy-]wasm plugins/prometheus pr/wip A work in progress PR opened to receive feedback size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants