Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ClassCastException in ObservationRequestTracker.

Browse Source 
This fixes a ClassCastException for CassandraObservationContext when a NoopObservation is returned by the observation registry.

Closes #1541
This commit is contained in:
cfredri4
2024-11-28 11:15:07 +01:00
committed by Mark Paluch
parent 0e271a4eb5
commit e2d07dfca4
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/ObservationRequestTracker.java
View File

@@ -16,6 +16,7 @@
package org.springframework.data.cassandra.observability; package org.springframework.data.cassandra.observability;
import io.micrometer.observation.Observation; import io.micrometer.observation.Observation;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.Observation.Event; import io.micrometer.observation.Observation.Event;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -85,15 +86,19 @@ public enum ObservationRequestTracker implements RequestTracker {
if (request instanceof CassandraObservationSupplier) { if (request instanceof CassandraObservationSupplier) {
Observation observation = ((CassandraObservationSupplier) request).getObservation(); Observation observation = ((CassandraObservationSupplier) request).getObservation();
Context context = observation.getContext();
((CassandraObservationContext) observation.getContext()).setNode(node); if (context instanceof CassandraObservationContext) {
observation.highCardinalityKeyValue( ((CassandraObservationContext) context).setNode(node);
String.format(HighCardinalityKeyNames.NODE_ERROR_TAG.asString(), node.getEndPoint()), error.toString());
observation.event(Event.of(Events.NODE_ERROR.getValue()));
if (log.isDebugEnabled()) { observation.highCardinalityKeyValue(
log.debug("Marking node error for [" + observation + "]"); String.format(HighCardinalityKeyNames.NODE_ERROR_TAG.asString(), node.getEndPoint()), error.toString());
observation.event(Event.of(Events.NODE_ERROR.getValue()));
if (log.isDebugEnabled()) {
log.debug("Marking node error for [" + observation + "]");
}
} }
} }
} }
@@ -105,13 +110,17 @@ public enum ObservationRequestTracker implements RequestTracker {
if (request instanceof CassandraObservationSupplier) { if (request instanceof CassandraObservationSupplier) {
Observation observation = ((CassandraObservationSupplier) request).getObservation(); Observation observation = ((CassandraObservationSupplier) request).getObservation();
Context context = observation.getContext();
((CassandraObservationContext) observation.getContext()).setNode(node); if (context instanceof CassandraObservationContext) {
observation.event(Event.of(Events.NODE_SUCCESS.getValue())); ((CassandraObservationContext) context).setNode(node);
if (log.isDebugEnabled()) { observation.event(Event.of(Events.NODE_SUCCESS.getValue()));
log.debug("Marking node success for [" + observation + "]");
if (log.isDebugEnabled()) {
log.debug("Marking node success for [" + observation + "]");
}
} }
} }
} }