diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricData.java index a3c98a244f3..b2c06175ca9 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricData.java @@ -2,6 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ + package io.opentelemetry.sdk.metrics.data; import static java.util.Objects.requireNonNull; @@ -11,8 +12,8 @@ import javax.annotation.Nullable; /** - * A {@link MetricData} which delegates all methods to another {@link MetricData}. Extend this class to - * modify the {@link MetricData} that will be exported. + * A {@link MetricData} which delegates all methods to another {@link MetricData}. Extend this class + * to modify the {@link MetricData} that will be exported. */ public abstract class DelegatingMetricData implements MetricData { @@ -64,13 +65,13 @@ public boolean equals(@Nullable Object o) { } if (o instanceof MetricData) { MetricData that = (MetricData) o; - return getResource().equals(that.getResource()) && - getInstrumentationScopeInfo().equals(that.getInstrumentationScopeInfo()) && - getName().equals(that.getName()) && - getDescription().equals(that.getDescription()) && - getUnit().equals(that.getUnit()) && - getType().equals(that.getType()) && - getData().equals(that.getData()); + return getResource().equals(that.getResource()) + && getInstrumentationScopeInfo().equals(that.getInstrumentationScopeInfo()) + && getName().equals(that.getName()) + && getDescription().equals(that.getDescription()) + && getUnit().equals(that.getUnit()) + && getType().equals(that.getType()) + && getData().equals(that.getData()); } return false; } @@ -97,14 +98,27 @@ public int hashCode() { @Override public String toString() { - return "DelegatingMetricData{" + - "resource=" + getResource() + ", " + - "instrumentationScopeInfo=" + getInstrumentationScopeInfo() + ", " + - "name=" + getName() + ", " + - "description=" + getDescription() + ", " + - "unit=" + getUnit() + ", " + - "type=" + getType() + ", " + - "data=" + getData() + - "}"; + return "DelegatingMetricData{" + + "resource=" + + getResource() + + ", " + + "instrumentationScopeInfo=" + + getInstrumentationScopeInfo() + + ", " + + "name=" + + getName() + + ", " + + "description=" + + getDescription() + + ", " + + "unit=" + + getUnit() + + ", " + + "type=" + + getType() + + ", " + + "data=" + + getData() + + "}"; } } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricDataTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricDataTest.java index 7361f443015..311955e3b63 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricDataTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/DelegatingMetricDataTest.java @@ -2,6 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ + package io.opentelemetry.sdk.metrics.data; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +34,6 @@ private MetricDataWithCustomDescription(MetricData delegate) { public String getDescription() { return description; } - } @Test @@ -54,6 +54,7 @@ void overrideDelegate() { assertThat(withCustomDescription.getDescription()).isEqualTo("test"); } + @Test void equals() { MetricData metricData = createBasicMetricBuilder().build();