From 7651e7c51f7affaff919f97a8c688b831eb86df2 Mon Sep 17 00:00:00 2001 From: Chintan Radia Date: Thu, 15 Jul 2021 13:27:12 +0530 Subject: [PATCH] Fix traces actuator should return json by default (#1997) Fixes gh-1996 Change order of TextOutputFormat enum and give `CONTENT_TYPE_OPENZIPKIN_JSON_V2` highest ordinal value, so that it will be matched first by spring-boot-actuator and in case of default Accept header JSON data will be returned. --- .../sleuth/autoconfig/actuate/TextOutputFormat.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/actuate/TextOutputFormat.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/actuate/TextOutputFormat.java index 4e87ec6cb..80d843252 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/actuate/TextOutputFormat.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/actuate/TextOutputFormat.java @@ -28,15 +28,15 @@ import org.springframework.util.MimeType; */ public enum TextOutputFormat implements Producible { - /** - * OpenZipkin text. - */ - CONTENT_TYPE_OPENZIPKIN_JSON_V2(MediaType.APPLICATION_JSON), - /** * OTLP protobuf format. */ - CONTENT_TYPE_OTLP_PROTOBUF(MediaType.parseMediaType("application/x-protobuf")); + CONTENT_TYPE_OTLP_PROTOBUF(MediaType.parseMediaType("application/x-protobuf")), + + /** + * OpenZipkin text. + */ + CONTENT_TYPE_OPENZIPKIN_JSON_V2(MediaType.APPLICATION_JSON); private final MimeType mimeType;