From 24837ad948bd00e9fede4d2a1b5677b8dba68c1a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 16 Apr 2026 17:42:33 -0700 Subject: [PATCH] Add `@Nullable` to equalTo value arg --- .../sdk/testing/assertj/OpenTelemetryAssertions.java | 2 +- .../opentelemetry/sdk/testing/assertj/AssertUtilTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertions.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertions.java index 5b50381a352..c5e5f871753 100644 --- a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertions.java +++ b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertions.java @@ -240,7 +240,7 @@ public static AttributeAssertion satisfies( * Returns an {@link AttributeAssertion} that asserts the given {@code key} is present with the * given {@code value}. */ - public static AttributeAssertion equalTo(AttributeKey key, T value) { + public static AttributeAssertion equalTo(AttributeKey key, @Nullable T value) { return AttributeAssertion.create(key, val -> val.isEqualTo(value)); } diff --git a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/AssertUtilTest.java b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/AssertUtilTest.java index afd5941c572..3a29fff3c13 100644 --- a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/AssertUtilTest.java +++ b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/AssertUtilTest.java @@ -59,6 +59,13 @@ void assertAttributesShouldNotThrowIfAllAttributesMatch() { AssertUtil.assertAttributes(ATTRIBUTES, assertions); } + @Test + void assertAttributesShouldNotThrowIfEqualToNullAndAttributeNotSet() { + List assertions = Arrays.asList(equalTo(WARM, null)); + + AssertUtil.assertAttributes(Attributes.empty(), assertions); + } + @Test void assertAttributesExactlyShouldThrowIfNoAttributeMatch() { List assertions = Arrays.asList(equalTo(WARM, false));