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 NPE in InstrumentedHandler#doStop (Jetty 9, 10, 11) #3379

Merged
merged 1 commit into from May 30, 2023
Merged

Fix NPE in InstrumentedHandler#doStop (Jetty 9, 10, 11) #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions metrics-jetty10/src/main/java/io/dropwizard/metrics/jetty10/InstrumentedHandler.java
View file
Open in desktop
Expand Up @@ -273,9 +273,12 @@ protected void doStop() throws Exception {
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_1M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_5M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_15M));
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(m -> metricRegistry.remove(m));

if (responseCodeMeters != null) {
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(metricRegistry::remove);
}
super.doStop();
}

Expand Down
9 changes: 9 additions & 0 deletions metrics-jetty10/src/test/java/io/dropwizard/metrics/jetty10/InstrumentedHandlerTest.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

import static com.codahale.metrics.annotation.ResponseMeteredLevel.ALL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

public class InstrumentedHandlerTest {
private final HttpClient client = new HttpClient();
Expand Down Expand Up @@ -111,6 +112,14 @@ public void responseTimesAreRecordedForBlockingResponses() throws Exception {
assertResponseTimesValid();
}

@Test
public void doStopDoesNotThrowNPE() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, null, ALL);
handler.setHandler(new TestHandler());

assertThatCode(handler::doStop).doesNotThrowAnyException();
}

@Test
@Ignore("flaky on virtual machines")
public void responseTimesAreRecordedForAsyncResponses() throws Exception {
Expand Down
9 changes: 6 additions & 3 deletions metrics-jetty11/src/main/java/io/dropwizard/metrics/jetty11/InstrumentedHandler.java
View file
Open in desktop
Expand Up @@ -273,9 +273,12 @@ protected void doStop() throws Exception {
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_1M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_5M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_15M));
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(m -> metricRegistry.remove(m));

if (responseCodeMeters != null) {
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(metricRegistry::remove);
}
super.doStop();
}

Expand Down
9 changes: 9 additions & 0 deletions metrics-jetty11/src/test/java/io/dropwizard/metrics/jetty11/InstrumentedHandlerTest.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

import static com.codahale.metrics.annotation.ResponseMeteredLevel.ALL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

public class InstrumentedHandlerTest {
private final HttpClient client = new HttpClient();
Expand Down Expand Up @@ -111,6 +112,14 @@ public void responseTimesAreRecordedForBlockingResponses() throws Exception {
assertResponseTimesValid();
}

@Test
public void doStopDoesNotThrowNPE() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, null, ALL);
handler.setHandler(new TestHandler());

assertThatCode(handler::doStop).doesNotThrowAnyException();
}

@Test
@Ignore("flaky on virtual machines")
public void responseTimesAreRecordedForAsyncResponses() throws Exception {
Expand Down
9 changes: 6 additions & 3 deletions metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java
View file
Open in desktop
Expand Up @@ -281,9 +281,12 @@ protected void doStop() throws Exception {
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_1M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_5M));
metricRegistry.remove(name(prefix, NAME_PERCENT_5XX_15M));
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(m -> metricRegistry.remove(m));

if (responseCodeMeters != null) {
responseCodeMeters.keySet().stream()
.map(sc -> name(getMetricPrefix(), String.format("%d-responses", sc)))
.forEach(metricRegistry::remove);
}
super.doStop();
}

Expand Down
9 changes: 9 additions & 0 deletions metrics-jetty9/src/test/java/com/codahale/metrics/jetty9/InstrumentedHandlerTest.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

import static com.codahale.metrics.annotation.ResponseMeteredLevel.ALL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

public class InstrumentedHandlerTest {
private final HttpClient client = new HttpClient();
Expand Down Expand Up @@ -111,6 +112,14 @@ public void responseTimesAreRecordedForBlockingResponses() throws Exception {
assertResponseTimesValid();
}

@Test
public void doStopDoesNotThrowNPE() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, null, ALL);
handler.setHandler(new TestHandler());

assertThatCode(handler::doStop).doesNotThrowAnyException();
}

@Test
@Ignore("flaky on virtual machines")
public void responseTimesAreRecordedForAsyncResponses() throws Exception {
Expand Down