diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Annotation.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Annotation.java
index c49f63c23e6..3665fb66c4a 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Annotation.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Annotation.java
@@ -13,6 +13,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class Annotation implements org.apache.thrift.TBase<Annotation, Annotation._Fields>, java.io.Serializable, Cloneable, Comparable<Annotation> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Annotation");
 
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/BinaryAnnotation.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/BinaryAnnotation.java
index 568c4d0e42c..4e727c0212d 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/BinaryAnnotation.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/BinaryAnnotation.java
@@ -24,6 +24,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotation, BinaryAnnotation._Fields>, java.io.Serializable, Cloneable, Comparable<BinaryAnnotation> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BinaryAnnotation");
 
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ClientId.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ClientId.java
index 28a0796b1ed..8aa4ff99941 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ClientId.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ClientId.java
@@ -13,6 +13,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class ClientId implements org.apache.thrift.TBase<ClientId, ClientId._Fields>, java.io.Serializable, Cloneable, Comparable<ClientId> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientId");
 
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ConnectionOptions.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ConnectionOptions.java
index ac541d0e455..7538d31bdac 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ConnectionOptions.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ConnectionOptions.java
@@ -12,7 +12,10 @@
  * upgrade.
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
-public class ConnectionOptions implements org.apache.thrift.TBase<ConnectionOptions, ConnectionOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConnectionOptions> {
+public class ConnectionOptions implements org.apache.thrift.TBase<ConnectionOptions, ConnectionOptions._Fields>,
+    java.io.Serializable, Cloneable, Comparable<ConnectionOptions> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConnectionOptions");
 
 
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Delegation.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Delegation.java
index 072b78d2697..622fe7be50e 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Delegation.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Delegation.java
@@ -12,6 +12,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class Delegation implements org.apache.thrift.TBase<Delegation, Delegation._Fields>, java.io.Serializable, Cloneable, Comparable<Delegation> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Delegation");
 
   private static final org.apache.thrift.protocol.TField SRC_FIELD_DESC = new org.apache.thrift.protocol.TField("src", org.apache.thrift.protocol.TType.STRING, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Endpoint.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Endpoint.java
index 4069ec8bebc..8627c163dbf 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Endpoint.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Endpoint.java
@@ -18,6 +18,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fields>, java.io.Serializable, Cloneable, Comparable<Endpoint> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Endpoint");
 
   private static final org.apache.thrift.protocol.TField IPV4_FIELD_DESC = new org.apache.thrift.protocol.TField("ipv4", org.apache.thrift.protocol.TType.I32, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestContext.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestContext.java
index 63f2011a9d6..f14bf23afbd 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestContext.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestContext.java
@@ -12,6 +12,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class RequestContext implements org.apache.thrift.TBase<RequestContext, RequestContext._Fields>, java.io.Serializable, Cloneable, Comparable<RequestContext> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestContext");
 
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestHeader.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestHeader.java
index 6ca343072ab..4569b649d89 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestHeader.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/RequestHeader.java
@@ -13,6 +13,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class RequestHeader implements org.apache.thrift.TBase<RequestHeader, RequestHeader._Fields>, java.io.Serializable, Cloneable, Comparable<RequestHeader> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestHeader");
 
   private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("trace_id", org.apache.thrift.protocol.TType.I64, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ResponseHeader.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ResponseHeader.java
index 998ad46e917..9ca8af768dc 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ResponseHeader.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/ResponseHeader.java
@@ -14,6 +14,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class ResponseHeader implements org.apache.thrift.TBase<ResponseHeader, ResponseHeader._Fields>, java.io.Serializable, Cloneable, Comparable<ResponseHeader> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResponseHeader");
 
   private static final org.apache.thrift.protocol.TField SPANS_FIELD_DESC = new org.apache.thrift.protocol.TField("spans", org.apache.thrift.protocol.TType.LIST, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Span.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Span.java
index 1236af8126f..38971b8723d 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Span.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/Span.java
@@ -16,6 +16,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.io.Serializable, Cloneable, Comparable<Span> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Span");
 
   private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("trace_id", org.apache.thrift.protocol.TType.I64, (short)1);
diff --git a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/UpgradeReply.java b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/UpgradeReply.java
index 8664499647c..1611a1cc00f 100644
--- a/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/UpgradeReply.java
+++ b/finagle-thrift/src/main/java/com/twitter/finagle/thrift/thrift/UpgradeReply.java
@@ -12,6 +12,8 @@
  */
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-11-09")
 public class UpgradeReply implements org.apache.thrift.TBase<UpgradeReply, UpgradeReply._Fields>, java.io.Serializable, Cloneable, Comparable<UpgradeReply> {
+  private static final long serialVersionUID = 1L;
+  
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpgradeReply");