brave: updates to non-deprecated functions (#39)

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

RELEASE.md

@@ -57,7 +57,7 @@ In-between, re-apply the licenses.
 ```bash
 $ ./mvnw versions:set -DnewVersion=1.3.3-SNAPSHOT -DgenerateBackupPoms=false
 $ ./mvnw com.mycila:license-maven-plugin:format
-$ ./mvnw versions:set -DnewVersion=1.3.2-SNAPSHOT -DgenerateBackupPoms=false
+$ ./mvnw versions:set -DnewVersion=0.3.7-SNAPSHOT -DgenerateBackupPoms=false
 $ git commit -am"Adjusts copyright headers for this year"
 ```
 

benchmarks/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019-2020 The OpenZipkin Authors
+    Copyright 2019-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

brave/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019-2020 The OpenZipkin Authors
+    Copyright 2019-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
@@ -45,6 +45,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>io.zipkin.reporter2</groupId>
+      <artifactId>zipkin-reporter-brave</artifactId>
+      <version>${zipkin-reporter.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>${brave.groupId}</groupId>
       <artifactId>brave-instrumentation-http</artifactId>
@@ -95,7 +101,6 @@
                     <include>brave/internal/collect/Lists*.class</include>
                     <include>brave/internal/collect/LongBitSet*.class</include>
                     <include>brave/internal/collect/UnsafeArrayMap*.class</include>
-                    <include>brave/internal/propagation/StringPropagationAdapter*.class</include>
                   </includes>
                 </filter>
               </filters>

brave/src/main/java/brave/secondary_sampling/SecondarySampling.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenZipkin Authors
+ * Copyright 2019-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
@@ -20,7 +20,6 @@
 import brave.http.HttpTracing;
 import brave.http.HttpTracingCustomizer;
 import brave.internal.Nullable;
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContext.Extractor;
@@ -187,12 +186,16 @@ public SecondarySampling build() {
     return SecondarySamplingDecisions.FACTORY.decorate(result);
   }
 
-  @Override public Propagation<String> get() {
-    return this;
+  /**
+   * @deprecated end users and instrumentation should never call this, and instead use
+   * {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+   */
+  @Deprecated public <K> Propagation<K> create(KeyFactory<K> unused) {
+    throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
   }
 
-  @Override public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-    return StringPropagationAdapter.create(this, keyFactory);
+  @Override public Propagation<String> get() {
+    return this;
   }
 
   @Override public <R> Injector<R> injector(Setter<R, String> setter) {

brave/src/test/java/brave/secondary_sampling/integration/TracedNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenZipkin Authors
+ * Copyright 2019-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
@@ -159,7 +159,7 @@ void execute(FakeHttpRequest.Client clientRequest) {
     FakeHttpRequest.Server serverRequest = new FakeHttpRequest.Server(clientRequest);
     Span span = serverHandler.handleReceive(serverRequest);
     callDownstream(serverRequest.path(), span);
-    serverHandler.handleSend(new FakeHttpResponse.Server(), null, span);
+    serverHandler.handleSend(new FakeHttpResponse.Server(), span);
   }
 
   void execute(FakeRpcRequest.Client clientRequest) {
@@ -187,7 +187,7 @@ void callDownstreamHttp(String path, TracedNode down) {
     FakeHttpRequest.Client clientRequest = new FakeHttpRequest.Client(path);
     Span span = clientHandler.handleSend(clientRequest);
     down.execute(clientRequest);
-    clientHandler.handleReceive(new FakeHttpResponse.Client(), null, span);
+    clientHandler.handleReceive(new FakeHttpResponse.Client(), span);
   }
 
   void callDownstreamRpc(String method, TracedNode down) {

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019-2020 The OpenZipkin Authors
+    Copyright 2019-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
@@ -46,7 +46,8 @@
     <!--    <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
     <!--    <brave.version>master-SNAPSHOT</brave.version>-->
     <brave.groupId>io.zipkin.brave</brave.groupId>
-    <brave.version>5.13.3</brave.version>
+    <brave.version>5.17.1</brave.version>
+    <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
 
     <junit.version>4.13.1</junit.version>
     <assertj.version>3.18.1</assertj.version>