From 6591edd212ffbb7d39f436a9183749cc76ec8fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Korzeniewski?= Date: Mon, 24 Oct 2022 21:39:16 +0200 Subject: [PATCH 1/3] Add toString method to AbstractInstrument --- .../io/opentelemetry/sdk/metrics/AbstractInstrument.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java index cb0c3da9285..b23855caa6d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java @@ -39,4 +39,9 @@ public boolean equals(@Nullable Object o) { public int hashCode() { return descriptor.hashCode(); } + + @Override + public String toString() { + return this.getClass().getSimpleName() + "{" + "descriptor=" + getDescriptor() + '}'; + } } From 65aa08ca3d1f78d47a4525fb9e7fc7cf5dff4648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Korzeniewski?= Date: Tue, 25 Oct 2022 15:04:14 +0200 Subject: [PATCH 2/3] add test for toString method --- .../opentelemetry/sdk/metrics/AbstractInstrumentTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java index 63ca658c971..fb73c437c2b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java @@ -22,6 +22,13 @@ void getValues() { assertThat(testInstrument.getDescriptor()).isSameAs(INSTRUMENT_DESCRIPTOR); } + @Test + void testToString() { + TestInstrument testInstrument = new TestInstrument(INSTRUMENT_DESCRIPTOR); + assertThat(testInstrument.toString()) + .isEqualTo("TestInstrument{descriptor=" + INSTRUMENT_DESCRIPTOR + "}"); + } + private static final class TestInstrument extends AbstractInstrument { TestInstrument(InstrumentDescriptor descriptor) { super(descriptor); From ffdf04e830f9dad8af847fa6da76d7f3fe414207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Korzeniewski?= Date: Tue, 25 Oct 2022 15:05:34 +0200 Subject: [PATCH 3/3] use hasToString assertion for toString test --- .../io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java index fb73c437c2b..55515137e15 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentTest.java @@ -25,8 +25,8 @@ void getValues() { @Test void testToString() { TestInstrument testInstrument = new TestInstrument(INSTRUMENT_DESCRIPTOR); - assertThat(testInstrument.toString()) - .isEqualTo("TestInstrument{descriptor=" + INSTRUMENT_DESCRIPTOR + "}"); + assertThat(testInstrument) + .hasToString("TestInstrument{descriptor=" + INSTRUMENT_DESCRIPTOR + "}"); } private static final class TestInstrument extends AbstractInstrument {