Skip to content

Commit 777f079

Browse files
committed
Deprecate Micrometer Tracing code in favor of Lettuce's Micrometer support.
Closes #2561
1 parent fb0f0bc commit 777f079

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,25 @@
1515
*/
1616
package org.springframework.data.redis.connection.lettuce.observability;
1717

18+
import io.lettuce.core.protocol.RedisCommand;
19+
import io.lettuce.core.tracing.Tracing.Endpoint;
20+
import io.micrometer.common.KeyValues;
21+
1822
import java.net.InetSocketAddress;
1923
import java.util.Locale;
2024

2125
import org.springframework.data.redis.connection.lettuce.observability.RedisObservation.HighCardinalityCommandKeyNames;
2226
import org.springframework.data.redis.connection.lettuce.observability.RedisObservation.LowCardinalityCommandKeyNames;
2327

24-
import io.lettuce.core.protocol.RedisCommand;
25-
import io.lettuce.core.tracing.Tracing.Endpoint;
26-
import io.micrometer.common.KeyValues;
27-
2828
/**
2929
* Default {@link LettuceObservationConvention} implementation.
3030
*
3131
* @author Mark Paluch
3232
* @since 3.0
33+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
34+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
3335
*/
36+
@Deprecated(since = "3.4", forRemoval = true)
3437
record DefaultLettuceObservationConvention(
3538
boolean includeCommandArgsInSpanTags) implements LettuceObservationConvention {
3639

@@ -43,7 +46,7 @@ public KeyValues getLowCardinalityKeyValues(LettuceObservationContext context) {
4346

4447
if (ep instanceof SocketAddressEndpoint endpoint) {
4548

46-
if (endpoint.socketAddress()instanceof InetSocketAddress inet) {
49+
if (endpoint.socketAddress() instanceof InetSocketAddress inet) {
4750
keyValues = keyValues
4851
.and(KeyValues.of(LowCardinalityCommandKeyNames.NET_SOCK_PEER_ADDR.withValue(inet.getHostString()),
4952
LowCardinalityCommandKeyNames.NET_SOCK_PEER_PORT.withValue("" + inet.getPort()),

src/main/java/org/springframework/data/redis/connection/lettuce/observability/LettuceObservationContext.java

+3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
*
2929
* @author Mark Paluch
3030
* @since 3.0
31+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
32+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
3133
*/
34+
@Deprecated(since = "3.4", forRemoval = true)
3235
public class LettuceObservationContext extends SenderContext<Object> {
3336

3437
private volatile @Nullable RedisCommand<?, ?, ?> command;

src/main/java/org/springframework/data/redis/connection/lettuce/observability/LettuceObservationConvention.java

+3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
*
2424
* @author Mark Paluch
2525
* @since 3.0
26+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
27+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
2628
*/
29+
@Deprecated(since = "3.4", forRemoval = true)
2730
interface LettuceObservationConvention extends ObservationConvention<LettuceObservationContext> {
2831

2932
@Override

src/main/java/org/springframework/data/redis/connection/lettuce/observability/MicrometerTracingAdapter.java

+3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@
4646
* @author Mark Paluch
4747
* @author Yanming Zhou
4848
* @since 3.0
49+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
50+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
4951
*/
52+
@Deprecated(since = "3.4", forRemoval = true)
5053
public class MicrometerTracingAdapter implements Tracing {
5154

5255
private static final Log log = LogFactory.getLog(MicrometerTracingAdapter.class);

src/main/java/org/springframework/data/redis/connection/lettuce/observability/RedisObservation.java

+3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
*
2424
* @author Mark Paluch
2525
* @since 3.0
26+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
27+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
2628
*/
29+
@Deprecated(since = "3.4", forRemoval = true)
2730
public enum RedisObservation implements ObservationDocumentation {
2831

2932
/**

src/main/java/org/springframework/data/redis/connection/lettuce/observability/SocketAddressEndpoint.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@
1515
*/
1616
package org.springframework.data.redis.connection.lettuce.observability;
1717

18+
import io.lettuce.core.tracing.Tracing.Endpoint;
19+
1820
import java.net.InetSocketAddress;
1921
import java.net.SocketAddress;
2022

21-
import io.lettuce.core.tracing.Tracing.Endpoint;
22-
2323
/**
2424
* @author Mark Paluch
25+
* @deprecated since 3.4 for removal with the next major revision. Use Lettuce's Micrometer integration through
26+
* {@link io.lettuce.core.tracing.MicrometerTracing}.
2527
*/
28+
@Deprecated(since = "3.4", forRemoval = true)
2629
record SocketAddressEndpoint(SocketAddress socketAddress) implements Endpoint {
2730

2831
@Override

0 commit comments

Comments
 (0)