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.

Sign up for GitHub

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

Jump to bottom

fix(prometheus): handle metrics with same name but varying tags. #4

Merged
merged 7 commits into from
Jun 29, 2020
Merged

fix(prometheus): handle metrics with same name but varying tags. #4

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06bc875
chore(prometheus): add unit test that fails but reproduces #3
fieldju Jun 29, 2020
82e1688
fix(prometheus): fix #3, IAE thrown when metrics don't have the same …
fieldju Jun 29, 2020
2819e3f
chore(prometheus): add functional and integration tests to prove that…
fieldju Jun 29, 2020
9f5a983
chore: change the supplier to use the copied and mutated registry tha…
fieldju Jun 29, 2020
f56ac0e
chore: remove magic sleep from integration tests for prometheus contr…
fieldju Jun 29, 2020
10df1ee
chore: exclude the ported code for now, with the hope our patch makes…
fieldju Jun 29, 2020
7b61a93
chore: use latest prom container for integration test
fieldju Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ subprojects { subProject ->
dependencies {
compileOnly 'org.projectlombok:lombok:+'
annotationProcessor 'org.projectlombok:lombok:+'
testCompileOnly 'org.projectlombok:lombok:+'
testAnnotationProcessor 'org.projectlombok:lombok:+'

compileOnly(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}")
compileOnly(group: 'com.netflix.spinnaker.kork', name: 'kork-plugins-api', version: "${korkVersion}")
Expand Down Expand Up @@ -108,6 +110,10 @@ subprojects { subProject ->
testImplementation "com.netflix.spinnaker.kork:kork-plugins-spring-api:$korkVersion"
testImplementation "com.netflix.spinnaker.kork:kork-core:${korkVersion}"
testImplementation "com.netflix.spinnaker.kork:kork-web:${korkVersion}"
testImplementation "org.mock-server:mockserver-client-java:5.10.0"
testImplementation "org.mock-server:mockserver-junit-rule:5.10.0"
testImplementation "org.testcontainers:testcontainers:1.14.3"
testImplementation 'io.rest-assured:rest-assured:4.3.0'
}

group = "io.armory.plugins.metrics"
Expand Down
Loading