This repository was archived by the owner on Sep 21, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 571
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## merge-533 #533 +/- ##
===============================================
- Coverage 80.95% 80.04% -0.91%
+ Complexity 585 584 -1
===============================================
Files 32 33 +1
Lines 2688 2741 +53
Branches 233 233
===============================================
+ Hits 2176 2194 +18
- Misses 372 406 +34
- Partials 140 141 +1 |
👍 |
parberge
reviewed
Apr 20, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't tested anything, but looks good 😀
👍 |
So this should resolve #353 |
👍 |
Maybe before since the other one is way bigger? |
Merge this before. I originally raised it as a pull request to @dspasojevic’s fork. But he suggested I create it as a separate request because it’s easier to merge. |
Sounds good, I'll merge it to a protected branch to run the complete CI. Thanks again! |
pearj
added a commit
to pearj/zalenium
that referenced
this pull request
Apr 25, 2018
Fixes nginx redirect issue with zalando#533
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add a Prometheus
/metrics
endpoint to allow monitoring of the zalenium server, initially the JVM and Jetty metrics. In the future, we would add specific zalenium metrics. This lays down the initial foundation.To enable Prometheus to work, it needed to be integrated into the Jetty server, so AspectJ has been used to access the necessary classes.
Registration of the zalenium specific servlets has been moved into Aspect, so that we get greater control of the URLs that we can use.
I also fixed a bug where the cleanup servlet would crash if it tried to delete files/directories that didn't exist.
Additionally, the Nginx redirect problem has been fixed.
Motivation and Context
This allows us to get greater insight into the performance of zalenium and how it uses resources. Prometheus has become the defacto standard for monitoring kubernetes clusters, so it makes to most sense to use it.
How Has This Been Tested?
I ran few multi-threaded selenium tests and checked the
/metrics
endpoint. I also tested the existing zalenium servlets to ensure they still operated.Types of changes
Checklist: