moves off deprecated error code in dubbo

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Jan 6, 2024 · d88ccab · d88ccab
1 parent e250f09
commit d88ccab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
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/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 */