From 2f12436b7818fc62bbda642ea9d80b59bbf59db0 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 6 Jan 2024 09:55:27 +0800 Subject: [PATCH] Deprecates tracing support for dependencies not released in 2+ years This deprecates for removal the following, as they have not been updated in a long time. The exception to this rule is log4j context, which is widely used even if not updated recently. * context/rxjava2 - last released Feb 2021 * replaced by RxJava3, but unlikely this module will be ported as it wasn't used widely. * instrumentation/dubbo-rpc - (alibaba) last released Dec 2021 * replaced by Apache Dubbo instrumentation/dubbo * instrumentation/p6spy - last released July 2020 * project dormant * instrumentation/sparkjava - last released July 2022 * project dormant These will be removed in Brave 6 and can be re-introduced if something changes. Signed-off-by: Adrian Cole --- brave-bom/pom.xml | 2 +- brave-tests/pom.xml | 2 +- brave/pom.xml | 2 +- context/jfr/pom.xml | 2 +- context/log4j12/pom.xml | 2 +- context/log4j2/pom.xml | 2 +- context/pom.xml | 2 +- context/rxjava2/README.md | 8 ++++++++ context/rxjava2/pom.xml | 2 +- .../rxjava2/CurrentTraceContextAssemblyTracking.java | 6 +++++- context/slf4j/pom.xml | 2 +- instrumentation/benchmarks/pom.xml | 2 +- instrumentation/dubbo-rpc/README.md | 9 +++++++++ instrumentation/dubbo-rpc/pom.xml | 2 +- .../src/main/java/brave/dubbo/rpc/TracingFilter.java | 7 ++++++- .../src/test/java/brave/dubbo/rpc/ITTracingFilter.java | 5 +++-- .../java/brave/dubbo/rpc/ITTracingFilter_Consumer.java | 4 ++-- instrumentation/dubbo/pom.xml | 4 ++-- .../src/test/java/brave/dubbo/ITTracingFilter.java | 5 +++-- .../java/brave/dubbo/ITTracingFilter_Consumer.java | 4 ++-- instrumentation/grpc/pom.xml | 2 +- instrumentation/http-tests-jakarta/pom.xml | 2 +- instrumentation/http-tests/pom.xml | 2 +- instrumentation/http/pom.xml | 2 +- instrumentation/httpasyncclient/pom.xml | 2 +- instrumentation/httpclient/pom.xml | 2 +- instrumentation/httpclient5/pom.xml | 2 +- instrumentation/jakarta-jms/pom.xml | 2 +- instrumentation/jaxrs2/pom.xml | 2 +- instrumentation/jersey-server/pom.xml | 2 +- instrumentation/jms-jakarta/pom.xml | 2 +- instrumentation/jms/pom.xml | 2 +- instrumentation/kafka-clients/pom.xml | 2 +- instrumentation/kafka-streams/pom.xml | 2 +- instrumentation/messaging/pom.xml | 2 +- instrumentation/mongodb/pom.xml | 2 +- instrumentation/mysql/pom.xml | 2 +- instrumentation/mysql6/pom.xml | 2 +- instrumentation/mysql8/pom.xml | 2 +- instrumentation/netty-codec-http/pom.xml | 2 +- instrumentation/okhttp3/pom.xml | 2 +- instrumentation/p6spy/README.md | 8 ++++++++ instrumentation/p6spy/pom.xml | 2 +- .../src/main/java/brave/p6spy/TracingP6Factory.java | 10 ++++++++-- instrumentation/pom.xml | 2 +- instrumentation/rpc/pom.xml | 2 +- instrumentation/servlet-jakarta/pom.xml | 2 +- instrumentation/servlet/pom.xml | 2 +- instrumentation/sparkjava/README.md | 7 +++++++ instrumentation/sparkjava/pom.xml | 2 +- .../src/main/java/brave/sparkjava/SparkTracing.java | 7 ++++++- instrumentation/spring-rabbit/pom.xml | 2 +- instrumentation/spring-web/pom.xml | 2 +- instrumentation/spring-webmvc/pom.xml | 2 +- instrumentation/vertx-web/pom.xml | 2 +- pom.xml | 2 +- spring-beans/pom.xml | 2 +- 57 files changed, 113 insertions(+), 59 deletions(-) diff --git a/brave-bom/pom.xml b/brave-bom/pom.xml index ae831a7503..57da977fcb 100644 --- a/brave-bom/pom.xml +++ b/brave-bom/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-bom - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT Brave BOM Bill Of Materials POM for all Brave artifacts pom diff --git a/brave-tests/pom.xml b/brave-tests/pom.xml index d27ecc921a..2db428877e 100644 --- a/brave-tests/pom.xml +++ b/brave-tests/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/brave/pom.xml b/brave/pom.xml index e61a6b06d8..52b0f7b91b 100644 --- a/brave/pom.xml +++ b/brave/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave diff --git a/context/jfr/pom.xml b/context/jfr/pom.xml index 56b7b60bf8..4616f82bd1 100644 --- a/context/jfr/pom.xml +++ b/context/jfr/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/context/log4j12/pom.xml b/context/log4j12/pom.xml index cb5e2bb9e7..1caff7e968 100644 --- a/context/log4j12/pom.xml +++ b/context/log4j12/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/context/log4j2/pom.xml b/context/log4j2/pom.xml index a25949ae03..afd8284526 100644 --- a/context/log4j2/pom.xml +++ b/context/log4j2/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/context/pom.xml b/context/pom.xml index 0b3f44bd2f..6acfad41cc 100644 --- a/context/pom.xml +++ b/context/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave-context-parent diff --git a/context/rxjava2/README.md b/context/rxjava2/README.md index f35e0ff50d..05823b2003 100644 --- a/context/rxjava2/README.md +++ b/context/rxjava2/README.md @@ -1,4 +1,12 @@ # brave-context-rxjava2 + +## Deprecated + +RxJava 2 hasn't been released since Feb 2021. Tracing support will be removed +in Brave v6. + +## Overview + `CurrentTraceContextAssemblyTracking` prevents traces from breaking during RxJava operations by scoping trace context that existed at assembly time around callbacks or computation of new values. diff --git a/context/rxjava2/pom.xml b/context/rxjava2/pom.xml index 1f9ede2c60..54f91d6b1d 100644 --- a/context/rxjava2/pom.xml +++ b/context/rxjava2/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/CurrentTraceContextAssemblyTracking.java b/context/rxjava2/src/main/java/brave/context/rxjava2/CurrentTraceContextAssemblyTracking.java index 105fd38aa3..c0c3b2703c 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/CurrentTraceContextAssemblyTracking.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/CurrentTraceContextAssemblyTracking.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -34,7 +34,11 @@ * *

The design of this library borrows heavily from https://github.com/akaita/RxJava2Debug and * https://github.com/akarnokd/RxJava2Extensions + * + * @deprecated RxJava 2 hasn't been released since Feb 2021. Tracing support will be removed in + * Brave v6. */ +@Deprecated public final class CurrentTraceContextAssemblyTracking { public interface SavedHooks { diff --git a/context/slf4j/pom.xml b/context/slf4j/pom.xml index 87ba5a627a..890e4800c3 100644 --- a/context/slf4j/pom.xml +++ b/context/slf4j/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml index 0e05c6735c..e7dacba5c0 100644 --- a/instrumentation/benchmarks/pom.xml +++ b/instrumentation/benchmarks/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave-instrumentation-benchmarks diff --git a/instrumentation/dubbo-rpc/README.md b/instrumentation/dubbo-rpc/README.md index aeaf0ab3be..673d9e1703 100644 --- a/instrumentation/dubbo-rpc/README.md +++ b/instrumentation/dubbo-rpc/README.md @@ -1,4 +1,13 @@ # brave-instrumentation-dubbo-rpc + +## Deprecated + +Please use [brave-instrumentation-dubbo](../brave-instrumentation-dubbo) with +Apache Dubbo, as Alibaba Dubbo is no longer maintained. This module will be +removed in Brave v6. + +## Overview + This is a tracing filter for RPC providers and consumers in [Dubbo 2.6+](http://dubbo.apache.org/en-us/docs/dev/impls/filter.html) When used on a consumer, `TracingFilter` adds trace state as attachments diff --git a/instrumentation/dubbo-rpc/pom.xml b/instrumentation/dubbo-rpc/pom.xml index d7702e0efa..f72be7a55d 100644 --- a/instrumentation/dubbo-rpc/pom.xml +++ b/instrumentation/dubbo-rpc/pom.xml @@ -17,7 +17,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingFilter.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingFilter.java index 7213b9e0e1..cfd3011a3c 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingFilter.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -43,6 +43,11 @@ import static brave.internal.Throwables.propagateIfFatal; +/** + * @deprecated please use io.zipkin.brave:brave-instrumentation-dubbo with Apache Dubbo, as Alibaba + * Dubbo is no longer maintained. Tracing support for Alibaba Dubbo will be removed in Brave v6. + */ +@Deprecated @Activate(group = {Constants.PROVIDER, Constants.CONSUMER}, value = "tracing") // http://dubbo.apache.org/en-us/docs/dev/impls/filter.html // public constructor permitted to allow dubbo to instantiate this diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java index 6af825b0bc..aad0f0c989 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -13,6 +13,7 @@ */ package brave.dubbo.rpc; +import brave.rpc.RpcTracing; import brave.test.ITRemote; import com.alibaba.dubbo.common.extension.ExtensionLoader; import com.alibaba.dubbo.config.ReferenceConfig; @@ -32,7 +33,7 @@ public abstract class ITTracingFilter extends ITRemote { TracingFilter init() { TracingFilter filter = (TracingFilter) ExtensionLoader.getExtensionLoader(Filter.class) .getExtension("tracing"); - filter.setTracing(tracing); + filter.setRpcTracing(RpcTracing.create(tracing)); return filter; } } diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Consumer.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Consumer.java index 83c24dc645..72bbac68d1 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Consumer.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Consumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -205,7 +205,7 @@ class ITTracingFilter_Consumer extends ITTracingFilter { MutableSpan span = testSpanHandler.takeRemoteSpanWithErrorMessage(CLIENT, ".*Not found exported service.*"); assertThat(span.tags()) - .containsEntry("dubbo.error_code", "1"); + .containsEntry("rpc.error_code", "NETWORK_EXCEPTION"); } /** Shows if you aren't using RpcTracing, the old "dubbo.error_code" works */ diff --git a/instrumentation/dubbo/pom.xml b/instrumentation/dubbo/pom.xml index 1c2b9c1969..229fac4196 100644 --- a/instrumentation/dubbo/pom.xml +++ b/instrumentation/dubbo/pom.xml @@ -17,7 +17,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ ${project.basedir}/../.. - 3.2.9 + 3.3.0-beta.1 diff --git a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java index aade706743..d77548899e 100644 --- a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java +++ b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -13,6 +13,7 @@ */ package brave.dubbo; +import brave.rpc.RpcTracing; import brave.test.ITRemote; import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.config.ApplicationConfig; @@ -44,7 +45,7 @@ static ApplicationConfig getApplicationConfig() { TracingFilter init() { TracingFilter filter = (TracingFilter) ExtensionLoader.getExtensionLoader(Filter.class) .getExtension("tracing"); - filter.setTracing(tracing); + filter.setRpcTracing(RpcTracing.create(tracing)); return filter; } } diff --git a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Consumer.java b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Consumer.java index 2ef2f3a4f3..23678df61a 100644 --- a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Consumer.java +++ b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Consumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -236,7 +236,7 @@ class ITTracingFilter_Consumer extends ITTracingFilter { testSpanHandler.takeRemoteSpanWithErrorMessage(CLIENT, ".*Fail to decode request.*"); assertThat(span.tags()) - .containsEntry("dubbo.error_code", "1"); + .containsEntry("rpc.error_code", "NETWORK_EXCEPTION"); } /** Shows if you aren't using RpcTracing, the old "dubbo.error_code" works */ diff --git a/instrumentation/grpc/pom.xml b/instrumentation/grpc/pom.xml index c6f2118077..d2a3622b84 100644 --- a/instrumentation/grpc/pom.xml +++ b/instrumentation/grpc/pom.xml @@ -17,7 +17,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/http-tests-jakarta/pom.xml b/instrumentation/http-tests-jakarta/pom.xml index 2612a6c5e2..1413b5a962 100644 --- a/instrumentation/http-tests-jakarta/pom.xml +++ b/instrumentation/http-tests-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/http-tests/pom.xml b/instrumentation/http-tests/pom.xml index 7ead2e594b..35e0734bd7 100644 --- a/instrumentation/http-tests/pom.xml +++ b/instrumentation/http-tests/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/http/pom.xml b/instrumentation/http/pom.xml index 70ad8b34b4..f54e4e69aa 100644 --- a/instrumentation/http/pom.xml +++ b/instrumentation/http/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/httpasyncclient/pom.xml b/instrumentation/httpasyncclient/pom.xml index df596e6c22..5b71900ef4 100644 --- a/instrumentation/httpasyncclient/pom.xml +++ b/instrumentation/httpasyncclient/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/httpclient/pom.xml b/instrumentation/httpclient/pom.xml index 70786aa587..a0f44b3319 100644 --- a/instrumentation/httpclient/pom.xml +++ b/instrumentation/httpclient/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/httpclient5/pom.xml b/instrumentation/httpclient5/pom.xml index b93e884868..f44ec24f95 100644 --- a/instrumentation/httpclient5/pom.xml +++ b/instrumentation/httpclient5/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave-instrumentation-httpclient5 diff --git a/instrumentation/jakarta-jms/pom.xml b/instrumentation/jakarta-jms/pom.xml index a2ac6b64da..436b33f730 100644 --- a/instrumentation/jakarta-jms/pom.xml +++ b/instrumentation/jakarta-jms/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/jaxrs2/pom.xml b/instrumentation/jaxrs2/pom.xml index b26b7376ed..51c80314d4 100644 --- a/instrumentation/jaxrs2/pom.xml +++ b/instrumentation/jaxrs2/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/jersey-server/pom.xml b/instrumentation/jersey-server/pom.xml index a03ae4944f..03bd5984e0 100644 --- a/instrumentation/jersey-server/pom.xml +++ b/instrumentation/jersey-server/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/jms-jakarta/pom.xml b/instrumentation/jms-jakarta/pom.xml index e6d26597c9..ff71847f04 100644 --- a/instrumentation/jms-jakarta/pom.xml +++ b/instrumentation/jms-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/jms/pom.xml b/instrumentation/jms/pom.xml index b9d53c2a77..94b89c2349 100644 --- a/instrumentation/jms/pom.xml +++ b/instrumentation/jms/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml index 2af10a2d83..20091c7f3f 100644 --- a/instrumentation/kafka-clients/pom.xml +++ b/instrumentation/kafka-clients/pom.xml @@ -19,7 +19,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave-instrumentation-kafka-clients diff --git a/instrumentation/kafka-streams/pom.xml b/instrumentation/kafka-streams/pom.xml index 502f75596d..92584f8707 100644 --- a/instrumentation/kafka-streams/pom.xml +++ b/instrumentation/kafka-streams/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/messaging/pom.xml b/instrumentation/messaging/pom.xml index ebdb937d9a..3fba4057b4 100644 --- a/instrumentation/messaging/pom.xml +++ b/instrumentation/messaging/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/mongodb/pom.xml b/instrumentation/mongodb/pom.xml index 833e50b33a..ef0b6ccb20 100644 --- a/instrumentation/mongodb/pom.xml +++ b/instrumentation/mongodb/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql/pom.xml b/instrumentation/mysql/pom.xml index bccbf51803..d63990bdd3 100644 --- a/instrumentation/mysql/pom.xml +++ b/instrumentation/mysql/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql6/pom.xml b/instrumentation/mysql6/pom.xml index 2a37dfa80b..5c6f8be586 100644 --- a/instrumentation/mysql6/pom.xml +++ b/instrumentation/mysql6/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql8/pom.xml b/instrumentation/mysql8/pom.xml index 39a3ec763b..e173e79835 100644 --- a/instrumentation/mysql8/pom.xml +++ b/instrumentation/mysql8/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/netty-codec-http/pom.xml b/instrumentation/netty-codec-http/pom.xml index e2dc5462f6..0c0378bde4 100644 --- a/instrumentation/netty-codec-http/pom.xml +++ b/instrumentation/netty-codec-http/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/okhttp3/pom.xml b/instrumentation/okhttp3/pom.xml index dc4a9737d4..75278060da 100644 --- a/instrumentation/okhttp3/pom.xml +++ b/instrumentation/okhttp3/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/p6spy/README.md b/instrumentation/p6spy/README.md index 8482edde5c..de9bf98b53 100644 --- a/instrumentation/p6spy/README.md +++ b/instrumentation/p6spy/README.md @@ -1,4 +1,12 @@ # brave-instrumentation-p6spy + +## Deprecated + +P6Spy hasn't been released since July 2020. This module will be removed in +Brave v6. + +## Overview + This includes a tracing event listener for [P6Spy](https://github.com/p6spy/p6spy) (a proxy for calls to your JDBC driver). It reports to Zipkin how long each statement takes, along with relevant tags like the query. diff --git a/instrumentation/p6spy/pom.xml b/instrumentation/p6spy/pom.xml index 6ba7490b74..ba195c8b8f 100644 --- a/instrumentation/p6spy/pom.xml +++ b/instrumentation/p6spy/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6Factory.java b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6Factory.java index e162d4a04f..1cca035d29 100644 --- a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6Factory.java +++ b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6Factory.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -18,7 +18,13 @@ import com.p6spy.engine.spy.P6LoadableOptions; import com.p6spy.engine.spy.option.P6OptionsRepository; -/** Add this class name to the "moduleslist" in spy.properties */ +/** + * Add this class name to the "moduleslist" in spy.properties + * + * @deprecated P6Spy hasn't been released since July 2020. Tracing support will be removed in Brave + * v6. + */ +@Deprecated public final class TracingP6Factory implements P6Factory { TracingP6SpyOptions options; diff --git a/instrumentation/pom.xml b/instrumentation/pom.xml index b9dee55620..908ed5f207 100644 --- a/instrumentation/pom.xml +++ b/instrumentation/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT brave-instrumentation-parent diff --git a/instrumentation/rpc/pom.xml b/instrumentation/rpc/pom.xml index 00af227ece..7f306cc0af 100644 --- a/instrumentation/rpc/pom.xml +++ b/instrumentation/rpc/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/servlet-jakarta/pom.xml b/instrumentation/servlet-jakarta/pom.xml index 14147d2411..c703da589f 100644 --- a/instrumentation/servlet-jakarta/pom.xml +++ b/instrumentation/servlet-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/servlet/pom.xml b/instrumentation/servlet/pom.xml index b84a62a69a..a315e3a571 100644 --- a/instrumentation/servlet/pom.xml +++ b/instrumentation/servlet/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/sparkjava/README.md b/instrumentation/sparkjava/README.md index 3228202ca4..5c31417236 100644 --- a/instrumentation/sparkjava/README.md +++ b/instrumentation/sparkjava/README.md @@ -1,5 +1,12 @@ # brave-instrumentation-sparkjava +## Deprecated + +sparkjava hasn't been released since July 2022. This module will be removed in +Brave v6. + +## Overview + This module contains tracing filters and exception handlers for [SparkJava](http://sparkjava.com/) The filters extract trace state from incoming requests. Then, they reports Zipkin how long each request takes, along with relevant tags diff --git a/instrumentation/sparkjava/pom.xml b/instrumentation/sparkjava/pom.xml index 2714cd75c1..f844623780 100644 --- a/instrumentation/sparkjava/pom.xml +++ b/instrumentation/sparkjava/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/sparkjava/src/main/java/brave/sparkjava/SparkTracing.java b/instrumentation/sparkjava/src/main/java/brave/sparkjava/SparkTracing.java index 5f822c2110..584a875afd 100644 --- a/instrumentation/sparkjava/src/main/java/brave/sparkjava/SparkTracing.java +++ b/instrumentation/sparkjava/src/main/java/brave/sparkjava/SparkTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin 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 @@ -26,6 +26,11 @@ import spark.ExceptionHandler; import spark.Filter; +/** + * @deprecated sparkjava hasn't been released since July 2022. Tracing support will be removed in + * Brave v6. + */ +@Deprecated public final class SparkTracing { public static SparkTracing create(Tracing tracing) { return new SparkTracing(HttpTracing.create(tracing)); diff --git a/instrumentation/spring-rabbit/pom.xml b/instrumentation/spring-rabbit/pom.xml index 7d5c677bb8..d920ef32e0 100644 --- a/instrumentation/spring-rabbit/pom.xml +++ b/instrumentation/spring-rabbit/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/spring-web/pom.xml b/instrumentation/spring-web/pom.xml index 1181597a1a..bfddcfa9cb 100644 --- a/instrumentation/spring-web/pom.xml +++ b/instrumentation/spring-web/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/spring-webmvc/pom.xml b/instrumentation/spring-webmvc/pom.xml index 694f1b15cb..0bbf627bbc 100644 --- a/instrumentation/spring-webmvc/pom.xml +++ b/instrumentation/spring-webmvc/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/instrumentation/vertx-web/pom.xml b/instrumentation/vertx-web/pom.xml index da73c2c543..12d2317830 100644 --- a/instrumentation/vertx-web/pom.xml +++ b/instrumentation/vertx-web/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d6ced93fd7..adc2f7bc23 100755 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT pom Brave (parent) diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml index 184aef60e4..188d0837ea 100644 --- a/spring-beans/pom.xml +++ b/spring-beans/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 5.17.2-SNAPSHOT + 5.18.0-SNAPSHOT 4.0.0