SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional information on deprecations; removed TraceMessageHeaders; fixes gh-1785

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-26 12:32:22 +01:00
parent f8245ac769
commit b6dc1b90d7
2 changed files with 4 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/reactor/SleuthReactorProperties.java
View File

@@ -87,14 +87,16 @@ public class SleuthReactorProperties {
public enum InstrumentationType {
/**
* Wraps each operator in a Sleuth representation.
* Decorates on each operator, will be less performing, but logging will always
* contain the tracing entries in each operator.
* @deprecated to be removed in Sleuth 4.0.0
*/
@Deprecated
DECORATE_ON_EACH,
/**
* Wraps only the last operator in Sleuth representation.
* Decorates on last operator, will be more performing, but logging might not
* always contain the tracing entries.
* @deprecated to be removed in Sleuth 4.0.0
*/
@Deprecated

70
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessageHeaders.java
View File

@@ -1,70 +0,0 @@
/*
* Copyright 2013-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.instrument.messaging;
import java.util.Arrays;
import java.util.List;
/**
* Contains trace related messaging headers. The deprecated headers contained `-` which
* for example in the JMS specs is invalid. That's why the public constants in this class
* represent the valid names for the tracing headers.
*
* @author Marcin Grzejszczak
* @since 1.0.4
* @deprecated Since 3.0 these headers should not be used anymore as "b3" is sent instead
*/
@Deprecated
public final class TraceMessageHeaders {
/**
* Span ID message header name.
*/
public static final String SPAN_ID_NAME = "spanId";
/**
* Span sampled message header name.
*/
public static final String SAMPLED_NAME = "spanSampled";
/**
* Parent span ID message header name.
*/
public static final String PARENT_ID_NAME = "spanParentSpanId";
/**
* Trace ID message header name.
*/
public static final String TRACE_ID_NAME = "spanTraceId";
/**
* Span name message header name.
*/
public static final String SPAN_NAME_NAME = "spanName";
/**
* Span flags message header name.
*/
public static final String SPAN_FLAGS_NAME = "spanFlags";
static List<String> HEADERS = Arrays.asList(SAMPLED_NAME, SPAN_FLAGS_NAME, SPAN_ID_NAME, SPAN_NAME_NAME,
TRACE_ID_NAME, PARENT_ID_NAME);
private TraceMessageHeaders() {
}
}