Merge branch '1.15.x'

Author: jonatan-ivanov

build.gradle

@@ -90,6 +90,7 @@ subprojects {
                     "BadImport",
                     "ClassCanBeStatic",
                     "DefaultCharset",
+                    "EqualsGetClass",
                     "InlineFormatString",
                     "LongDoubleConversion",
                     "MissingOverride",

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java

@@ -370,7 +370,7 @@ private String getDescription() {
         public boolean equals(Object o) {
             if (this == o)
                 return true;
-            if (o == null || getClass() != o.getClass())
+            if (!(o instanceof MetricMetaData))
                 return false;
             MetricMetaData that = (MetricMetaData) o;
             return Objects.equals(dataCase, that.dataCase) && Objects.equals(name, that.name)

micrometer-commons/src/main/java/io/micrometer/common/ImmutableKeyValue.java

@@ -54,7 +54,7 @@ public String getValue() {
     public boolean equals(@Nullable Object o) {
         if (this == o)
             return true;
-        if (o == null || getClass() != o.getClass())
+        if (!(o instanceof ImmutableKeyValue))
             return false;
         KeyValue that = (KeyValue) o;
         return Objects.equals(key, that.getKey()) && Objects.equals(value, that.getValue());

micrometer-core/src/main/java/io/micrometer/core/instrument/ImmutableTag.java

@@ -53,7 +53,7 @@ public String getValue() {
     public boolean equals(@Nullable Object o) {
         if (this == o)
             return true;
-        if (o == null || getClass() != o.getClass())
+        if (!(o instanceof ImmutableTag))
             return false;
         Tag that = (Tag) o;
         return Objects.equals(key, that.getKey()) && Objects.equals(value, that.getValue());

micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java

@@ -351,7 +351,7 @@ public String toString() {
         public boolean equals(@Nullable Object o) {
             if (this == o)
                 return true;
-            if (o == null || getClass() != o.getClass())
+            if (!(o instanceof Id))
                 return false;
             Meter.Id meterId = (Meter.Id) o;
             return name.equals(meterId.name) && tags.equals(meterId.tags);

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationRequestEventListener.java

@@ -123,7 +123,7 @@ public boolean equals(Object o) {
             if (this == o) {
                 return true;
             }
-            if (o == null || getClass() != o.getClass()) {
+            if (!(o instanceof ObservationScopeAndContext)) {
                 return false;
             }
             ObservationScopeAndContext that = (ObservationScopeAndContext) o;

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/hystrix/MicrometerMetricsPublisherThreadPoolTest.java

@@ -131,7 +131,7 @@ public boolean equals(final Object o) {
             if (this == o) {
                 return true;
             }
-            if (o == null || getClass() != o.getClass()) {
+            if (!(o instanceof MeterId)) {
                 return false;
             }
             final MeterId meterId = (MeterId) o;

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java

@@ -58,7 +58,7 @@ public Throwable getCause() {
     public boolean equals(Object o) {
         if (this == o)
             return true;
-        if (o == null || getClass() != o.getClass())
+        if (!(o instanceof LogEvent))
             return false;
         LogEvent logEvent = (LogEvent) o;
         return level == logEvent.level && Objects.equals(message, logEvent.message)

micrometer-test/src/main/java/io/micrometer/core/util/internal/logging/LogEvent.java

@@ -61,7 +61,7 @@ public Throwable getCause() {
     public boolean equals(Object o) {
         if (this == o)
             return true;
-        if (o == null || getClass() != o.getClass())
+        if (!(o instanceof LogEvent))
             return false;
         LogEvent logEvent = (LogEvent) o;
         return level == logEvent.level && Objects.equals(message, logEvent.message)