deps: updates to latest libthrift

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

RELEASE.md

@@ -54,11 +54,19 @@ the following:
 
 Before you do the first release of the year, move the SNAPSHOT version back and forth from whatever the current is.
 In-between, re-apply the licenses.
+
+Note: the command below is more complex than a normal project because this
+project has a bom.
 ```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
-$ git commit -am"Adjusts copyright headers for this year"
+$ mvn=$PWD/mvnw
+$ for p in ./bom .; do
+ (cd $p
+ $mvn versions:set -DnewVersion=2.17.1-SNAPSHOT -DgenerateBackupPoms=false
+ $mvn -o clean install -DskipTests
+ $mvn com.mycila:license-maven-plugin:format
+ $mvn versions:set -DnewVersion=2.17.0-SNAPSHOT -DgenerateBackupPoms=false)
+ done
+$ git commit -asm"Adjusts copyright headers for this year"
 ```
 
 ## Manually releasing

activemq-client/pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <artifactId>zipkin-reporter-parent</artifactId>
     <groupId>io.zipkin.reporter2</groupId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

amqp-client/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-amqp-client</artifactId>

benchmarks/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>

bom/pom.xml

@@ -20,7 +20,7 @@
   <groupId>io.zipkin.reporter2</groupId>
   <artifactId>zipkin-reporter-bom</artifactId>
   <name>Zipkin Reporter BOM</name>
-  <version>2.16.6-SNAPSHOT</version>
+  <version>2.17.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Bill Of Materials POM for all Zipkin reporter artifacts</description>
 

brave/pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

core/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-reporter</artifactId>

kafka/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-kafka</artifactId>

kafka08/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-kafka08</artifactId>

libthrift/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-libthrift</artifactId>
@@ -43,8 +43,12 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
-      <!-- versions after this break compatability -->
-      <version>0.13.0</version>
+      <!-- Always update this to the highest value that doesn't break signature
+           compatability on patch release. Signature compatability breaks are
+           common in libthrift and lead to rev-lock. As scribe is a deprecated
+           transport in Zipkin, it is ok to update this to a signature breaking
+           version on minor, but increment to the next minor in the PR. -->
+      <version>0.19.0</version>
     </dependency>
 
     <dependency>

libthrift/src/main/java/zipkin2/reporter/libthrift/ScribeClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 The OpenZipkin Authors
+ * Copyright 2016-2023 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
@@ -17,22 +17,30 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.apache.thrift.TConfiguration;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.layered.TFramedTransport;
 
 final class ScribeClient implements Closeable {
   static final Logger logger = Logger.getLogger(ScribeClient.class.getName());
   static final byte[] category = new byte[] {'z', 'i', 'p', 'k', 'i', 'n'};
 
-  final TSocket socket;
-  final TBinaryProtocol prot;
+  final String host;
+  final int port;
+  final int socketTimeout;
+  final int connectTimeout;
+
+  volatile TSocket socket;
+  volatile TBinaryProtocol prot;
 
   ScribeClient(String host, int port, int socketTimeout, int connectTimeout) {
-    socket = new TSocket(host, port, socketTimeout, connectTimeout);
-    prot = new TBinaryProtocol(new TFramedTransport(socket));
+    this.host = host;
+    this.port = port;
+    this.socketTimeout = socketTimeout;
+    this.connectTimeout = connectTimeout;
   }
 
   static int messageSizeInBytes(int spanSizeInBytes) {
@@ -47,19 +55,29 @@ static int messageSizeInBytes(List<byte[]> encodedSpans) {
 
   boolean log(List<byte[]> encodedSpans) throws TException {
     try {
+      if (socket == null) {
+        synchronized (this) {
+          if (socket == null) {
+            socket = new TSocket(new TConfiguration(), host, port, socketTimeout, connectTimeout);
+            prot = new TBinaryProtocol(new TFramedTransport(socket));
+          }
+        }
+      }
+
       if (!socket.isOpen()) socket.open();
       InternalScribeCodec.writeLogRequest(category, encodedSpans, ++seqid_, prot);
       prot.getTransport().flush();
       return InternalScribeCodec.readLogResponse(seqid_, prot);
     } catch (TTransportException e) {
       logger.log(Level.FINE, "Transport exception. recreating socket", e);
-      socket.close();
+      close();
       seqid_ = 0;
       throw e;
     }
   }
 
   @Override public void close() {
-    socket.close();
+    TSocket maybe = this.socket;
+    if (maybe != null) maybe.close();
   }
 }

metrics-micrometer/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-reporter-metrics-micrometer</artifactId>

okhttp3/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-okhttp3</artifactId>

pom.xml

@@ -19,7 +19,7 @@
 
   <groupId>io.zipkin.reporter2</groupId>
   <artifactId>zipkin-reporter-parent</artifactId>
-  <version>2.16.6-SNAPSHOT</version>
+  <version>2.17.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

spring-beans/pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

urlconnection/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.reporter2</groupId>
     <artifactId>zipkin-reporter-parent</artifactId>
-    <version>2.16.6-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-sender-urlconnection</artifactId>