fix compilation

open-telemetry · Jan 10, 2022 · dd57e33 · dd57e33
1 parent 36a2e16
commit dd57e33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/OpenTelemetryMeter.java b/...n/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/OpenTelemetryMeter.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 
 @SuppressWarnings("HashCodeToString")
 final class OpenTelemetryMeter implements Meter, RemovableMeter {
@@ -84,7 +85,7 @@ public void onRemove() {
 
   @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     return MeterEquivalence.equals(this, o);
   }
 

diff --git a/...st/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/LongTaskTimerTest.java b/...st/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/LongTaskTimerTest.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5;
 
+import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
-import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
 
 import io.micrometer.core.instrument.LongTaskTimer;
 import io.micrometer.core.instrument.Metrics;

diff --git a/...t/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MeterTest.java b/...t/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MeterTest.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5;
 
+import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
-import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
 
 import io.micrometer.core.instrument.Measurement;
 import io.micrometer.core.instrument.Meter;