Skip to content

Commit

Permalink
Fix IndexOutOfBoundsException in Jetty 9, 10, 11, 12 InstrumentedHandler
Browse files Browse the repository at this point in the history 
Fixes #3911
Refs #3133
Refs #3174
Refs #3175
  • Loading branch information
@joschi
joschi committed Jan 19, 2024
1 parent 2e1a55f commit a509f75
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 111 deletions.
115 changes: 59 additions & 56 deletions metrics-jetty10/src/main/java/io/dropwizard/metrics5/jetty10/InstrumentedHandler.java
View file
Expand Up @@ -170,14 +170,6 @@ protected void doStart() throws Exception {
this.asyncTimeouts = metricRegistry.meter(prefix.resolve(NAME_ASYNC_TIMEOUTS));

this.responseCodeMeters = DETAILED_METER_LEVELS.contains(responseMeteredLevel) ? new ConcurrentHashMap<>() : Collections.emptyMap();
this.responses = COARSE_METER_LEVELS.contains(responseMeteredLevel) ?
Collections.unmodifiableList(Arrays.asList(
metricRegistry.meter(prefix.resolve(NAME_1XX_RESPONSES)), // 1xx
metricRegistry.meter(prefix.resolve(NAME_2XX_RESPONSES)), // 2xx
metricRegistry.meter(prefix.resolve(NAME_3XX_RESPONSES)), // 3xx
metricRegistry.meter(prefix.resolve(NAME_4XX_RESPONSES)), // 4xx
metricRegistry.meter(prefix.resolve(NAME_5XX_RESPONSES)) // 5xx
)) : Collections.emptyList();

this.getRequests = metricRegistry.timer(prefix.resolve(NAME_GET_REQUESTS));
this.postRequests = metricRegistry.timer(prefix.resolve(NAME_POST_REQUESTS));
Expand All @@ -190,54 +182,65 @@ protected void doStart() throws Exception {
this.moveRequests = metricRegistry.timer(prefix.resolve(NAME_MOVE_REQUESTS));
this.otherRequests = metricRegistry.timer(prefix.resolve(NAME_OTHER_REQUESTS));

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_15M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_15M), new RatioGauge() {
@Override
public Ratio getRatio() {
return Ratio.of(responses.get(4).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});

if (COARSE_METER_LEVELS.contains(responseMeteredLevel)) {
this.responses = Collections.unmodifiableList(Arrays.asList(
metricRegistry.meter(prefix.resolve(NAME_1XX_RESPONSES)), // 1xx
metricRegistry.meter(prefix.resolve(NAME_2XX_RESPONSES)), // 2xx
metricRegistry.meter(prefix.resolve(NAME_3XX_RESPONSES)), // 3xx
metricRegistry.meter(prefix.resolve(NAME_4XX_RESPONSES)), // 4xx
metricRegistry.meter(prefix.resolve(NAME_5XX_RESPONSES)) // 5xx
));

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_15M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_15M), new RatioGauge() {
@Override
public Ratio getRatio() {
return Ratio.of(responses.get(4).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});
} else {
this.responses = Collections.emptyList();
}

this.listener = new AsyncAttachingListener();
}
Expand Down
20 changes: 20 additions & 0 deletions metrics-jetty10/src/test/java/io/dropwizard/metrics5/jetty10/InstrumentedHandlerTest.java
View file
Expand Up @@ -24,6 +24,8 @@
import java.util.concurrent.TimeUnit;

import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.ALL;
import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.COARSE;
import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.DETAILED;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;

Expand Down Expand Up @@ -121,6 +123,24 @@ void doStopDoesNotThrowNPE() throws Exception {
assertThatCode(handler::doStop).doesNotThrowAnyException();
}

@Test
public void gaugesAreRegisteredWithResponseMeteredLevelCoarse() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, "coarse", COARSE);
handler.setHandler(new TestHandler());
handler.setName("handler");
handler.doStart();
assertThat(registry.getGauges()).containsKey(MetricName.build("coarse", "handler", "percent-4xx-1m"));
}

@Test
public void gaugesAreNotRegisteredWithResponseMeteredLevelDetailed() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, "detailed", DETAILED);
handler.setHandler(new TestHandler());
handler.setName("handler");
handler.doStart();
assertThat(registry.getGauges()).doesNotContainKey(MetricName.build("detailed", "handler", "percent-4xx-1m"));
}

@Test
@Disabled("flaky on virtual machines")
void responseTimesAreRecordedForAsyncResponses() throws Exception {
Expand Down
114 changes: 59 additions & 55 deletions metrics-jetty11/src/main/java/io/dropwizard/metrics5/jetty11/InstrumentedHandler.java
View file
Expand Up @@ -170,14 +170,6 @@ protected void doStart() throws Exception {
this.asyncTimeouts = metricRegistry.meter(prefix.resolve(NAME_ASYNC_TIMEOUTS));

this.responseCodeMeters = DETAILED_METER_LEVELS.contains(responseMeteredLevel) ? new ConcurrentHashMap<>() : Collections.emptyMap();
this.responses = COARSE_METER_LEVELS.contains(responseMeteredLevel) ?
Collections.unmodifiableList(Arrays.asList(
metricRegistry.meter(prefix.resolve(NAME_1XX_RESPONSES)), // 1xx
metricRegistry.meter(prefix.resolve(NAME_2XX_RESPONSES)), // 2xx
metricRegistry.meter(prefix.resolve(NAME_3XX_RESPONSES)), // 3xx
metricRegistry.meter(prefix.resolve(NAME_4XX_RESPONSES)), // 4xx
metricRegistry.meter(prefix.resolve(NAME_5XX_RESPONSES)) // 5xx
)) : Collections.emptyList();

this.getRequests = metricRegistry.timer(prefix.resolve(NAME_GET_REQUESTS));
this.postRequests = metricRegistry.timer(prefix.resolve(NAME_POST_REQUESTS));
Expand All @@ -190,53 +182,65 @@ protected void doStart() throws Exception {
this.moveRequests = metricRegistry.timer(prefix.resolve(NAME_MOVE_REQUESTS));
this.otherRequests = metricRegistry.timer(prefix.resolve(NAME_OTHER_REQUESTS));

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_15M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_15M), new RatioGauge() {
@Override
public Ratio getRatio() {
return Ratio.of(responses.get(4).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});
if (COARSE_METER_LEVELS.contains(responseMeteredLevel)) {
this.responses = Collections.unmodifiableList(Arrays.asList(
metricRegistry.meter(prefix.resolve(NAME_1XX_RESPONSES)), // 1xx
metricRegistry.meter(prefix.resolve(NAME_2XX_RESPONSES)), // 2xx
metricRegistry.meter(prefix.resolve(NAME_3XX_RESPONSES)), // 3xx
metricRegistry.meter(prefix.resolve(NAME_4XX_RESPONSES)), // 4xx
metricRegistry.meter(prefix.resolve(NAME_5XX_RESPONSES)) // 5xx
));

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_4XX_15M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(3).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_1M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getOneMinuteRate(),
requests.getOneMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_5M), new RatioGauge() {
@Override
protected Ratio getRatio() {
return Ratio.of(responses.get(4).getFiveMinuteRate(),
requests.getFiveMinuteRate());
}
});

metricRegistry.register(prefix.resolve(NAME_PERCENT_5XX_15M), new RatioGauge() {
@Override
public Ratio getRatio() {
return Ratio.of(responses.get(4).getFifteenMinuteRate(),
requests.getFifteenMinuteRate());
}
});
} else {
this.responses = Collections.emptyList();
}

this.listener = new AsyncAttachingListener();
}
Expand Down
20 changes: 20 additions & 0 deletions metrics-jetty11/src/test/java/io/dropwizard/metrics5/jetty11/InstrumentedHandlerTest.java
View file
Expand Up @@ -24,6 +24,8 @@
import java.util.concurrent.TimeUnit;

import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.ALL;
import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.COARSE;
import static io.dropwizard.metrics5.annotation.ResponseMeteredLevel.DETAILED;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;

Expand Down Expand Up @@ -121,6 +123,24 @@ void doStopDoesNotThrowNPE() throws Exception {
assertThatCode(handler::doStop).doesNotThrowAnyException();
}

@Test
public void gaugesAreRegisteredWithResponseMeteredLevelCoarse() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, "coarse", COARSE);
handler.setHandler(new TestHandler());
handler.setName("handler");
handler.doStart();
assertThat(registry.getGauges()).containsKey(MetricName.build("coarse", "handler", "percent-4xx-1m"));
}

@Test
public void gaugesAreNotRegisteredWithResponseMeteredLevelDetailed() throws Exception {
InstrumentedHandler handler = new InstrumentedHandler(registry, "detailed", DETAILED);
handler.setHandler(new TestHandler());
handler.setName("handler");
handler.doStart();
assertThat(registry.getGauges()).doesNotContainKey(MetricName.build("detailed", "handler", "percent-4xx-1m"));
}

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

0 comments on commit a509f75

Please sign in to comment.