openzipkin · codefromthecrypt · Jan 6, 2024 · Jan 6, 2024
diff --git a/brave-bom/pom.xml b/brave-bom/pom.xml
@@ -18,7 +18,7 @@
 
   <groupId>io.zipkin.brave</groupId>
   <artifactId>brave-bom</artifactId>
-  <version>5.17.2-SNAPSHOT</version>
+  <version>5.18.0-SNAPSHOT</version>
   <name>Brave BOM</name>
   <description>Bill Of Materials POM for all Brave artifacts</description>
   <packaging>pom</packaging>

diff --git a/brave-tests/pom.xml b/brave-tests/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/brave/pom.xml b/brave/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>brave</artifactId>

diff --git a/context/jfr/pom.xml b/context/jfr/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-context-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/context/log4j12/pom.xml b/context/log4j12/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-context-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/context/log4j2/pom.xml b/context/log4j2/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-context-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/context/pom.xml b/context/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>brave-context-parent</artifactId>

diff --git 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
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-context-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git 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 @@
  *
  * <p>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
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-context-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>brave-instrumentation-benchmarks</artifactId>

diff --git 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <dubbo.version>3.2.9</dubbo.version>
+    <dubbo.version>3.3.0-beta.1</dubbo.version>
     <!-- add opens to avoid below in JRE 21:
          com.alibaba.com.caucho.hessian.io.JavaSerializer -->
     <maven-failsafe-plugin.argLine>

diff --git 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
@@ -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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/http-tests-jakarta/pom.xml b/instrumentation/http-tests-jakarta/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/http-tests/pom.xml b/instrumentation/http-tests/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/http/pom.xml b/instrumentation/http/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/httpasyncclient/pom.xml b/instrumentation/httpasyncclient/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/httpclient/pom.xml b/instrumentation/httpclient/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/httpclient5/pom.xml b/instrumentation/httpclient5/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>brave-instrumentation-httpclient5</artifactId>

diff --git a/instrumentation/jakarta-jms/pom.xml b/instrumentation/jakarta-jms/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/jaxrs2/pom.xml b/instrumentation/jaxrs2/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/jersey-server/pom.xml b/instrumentation/jersey-server/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/jms-jakarta/pom.xml b/instrumentation/jms-jakarta/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/jms/pom.xml b/instrumentation/jms/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>brave-instrumentation-kafka-clients</artifactId>

diff --git a/instrumentation/kafka-streams/pom.xml b/instrumentation/kafka-streams/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/instrumentation/messaging/pom.xml b/instrumentation/messaging/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.brave</groupId>
     <artifactId>brave-instrumentation-parent</artifactId>
-    <version>5.17.2-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>