Skip to content

Add exhaustive metric assertions and flatten histogram tests #20741

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

Closed
Copilot wants to merge 14 commits into from
Closed

Add exhaustive metric assertions and flatten histogram tests #20741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
39724a0
Initial plan
Copilot Oct 19, 2026
7dcec3d
Add composable exact histogram point assertions and adopt across tests
Copilot Oct 19, 2026
d554343
Add histogram wait assertion helper
Copilot Oct 20, 2026
acc6e73
Revise histogram wait API and migrate assertions
Copilot Oct 20, 2026
236c1ad
Require exact histogram metric selection
Copilot Oct 20, 2026
05db1ed
Preserve histogram waiter cardinality semantics
Copilot Oct 20, 2026
d12b933
Replace partial histogram waiters with exhaustive scope assertions
Copilot Oct 20, 2026
cce4a28
Migrate exhaustive metric assertions in tests
Copilot Oct 20, 2026
2911ae3
Migrate selected exhaustive metric assertions
Copilot Oct 20, 2026
0779dda
Migrate selected exhaustive metric assertions
Copilot Oct 20, 2026
c9623eb
Flatten remaining GenAI histogram callbacks
Copilot Oct 20, 2026
a07d46f
Count distinct metric identities in exhaustive assertions
Copilot Oct 20, 2026
0c10a6d
Format metric identity assertions
Copilot Oct 20, 2026
72bfb64
Document exhaustive metric snapshot matching
Copilot Oct 21, 2026
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
13 changes: 5 additions & 8 deletions ...gent/src/test/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.avaje.jex.v3_0;

import static io.opentelemetry.instrumentation.testing.util.MetricAssertions.histogram;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
Expand Down Expand Up @@ -120,14 +121,10 @@ void testHttpRouteMetricWithPathParamResponseSuccessful() {

assertThat(content).isEqualTo(id);
assertThat(response.status().code()).isEqualTo(200);
testing.waitAndAssertMetrics(
testing.waitAndAssertMetricsExactly(
instrumentation,
metric ->
metric
.hasName("http.server.request.duration")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}"))));
histogram(
metric -> metric.hasName("http.server.request.duration"),
point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}")));
}
}
140 changes: 60 additions & 80 deletions .../io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMetricsAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.instrumentation.awslambdaevents.v2_2;

import static io.opentelemetry.instrumentation.testing.util.MetricAssertions.histogram;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
Expand All @@ -14,7 +15,9 @@
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.AWS_SQS;

import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.testing.assertj.HistogramPointAssert;
import io.opentelemetry.sdk.testing.assertj.MetricAssert;
import java.util.function.Consumer;

public class AwsLambdaSqsMetricsAssertions {

Expand Down Expand Up @@ -45,86 +48,63 @@ public static void assertMetrics(
String errorType,
long failedProcessCount,
String failedProcessErrorType) {
testing.waitAndAssertMetrics(
testing.waitAndAssertMetricsExactly(
instrumentationName,
"messaging.process.duration",
metrics ->
metrics.satisfiesExactly(
metric ->
assertThat(metric)
.hasUnit("s")
.hasDescription("Duration of processing operation.")
.hasHistogramSatisfying(
histogram -> {
if (failedProcessCount == 0) {
histogram.hasPointsSatisfying(
point ->
point
.satisfies(
data ->
assertThat(data.getCount())
.isEqualTo(processCount))
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, errorType)));
} else {
histogram.hasPointsSatisfying(
point ->
point
.satisfies(
data ->
assertThat(data.getCount())
.isEqualTo(processCount))
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, errorType)),
point ->
point
.satisfies(
data ->
assertThat(data.getCount())
.isEqualTo(failedProcessCount))
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, failedProcessErrorType)));
}
})));
testing.waitAndAssertMetrics(
instrumentationName,
"messaging.client.consumed.messages",
metrics ->
metrics.satisfiesExactly(
metric ->
assertThat(metric)
.hasUnit("{message}")
.hasDescription(
"Number of messages that were delivered to the application.")
.hasLongSumSatisfying(
sum ->
sum.hasPointsSatisfying(
point ->
point
.hasValue(consumedMessageCount)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, errorType))))));
assertThat(testing.metrics())
.filteredOn(
metric -> metric.getInstrumentationScopeInfo().getName().equals(instrumentationName))
.extracting(MetricData::getName)
.containsExactlyInAnyOrder(
"messaging.process.duration", "messaging.client.consumed.messages");
processingDurationAssertion(
destination, processCount, errorType, failedProcessCount, failedProcessErrorType),
metric ->
metric
.hasName("messaging.client.consumed.messages")
.hasUnit("{message}")
.hasDescription("Number of messages that were delivered to the application.")
.hasLongSumSatisfying(
sum ->
sum.hasPointsSatisfying(
point ->
point
.hasValue(consumedMessageCount)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, errorType)))));
}

private static Consumer<MetricAssert> processingDurationAssertion(
String destination,
long processCount,
String errorType,
long failedProcessCount,
String failedProcessErrorType) {
Consumer<MetricAssert> metricAssertion =
metric ->
metric
.hasName("messaging.process.duration")
.hasUnit("s")
.hasDescription("Duration of processing operation.");
Consumer<HistogramPointAssert> processPoint =
processPointAssertion(processCount, destination, errorType);

if (failedProcessCount == 0) {
return histogram(metricAssertion, processPoint);
}
return histogram(
metricAssertion,
processPoint,
processPointAssertion(failedProcessCount, destination, failedProcessErrorType));
}

private static Consumer<HistogramPointAssert> processPointAssertion(
long processCount, String destination, String errorType) {
return point ->
point
.satisfies(data -> assertThat(data.getCount()).isEqualTo(processCount))
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_OPERATION_NAME, "process"),
equalTo(MESSAGING_SYSTEM, AWS_SQS),
equalTo(MESSAGING_DESTINATION_NAME, destination),
equalTo(ERROR_TYPE, errorType));
}

private AwsLambdaSqsMetricsAssertions() {}
Expand Down
Loading
Loading