Merge branch '1.5.x' into 1.6.x

Author: shakuzen

micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpan.java

@@ -169,7 +169,12 @@ public Span remoteIpAndPort(String ip, int port) {
     @Override
     public Span error(Throwable throwable) {
         this.delegate.recordException(throwable);
-        this.delegate.setStatus(StatusCode.ERROR, throwable.getMessage());
+        if (throwable.getMessage() == null) {
+            this.delegate.setStatus(StatusCode.ERROR);
+        }
+        else {
+            this.delegate.setStatus(StatusCode.ERROR, throwable.getMessage());
+        }
         return this;
     }
 

micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/OtelSpanTests.java

@@ -61,6 +61,19 @@ void should_set_status_to_error_when_recording_exception() {
         then(poll.getEvents().get(0).getAttributes().asMap().values()).containsAnyOf("boom!");
     }
 
+    // gh-1320
+    @Test
+    void should_have_empty_description_when_throwable_message_is_null() {
+        OtelSpan otelSpan = new OtelSpan(otelTracer.spanBuilder("foo").startSpan());
+
+        otelSpan.error(new RuntimeException((String) null)).end();
+
+        SpanData poll = arrayListSpanProcessor.getFinishedSpanItems().get(0);
+        then(poll.getStatus()).isEqualTo(StatusData.create(StatusCode.ERROR, ""));
+        then(poll.getEvents()).hasSize(1);
+        then(poll.getEvents().get(0).getAttributes().asMap().values()).contains("java.lang.RuntimeException");
+    }
+
     @Test
     void should_be_equal_when_two_span_delegates_are_equal() {
         Span span = otelTracer.spanBuilder("foo").startSpan();