Apache Solr open-source search software
Change up requestHandlerBase (#3415)
Matthew Biscochofcfb995949ee
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.javaindex 6038db647a3..8d51929f7cd 100644--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java@@ -226,39 +226,45 @@ public abstract class RequestHandlerBasevar baseRequestMetric =solrMetricsContext.longCounter("solr_metrics_core_requests", "HTTP Solr request counts");+ var baseErrorRequestMetric =+ solrMetricsContext.longCounter(+ "solr_metrics_core_requests_errors", "HTTP Solr request error counts");+var baseRequestTimeMetric =solrMetricsContext.longHistogram("solr_metrics_core_requests_times", "HTTP Solr request times", "ms");otelRequests =new AttributedLongCounter(- baseRequestMetric,- Attributes.builder().putAll(attributes).put(TYPE_ATTR, "requests").build());+ baseRequestMetric, Attributes.builder().putAll(attributes).build());otelNumServerErrors =new AttributedLongCounter(- baseRequestMetric,+ baseErrorRequestMetric,Attributes.builder().putAll(attributes).put(AttributeKey.stringKey("source"), "server")- .put(TYPE_ATTR, "errors").build());otelNumClientErrors =new AttributedLongCounter(- baseRequestMetric,+ baseErrorRequestMetric,Attributes.builder().putAll(attributes).put(AttributeKey.stringKey("source"), "client")- .put(TYPE_ATTR, "errors").build());otelNumTimeouts =new AttributedLongCounter(- baseRequestMetric,+ baseErrorRequestMetric,Attributes.builder().putAll(attributes).put(TYPE_ATTR, "timeouts").build());otelRequestTimes = new AttributedLongTimer(baseRequestTimeMetric, attributes);+ // NOCOMMIT: Temporary to see metrics+ otelRequests.add(0L);+ otelNumTimeouts.add(0L);+ otelNumClientErrors.add(0L);+ otelNumServerErrors.add(0L);}}diff --git a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.javaindex 6b23c268556..1ea000903cc 100644--- a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java+++ b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java@@ -17,7 +17,6 @@package org.apache.solr.handler;-import static org.apache.solr.metrics.SolrMetricProducer.TYPE_ATTR;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.argThat;import static org.mockito.ArgumentMatchers.eq;@@ -80,11 +79,7 @@ public class RequestHandlerBaseTest extends SolrTestCaseJ4 {verify(mockLongCounter, never()).add(- eq(1L),- argThat(- attrs ->- "errors".equals(attrs.get(TYPE_ATTR))- && "source".equals(attrs.get(AttributeKey.stringKey("client")))));+ eq(1L), argThat(attrs -> "source".equals(attrs.get(AttributeKey.stringKey("client")))));}@Test@@ -95,19 +90,9 @@ public class RequestHandlerBaseTest extends SolrTestCaseJ4 {RequestHandlerBase.processErrorMetricsOnException(e, metrics);verify(mockLongCounter, never())- .add(- eq(1L),- argThat(- attrs ->- "errors".equals(attrs.get(TYPE_ATTR))- && "client".equals(attrs.get(SOURCE_ATTR))));+ .add(eq(1L), argThat(attrs -> "client".equals(attrs.get(SOURCE_ATTR))));verify(mockLongCounter, never())- .add(- eq(1L),- argThat(- attrs ->- "errors".equals(attrs.get(TYPE_ATTR))- && "server".equals(attrs.get(SOURCE_ATTR))));+ .add(eq(1L), argThat(attrs -> "server".equals(attrs.get(SOURCE_ATTR))));}@Test@@ -118,20 +103,10 @@ public class RequestHandlerBaseTest extends SolrTestCaseJ4 {RequestHandlerBase.processErrorMetricsOnException(e, metrics);verify(mockLongCounter, times(1))- .add(- eq(1L),- argThat(- attrs ->- "errors".equals(attrs.get(TYPE_ATTR))- && "client".equals(attrs.get(SOURCE_ATTR))));+ .add(eq(1L), argThat(attrs -> "client".equals(attrs.get(SOURCE_ATTR))));verify(mockLongCounter, never())- .add(- eq(1L),- argThat(- attrs ->- "errors".equals(attrs.get(TYPE_ATTR))- && "server".equals(attrs.get(SOURCE_ATTR))));+ .add(eq(1L), argThat(attrs -> "server".equals(attrs.get(SOURCE_ATTR))));}@Test