Skip to content

Commit

Permalink
Upgrade from snapshots to reactor 2020.0.10 (#2732)
Browse files Browse the repository at this point in the history
Also defensively wait for UDS client to be replaced like TCP before ensuring metrics generated are sent. Without this, a test was failing locally on osx even though it passed on the CI.

Resolves gh-2721
  • Loading branch information
shakuzen authored Aug 11, 2021
1 parent 9d903b8 commit 9190544
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ subprojects {
runtimeOnly version
}
}
implementation platform('io.projectreactor:reactor-bom:2020.0.+')
implementation platform('io.projectreactor:reactor-bom:2020.0.10')
}
}
}
13 changes: 2 additions & 11 deletions implementations/micrometer-registry-statsd/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,18 @@ plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0'
}

repositories {
// TODO remove when reactor-netty 1.0.10 is released
maven { url 'https://repo.spring.io/snapshot' }
}

dependencies {
api project(':micrometer-core')

implementation 'io.projectreactor:reactor-core'
implementation 'io.projectreactor.netty:reactor-netty-core'
constraints {
// TODO remove when reactor-netty 1.0.10 is released
implementation 'io.projectreactor.netty:reactor-netty-core:1.0.10-SNAPSHOT'
}

testImplementation project(':micrometer-test')
testImplementation 'io.projectreactor:reactor-test'
testImplementation 'ch.qos.logback:logback-classic'
testImplementation 'org.awaitility:awaitility'
// for running tests with UDS on OSX
testImplementation 'io.netty:netty-transport-native-kqueue:4.1.66.Final:osx-x86_64'
// for running tests with UDS on OSX x86-64
testImplementation 'io.netty:netty-transport-native-kqueue:+:osx-x86_64'
}

shadowJar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void resumeSendingMetrics_whenServerIntermittentlyFails(StatsdProtocol protocol)
// For UDP, the first change seems to be lost frequently somehow.
Counter.builder("another.counter").register(meterRegistry).increment();

if (protocol == StatsdProtocol.TCP) {
if (protocol == StatsdProtocol.TCP || protocol == StatsdProtocol.UDS_DATAGRAM) {
await().until(() -> meterRegistry.statsdConnection.get() != firstClient);
}

Expand Down
5 changes: 0 additions & 5 deletions samples/micrometer-samples-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ plugins {
id 'java'
}

repositories {
// TODO remove when reactor-netty 1.0.10 is released
maven { url 'https://repo.spring.io/snapshot' }
}

dependencies {
implementation platform('io.projectreactor:reactor-bom:2020.0.+')

Expand Down

0 comments on commit 9190544

Please sign in to comment.