diff --git a/pom.xml b/pom.xml
index 60b35ab60..de5d9b3e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
             <dependency>
                 <groupId>org.apache.thrift</groupId>
                 <artifactId>libthrift</artifactId>
-                <version>0.9.2</version>
+                <version>0.10.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.httpcomponents</groupId>
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/collector/AgentStatMetricCollector.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/collector/AgentStatMetricCollector.java
index 9bacbcf1c..9b585b372 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/collector/AgentStatMetricCollector.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/collector/AgentStatMetricCollector.java
@@ -22,8 +22,8 @@ import org.apache.thrift.TFieldIdEnum;
 /**
  * @author HyunGil Jeong
  */
-public interface AgentStatMetricCollector<T extends TBase<T, ? extends TFieldIdEnum>> {
-    
+public interface AgentStatMetricCollector<T extends TBase<?, ? extends TFieldIdEnum>> {
+
     T collect();
 
 }
diff --git a/thrift/build-thrift-linux.sh b/thrift/build-thrift-linux.sh
index 768f39754..01af096c2 100755
--- a/thrift/build-thrift-linux.sh
+++ b/thrift/build-thrift-linux.sh
@@ -1,4 +1,4 @@
-mvn generate-sources -P with-thrift -Dmaven.test.skip -Dthrift.executable.path=./src/compiler/linux/thrift-0.9.2
+mvn generate-sources -P with-thrift -Dmaven.test.skip -Dthrift.executable.path=./src/compiler/linux/thrift-0.10.0
 
 rc=$?
 if [[ $rc != 0 ]] ; then
diff --git a/thrift/build-thrift-windows.bat b/thrift/build-thrift-windows.bat
index 23f86879b..72cd2b720 100755
--- a/thrift/build-thrift-windows.bat
+++ b/thrift/build-thrift-windows.bat
@@ -1,4 +1,4 @@
-mvn generate-sources -P with-thrift -Dmaven.test.skip -Dthrift.executable.path=./src/compiler/windows/thrift-0.9.2
+mvn generate-sources -P with-thrift -Dmaven.test.skip -Dthrift.executable.path=./src/compiler/windows/thrift-0.10.0
 
 rc=$?
 if [[ $rc != 0 ]] ; then
diff --git a/thrift/src/compiler/linux/thrift-0.10.0-not-exist.txt b/thrift/src/compiler/linux/thrift-0.10.0-not-exist.txt
new file mode 100644
index 000000000..d855b8ad4
--- /dev/null
+++ b/thrift/src/compiler/linux/thrift-0.10.0-not-exist.txt
@@ -0,0 +1 @@
+copy thrift 0.10.0 binary
\ No newline at end of file
diff --git a/thrift/src/compiler/linux/thrift-0.9.2 b/thrift/src/compiler/linux/thrift-0.9.2
deleted file mode 100755
index 8284ed1c5..000000000
Binary files a/thrift/src/compiler/linux/thrift-0.9.2 and /dev/null differ
diff --git a/thrift/src/compiler/windows/thrift-0.10.0.exe b/thrift/src/compiler/windows/thrift-0.10.0.exe
new file mode 100644
index 000000000..480cf9a9a
Binary files /dev/null and b/thrift/src/compiler/windows/thrift-0.10.0.exe differ
diff --git a/thrift/src/compiler/windows/thrift-0.9.2.exe b/thrift/src/compiler/windows/thrift-0.9.2.exe
deleted file mode 100644
index 318119979..000000000
Binary files a/thrift/src/compiler/windows/thrift-0.9.2.exe and /dev/null differ
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTrace.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTrace.java
index a4be0bd65..1077622d4 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTrace.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTrace.java
@@ -1,50 +1,20 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-1-29")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActiveTrace._Fields>, java.io.Serializable, Cloneable, Comparable<TActiveTrace> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TActiveTrace");
 
   private static final org.apache.thrift.protocol.TField HISTOGRAM_FIELD_DESC = new org.apache.thrift.protocol.TField("histogram", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TActiveTraceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TActiveTraceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TActiveTraceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TActiveTraceTupleSchemeFactory();
 
   private TActiveTraceHistogram histogram; // optional
 
@@ -52,10 +22,10 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     HISTOGRAM((short)1, "histogram");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,21 +48,21 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,19 +71,19 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.HISTOGRAM};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.HISTOGRAM, new org.apache.thrift.meta_data.FieldMetaData("histogram", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TActiveTraceHistogram.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TActiveTrace.class, metaDataMap);
   }
 
@@ -161,7 +131,7 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case HISTOGRAM:
       if (value == null) {
@@ -174,30 +144,30 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case HISTOGRAM:
       return getHistogram();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case HISTOGRAM:
       return isSetHistogram();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TActiveTrace)
@@ -208,6 +178,8 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
   public boolean equals(TActiveTrace that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_histogram = true && this.isSetHistogram();
     boolean that_present_histogram = true && that.isSetHistogram();
@@ -223,14 +195,13 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_histogram = true && (isSetHistogram());
-    list.add(present_histogram);
-    if (present_histogram)
-      list.add(histogram);
+    hashCode = hashCode * 8191 + ((isSetHistogram()) ? 131071 : 524287);
+    if (isSetHistogram())
+      hashCode = hashCode * 8191 + histogram.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -241,7 +212,7 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetHistogram()).compareTo(other.isSetHistogram());
+    lastComparison = java.lang.Boolean.valueOf(isSetHistogram()).compareTo(other.isSetHistogram());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -259,16 +230,16 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TActiveTrace(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TActiveTrace(");
     boolean first = true;
 
     if (isSetHistogram()) {
@@ -300,7 +271,7 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -308,13 +279,13 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
     }
   }
 
-  private static class TActiveTraceStandardSchemeFactory implements SchemeFactory {
+  private static class TActiveTraceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveTraceStandardScheme getScheme() {
       return new TActiveTraceStandardScheme();
     }
   }
 
-  private static class TActiveTraceStandardScheme extends StandardScheme<TActiveTrace> {
+  private static class TActiveTraceStandardScheme extends org.apache.thrift.scheme.StandardScheme<TActiveTrace> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TActiveTrace struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -361,18 +332,18 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
 
   }
 
-  private static class TActiveTraceTupleSchemeFactory implements SchemeFactory {
+  private static class TActiveTraceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveTraceTupleScheme getScheme() {
       return new TActiveTraceTupleScheme();
     }
   }
 
-  private static class TActiveTraceTupleScheme extends TupleScheme<TActiveTrace> {
+  private static class TActiveTraceTupleScheme extends org.apache.thrift.scheme.TupleScheme<TActiveTrace> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TActiveTrace struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetHistogram()) {
         optionals.set(0);
       }
@@ -384,8 +355,8 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TActiveTrace struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.histogram = new TActiveTraceHistogram();
         struct.histogram.read(iprot);
@@ -394,5 +365,8 @@ public class TActiveTrace implements org.apache.thrift.TBase<TActiveTrace, TActi
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTraceHistogram.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTraceHistogram.java
index e6646f2f2..aa9bf8465 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTraceHistogram.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TActiveTraceHistogram.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-2-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTraceHistogram, TActiveTraceHistogram._Fields>, java.io.Serializable, Cloneable, Comparable<TActiveTraceHistogram> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TActiveTraceHistogram");
 
@@ -42,15 +15,12 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   private static final org.apache.thrift.protocol.TField HISTOGRAM_SCHEMA_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("histogramSchemaType", org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField ACTIVE_TRACE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("activeTraceCount", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TActiveTraceHistogramStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TActiveTraceHistogramTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TActiveTraceHistogramStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TActiveTraceHistogramTupleSchemeFactory();
 
   private short version; // required
   private int histogramSchemaType; // optional
-  private List<Integer> activeTraceCount; // optional
+  private java.util.List<java.lang.Integer> activeTraceCount; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     HISTOGRAM_SCHEMA_TYPE((short)2, "histogramSchemaType"),
     ACTIVE_TRACE_COUNT((short)3, "activeTraceCount");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -88,21 +58,21 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +81,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -121,9 +91,9 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   private static final int __HISTOGRAMSCHEMATYPE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.HISTOGRAM_SCHEMA_TYPE,_Fields.ACTIVE_TRACE_COUNT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
     tmpMap.put(_Fields.HISTOGRAM_SCHEMA_TYPE, new org.apache.thrift.meta_data.FieldMetaData("histogramSchemaType", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -131,7 +101,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     tmpMap.put(_Fields.ACTIVE_TRACE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("activeTraceCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TActiveTraceHistogram.class, metaDataMap);
   }
 
@@ -156,7 +126,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     this.version = other.version;
     this.histogramSchemaType = other.histogramSchemaType;
     if (other.isSetActiveTraceCount()) {
-      List<Integer> __this__activeTraceCount = new ArrayList<Integer>(other.activeTraceCount);
+      java.util.List<java.lang.Integer> __this__activeTraceCount = new java.util.ArrayList<java.lang.Integer>(other.activeTraceCount);
       this.activeTraceCount = __this__activeTraceCount;
     }
   }
@@ -184,16 +154,16 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   }
 
   public void unsetVersion() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   /** Returns true if field version is set (has been assigned a value) and false otherwise */
   public boolean isSetVersion() {
-    return EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   public void setVersionIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
   }
 
   public int getHistogramSchemaType() {
@@ -206,38 +176,38 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   }
 
   public void unsetHistogramSchemaType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
   }
 
   /** Returns true if field histogramSchemaType is set (has been assigned a value) and false otherwise */
   public boolean isSetHistogramSchemaType() {
-    return EncodingUtils.testBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
   }
 
   public void setHistogramSchemaTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID, value);
   }
 
   public int getActiveTraceCountSize() {
     return (this.activeTraceCount == null) ? 0 : this.activeTraceCount.size();
   }
 
-  public java.util.Iterator<Integer> getActiveTraceCountIterator() {
+  public java.util.Iterator<java.lang.Integer> getActiveTraceCountIterator() {
     return (this.activeTraceCount == null) ? null : this.activeTraceCount.iterator();
   }
 
   public void addToActiveTraceCount(int elem) {
     if (this.activeTraceCount == null) {
-      this.activeTraceCount = new ArrayList<Integer>();
+      this.activeTraceCount = new java.util.ArrayList<java.lang.Integer>();
     }
     this.activeTraceCount.add(elem);
   }
 
-  public List<Integer> getActiveTraceCount() {
+  public java.util.List<java.lang.Integer> getActiveTraceCount() {
     return this.activeTraceCount;
   }
 
-  public void setActiveTraceCount(List<Integer> activeTraceCount) {
+  public void setActiveTraceCount(java.util.List<java.lang.Integer> activeTraceCount) {
     this.activeTraceCount = activeTraceCount;
   }
 
@@ -256,13 +226,13 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case VERSION:
       if (value == null) {
         unsetVersion();
       } else {
-        setVersion((Short)value);
+        setVersion((java.lang.Short)value);
       }
       break;
 
@@ -270,7 +240,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
       if (value == null) {
         unsetHistogramSchemaType();
       } else {
-        setHistogramSchemaType((Integer)value);
+        setHistogramSchemaType((java.lang.Integer)value);
       }
       break;
 
@@ -278,32 +248,32 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
       if (value == null) {
         unsetActiveTraceCount();
       } else {
-        setActiveTraceCount((List<Integer>)value);
+        setActiveTraceCount((java.util.List<java.lang.Integer>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VERSION:
-      return Short.valueOf(getVersion());
+      return getVersion();
 
     case HISTOGRAM_SCHEMA_TYPE:
-      return Integer.valueOf(getHistogramSchemaType());
+      return getHistogramSchemaType();
 
     case ACTIVE_TRACE_COUNT:
       return getActiveTraceCount();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -314,11 +284,11 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     case ACTIVE_TRACE_COUNT:
       return isSetActiveTraceCount();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TActiveTraceHistogram)
@@ -329,6 +299,8 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   public boolean equals(TActiveTraceHistogram that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_version = true;
     boolean that_present_version = true;
@@ -362,24 +334,19 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_version = true;
-    list.add(present_version);
-    if (present_version)
-      list.add(version);
+    hashCode = hashCode * 8191 + version;
 
-    boolean present_histogramSchemaType = true && (isSetHistogramSchemaType());
-    list.add(present_histogramSchemaType);
-    if (present_histogramSchemaType)
-      list.add(histogramSchemaType);
+    hashCode = hashCode * 8191 + ((isSetHistogramSchemaType()) ? 131071 : 524287);
+    if (isSetHistogramSchemaType())
+      hashCode = hashCode * 8191 + histogramSchemaType;
 
-    boolean present_activeTraceCount = true && (isSetActiveTraceCount());
-    list.add(present_activeTraceCount);
-    if (present_activeTraceCount)
-      list.add(activeTraceCount);
+    hashCode = hashCode * 8191 + ((isSetActiveTraceCount()) ? 131071 : 524287);
+    if (isSetActiveTraceCount())
+      hashCode = hashCode * 8191 + activeTraceCount.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -390,7 +357,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -400,7 +367,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHistogramSchemaType()).compareTo(other.isSetHistogramSchemaType());
+    lastComparison = java.lang.Boolean.valueOf(isSetHistogramSchemaType()).compareTo(other.isSetHistogramSchemaType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -410,7 +377,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetActiveTraceCount()).compareTo(other.isSetActiveTraceCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetActiveTraceCount()).compareTo(other.isSetActiveTraceCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -428,16 +395,16 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TActiveTraceHistogram(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TActiveTraceHistogram(");
     boolean first = true;
 
     sb.append("version:");
@@ -476,7 +443,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -486,13 +453,13 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     }
   }
 
-  private static class TActiveTraceHistogramStandardSchemeFactory implements SchemeFactory {
+  private static class TActiveTraceHistogramStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveTraceHistogramStandardScheme getScheme() {
       return new TActiveTraceHistogramStandardScheme();
     }
   }
 
-  private static class TActiveTraceHistogramStandardScheme extends StandardScheme<TActiveTraceHistogram> {
+  private static class TActiveTraceHistogramStandardScheme extends org.apache.thrift.scheme.StandardScheme<TActiveTraceHistogram> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TActiveTraceHistogram struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -524,7 +491,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
-                struct.activeTraceCount = new ArrayList<Integer>(_list24.size);
+                struct.activeTraceCount = new java.util.ArrayList<java.lang.Integer>(_list24.size);
                 int _elem25;
                 for (int _i26 = 0; _i26 < _list24.size; ++_i26)
                 {
@@ -579,18 +546,18 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
 
   }
 
-  private static class TActiveTraceHistogramTupleSchemeFactory implements SchemeFactory {
+  private static class TActiveTraceHistogramTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveTraceHistogramTupleScheme getScheme() {
       return new TActiveTraceHistogramTupleScheme();
     }
   }
 
-  private static class TActiveTraceHistogramTupleScheme extends TupleScheme<TActiveTraceHistogram> {
+  private static class TActiveTraceHistogramTupleScheme extends org.apache.thrift.scheme.TupleScheme<TActiveTraceHistogram> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TActiveTraceHistogram struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetVersion()) {
         optionals.set(0);
       }
@@ -620,8 +587,8 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TActiveTraceHistogram struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.version = iprot.readI16();
         struct.setVersionIsSet(true);
@@ -633,7 +600,7 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.activeTraceCount = new ArrayList<Integer>(_list29.size);
+          struct.activeTraceCount = new java.util.ArrayList<java.lang.Integer>(_list29.size);
           int _elem30;
           for (int _i31 = 0; _i31 < _list29.size; ++_i31)
           {
@@ -646,5 +613,8 @@ public class TActiveTraceHistogram implements org.apache.thrift.TBase<TActiveTra
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentInfo.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentInfo.java
index 5123b3d48..7e5af07ce 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentInfo.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentInfo.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-2-15")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TAgentInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAgentInfo");
 
@@ -53,21 +26,18 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   private static final org.apache.thrift.protocol.TField SERVER_META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("serverMetaData", org.apache.thrift.protocol.TType.STRUCT, (short)20);
   private static final org.apache.thrift.protocol.TField JVM_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmInfo", org.apache.thrift.protocol.TType.STRUCT, (short)30);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TAgentInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TAgentInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TAgentInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TAgentInfoTupleSchemeFactory();
 
-  private String hostname; // required
-  private String ip; // required
-  private String ports; // required
-  private String agentId; // required
-  private String applicationName; // required
+  private java.lang.String hostname; // required
+  private java.lang.String ip; // required
+  private java.lang.String ports; // required
+  private java.lang.String agentId; // required
+  private java.lang.String applicationName; // required
   private short serviceType; // required
   private int pid; // required
-  private String agentVersion; // required
-  private String vmVersion; // required
+  private java.lang.String agentVersion; // required
+  private java.lang.String vmVersion; // required
   private long startTimestamp; // required
   private long endTimestamp; // optional
   private int endStatus; // optional
@@ -91,10 +61,10 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     SERVER_META_DATA((short)20, "serverMetaData"),
     JVM_INFO((short)30, "jvmInfo");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -143,21 +113,21 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -166,7 +136,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -179,9 +149,9 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   private static final int __ENDSTATUS_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.END_TIMESTAMP,_Fields.END_STATUS,_Fields.SERVER_META_DATA,_Fields.JVM_INFO};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IP, new org.apache.thrift.meta_data.FieldMetaData("ip", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -210,7 +180,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TServerMetaData.class)));
     tmpMap.put(_Fields.JVM_INFO, new org.apache.thrift.meta_data.FieldMetaData("jvmInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TJvmInfo.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAgentInfo.class, metaDataMap);
   }
 
@@ -218,15 +188,15 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public TAgentInfo(
-    String hostname,
-    String ip,
-    String ports,
-    String agentId,
-    String applicationName,
+    java.lang.String hostname,
+    java.lang.String ip,
+    java.lang.String ports,
+    java.lang.String agentId,
+    java.lang.String applicationName,
     short serviceType,
     int pid,
-    String agentVersion,
-    String vmVersion,
+    java.lang.String agentVersion,
+    java.lang.String vmVersion,
     long startTimestamp)
   {
     this();
@@ -311,11 +281,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     this.jvmInfo = null;
   }
 
-  public String getHostname() {
+  public java.lang.String getHostname() {
     return this.hostname;
   }
 
-  public void setHostname(String hostname) {
+  public void setHostname(java.lang.String hostname) {
     this.hostname = hostname;
   }
 
@@ -334,11 +304,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public String getIp() {
+  public java.lang.String getIp() {
     return this.ip;
   }
 
-  public void setIp(String ip) {
+  public void setIp(java.lang.String ip) {
     this.ip = ip;
   }
 
@@ -357,11 +327,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public String getPorts() {
+  public java.lang.String getPorts() {
     return this.ports;
   }
 
-  public void setPorts(String ports) {
+  public void setPorts(java.lang.String ports) {
     this.ports = ports;
   }
 
@@ -380,11 +350,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -403,11 +373,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public String getApplicationName() {
+  public java.lang.String getApplicationName() {
     return this.applicationName;
   }
 
-  public void setApplicationName(String applicationName) {
+  public void setApplicationName(java.lang.String applicationName) {
     this.applicationName = applicationName;
   }
 
@@ -436,16 +406,16 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void unsetServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field serviceType is set (has been assigned a value) and false otherwise */
   public boolean isSetServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   public void setServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
   }
 
   public int getPid() {
@@ -458,23 +428,23 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void unsetPid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PID_ISSET_ID);
   }
 
   /** Returns true if field pid is set (has been assigned a value) and false otherwise */
   public boolean isSetPid() {
-    return EncodingUtils.testBit(__isset_bitfield, __PID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PID_ISSET_ID);
   }
 
   public void setPidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PID_ISSET_ID, value);
   }
 
-  public String getAgentVersion() {
+  public java.lang.String getAgentVersion() {
     return this.agentVersion;
   }
 
-  public void setAgentVersion(String agentVersion) {
+  public void setAgentVersion(java.lang.String agentVersion) {
     this.agentVersion = agentVersion;
   }
 
@@ -493,11 +463,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public String getVmVersion() {
+  public java.lang.String getVmVersion() {
     return this.vmVersion;
   }
 
-  public void setVmVersion(String vmVersion) {
+  public void setVmVersion(java.lang.String vmVersion) {
     this.vmVersion = vmVersion;
   }
 
@@ -526,16 +496,16 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void unsetStartTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field startTimestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   public void setStartTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
   }
 
   public long getEndTimestamp() {
@@ -548,16 +518,16 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void unsetEndTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field endTimestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetEndTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID);
   }
 
   public void setEndTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDTIMESTAMP_ISSET_ID, value);
   }
 
   public int getEndStatus() {
@@ -570,16 +540,16 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void unsetEndStatus() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDSTATUS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDSTATUS_ISSET_ID);
   }
 
   /** Returns true if field endStatus is set (has been assigned a value) and false otherwise */
   public boolean isSetEndStatus() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDSTATUS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDSTATUS_ISSET_ID);
   }
 
   public void setEndStatusIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDSTATUS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDSTATUS_ISSET_ID, value);
   }
 
   public TServerMetaData getServerMetaData() {
@@ -628,13 +598,13 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case HOSTNAME:
       if (value == null) {
         unsetHostname();
       } else {
-        setHostname((String)value);
+        setHostname((java.lang.String)value);
       }
       break;
 
@@ -642,7 +612,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetIp();
       } else {
-        setIp((String)value);
+        setIp((java.lang.String)value);
       }
       break;
 
@@ -650,7 +620,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetPorts();
       } else {
-        setPorts((String)value);
+        setPorts((java.lang.String)value);
       }
       break;
 
@@ -658,7 +628,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -666,7 +636,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -674,7 +644,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetServiceType();
       } else {
-        setServiceType((Short)value);
+        setServiceType((java.lang.Short)value);
       }
       break;
 
@@ -682,7 +652,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetPid();
       } else {
-        setPid((Integer)value);
+        setPid((java.lang.Integer)value);
       }
       break;
 
@@ -690,7 +660,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetAgentVersion();
       } else {
-        setAgentVersion((String)value);
+        setAgentVersion((java.lang.String)value);
       }
       break;
 
@@ -698,7 +668,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetVmVersion();
       } else {
-        setVmVersion((String)value);
+        setVmVersion((java.lang.String)value);
       }
       break;
 
@@ -706,7 +676,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetStartTimestamp();
       } else {
-        setStartTimestamp((Long)value);
+        setStartTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -714,7 +684,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetEndTimestamp();
       } else {
-        setEndTimestamp((Long)value);
+        setEndTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -722,7 +692,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       if (value == null) {
         unsetEndStatus();
       } else {
-        setEndStatus((Integer)value);
+        setEndStatus((java.lang.Integer)value);
       }
       break;
 
@@ -745,7 +715,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case HOSTNAME:
       return getHostname();
@@ -763,10 +733,10 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       return getApplicationName();
 
     case SERVICE_TYPE:
-      return Short.valueOf(getServiceType());
+      return getServiceType();
 
     case PID:
-      return Integer.valueOf(getPid());
+      return getPid();
 
     case AGENT_VERSION:
       return getAgentVersion();
@@ -775,13 +745,13 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       return getVmVersion();
 
     case START_TIMESTAMP:
-      return Long.valueOf(getStartTimestamp());
+      return getStartTimestamp();
 
     case END_TIMESTAMP:
-      return Long.valueOf(getEndTimestamp());
+      return getEndTimestamp();
 
     case END_STATUS:
-      return Integer.valueOf(getEndStatus());
+      return getEndStatus();
 
     case SERVER_META_DATA:
       return getServerMetaData();
@@ -790,13 +760,13 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
       return getJvmInfo();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -829,11 +799,11 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     case JVM_INFO:
       return isSetJvmInfo();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TAgentInfo)
@@ -844,6 +814,8 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   public boolean equals(TAgentInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_hostname = true && this.isSetHostname();
     boolean that_present_hostname = true && that.isSetHostname();
@@ -976,79 +948,59 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_hostname = true && (isSetHostname());
-    list.add(present_hostname);
-    if (present_hostname)
-      list.add(hostname);
+    hashCode = hashCode * 8191 + ((isSetHostname()) ? 131071 : 524287);
+    if (isSetHostname())
+      hashCode = hashCode * 8191 + hostname.hashCode();
 
-    boolean present_ip = true && (isSetIp());
-    list.add(present_ip);
-    if (present_ip)
-      list.add(ip);
+    hashCode = hashCode * 8191 + ((isSetIp()) ? 131071 : 524287);
+    if (isSetIp())
+      hashCode = hashCode * 8191 + ip.hashCode();
 
-    boolean present_ports = true && (isSetPorts());
-    list.add(present_ports);
-    if (present_ports)
-      list.add(ports);
+    hashCode = hashCode * 8191 + ((isSetPorts()) ? 131071 : 524287);
+    if (isSetPorts())
+      hashCode = hashCode * 8191 + ports.hashCode();
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_applicationName = true && (isSetApplicationName());
-    list.add(present_applicationName);
-    if (present_applicationName)
-      list.add(applicationName);
+    hashCode = hashCode * 8191 + ((isSetApplicationName()) ? 131071 : 524287);
+    if (isSetApplicationName())
+      hashCode = hashCode * 8191 + applicationName.hashCode();
 
-    boolean present_serviceType = true;
-    list.add(present_serviceType);
-    if (present_serviceType)
-      list.add(serviceType);
+    hashCode = hashCode * 8191 + serviceType;
 
-    boolean present_pid = true;
-    list.add(present_pid);
-    if (present_pid)
-      list.add(pid);
+    hashCode = hashCode * 8191 + pid;
 
-    boolean present_agentVersion = true && (isSetAgentVersion());
-    list.add(present_agentVersion);
-    if (present_agentVersion)
-      list.add(agentVersion);
+    hashCode = hashCode * 8191 + ((isSetAgentVersion()) ? 131071 : 524287);
+    if (isSetAgentVersion())
+      hashCode = hashCode * 8191 + agentVersion.hashCode();
 
-    boolean present_vmVersion = true && (isSetVmVersion());
-    list.add(present_vmVersion);
-    if (present_vmVersion)
-      list.add(vmVersion);
+    hashCode = hashCode * 8191 + ((isSetVmVersion()) ? 131071 : 524287);
+    if (isSetVmVersion())
+      hashCode = hashCode * 8191 + vmVersion.hashCode();
 
-    boolean present_startTimestamp = true;
-    list.add(present_startTimestamp);
-    if (present_startTimestamp)
-      list.add(startTimestamp);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTimestamp);
 
-    boolean present_endTimestamp = true && (isSetEndTimestamp());
-    list.add(present_endTimestamp);
-    if (present_endTimestamp)
-      list.add(endTimestamp);
+    hashCode = hashCode * 8191 + ((isSetEndTimestamp()) ? 131071 : 524287);
+    if (isSetEndTimestamp())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(endTimestamp);
 
-    boolean present_endStatus = true && (isSetEndStatus());
-    list.add(present_endStatus);
-    if (present_endStatus)
-      list.add(endStatus);
+    hashCode = hashCode * 8191 + ((isSetEndStatus()) ? 131071 : 524287);
+    if (isSetEndStatus())
+      hashCode = hashCode * 8191 + endStatus;
 
-    boolean present_serverMetaData = true && (isSetServerMetaData());
-    list.add(present_serverMetaData);
-    if (present_serverMetaData)
-      list.add(serverMetaData);
+    hashCode = hashCode * 8191 + ((isSetServerMetaData()) ? 131071 : 524287);
+    if (isSetServerMetaData())
+      hashCode = hashCode * 8191 + serverMetaData.hashCode();
 
-    boolean present_jvmInfo = true && (isSetJvmInfo());
-    list.add(present_jvmInfo);
-    if (present_jvmInfo)
-      list.add(jvmInfo);
+    hashCode = hashCode * 8191 + ((isSetJvmInfo()) ? 131071 : 524287);
+    if (isSetJvmInfo())
+      hashCode = hashCode * 8191 + jvmInfo.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -1059,7 +1011,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetHostname()).compareTo(other.isSetHostname());
+    lastComparison = java.lang.Boolean.valueOf(isSetHostname()).compareTo(other.isSetHostname());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1069,7 +1021,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIp()).compareTo(other.isSetIp());
+    lastComparison = java.lang.Boolean.valueOf(isSetIp()).compareTo(other.isSetIp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1079,7 +1031,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPorts()).compareTo(other.isSetPorts());
+    lastComparison = java.lang.Boolean.valueOf(isSetPorts()).compareTo(other.isSetPorts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1089,7 +1041,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1099,7 +1051,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1109,7 +1061,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1119,7 +1071,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPid()).compareTo(other.isSetPid());
+    lastComparison = java.lang.Boolean.valueOf(isSetPid()).compareTo(other.isSetPid());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1129,7 +1081,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentVersion()).compareTo(other.isSetAgentVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentVersion()).compareTo(other.isSetAgentVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1139,7 +1091,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVmVersion()).compareTo(other.isSetVmVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVmVersion()).compareTo(other.isSetVmVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1149,7 +1101,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1159,7 +1111,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndTimestamp()).compareTo(other.isSetEndTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndTimestamp()).compareTo(other.isSetEndTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1169,7 +1121,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndStatus()).compareTo(other.isSetEndStatus());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndStatus()).compareTo(other.isSetEndStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1179,7 +1131,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerMetaData()).compareTo(other.isSetServerMetaData());
+    lastComparison = java.lang.Boolean.valueOf(isSetServerMetaData()).compareTo(other.isSetServerMetaData());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1189,7 +1141,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmInfo()).compareTo(other.isSetJvmInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmInfo()).compareTo(other.isSetJvmInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1207,16 +1159,16 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TAgentInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TAgentInfo(");
     boolean first = true;
 
     sb.append("hostname:");
@@ -1341,7 +1293,7 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1351,13 +1303,13 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
-  private static class TAgentInfoStandardSchemeFactory implements SchemeFactory {
+  private static class TAgentInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentInfoStandardScheme getScheme() {
       return new TAgentInfoStandardScheme();
     }
   }
 
-  private static class TAgentInfoStandardScheme extends StandardScheme<TAgentInfo> {
+  private static class TAgentInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TAgentInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TAgentInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1570,18 +1522,18 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
 
   }
 
-  private static class TAgentInfoTupleSchemeFactory implements SchemeFactory {
+  private static class TAgentInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentInfoTupleScheme getScheme() {
       return new TAgentInfoTupleScheme();
     }
   }
 
-  private static class TAgentInfoTupleScheme extends TupleScheme<TAgentInfo> {
+  private static class TAgentInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TAgentInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TAgentInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetHostname()) {
         optionals.set(0);
       }
@@ -1671,8 +1623,8 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TAgentInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(14);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(14);
       if (incoming.get(0)) {
         struct.hostname = iprot.readString();
         struct.setHostnameIsSet(true);
@@ -1734,5 +1686,8 @@ public class TAgentInfo implements org.apache.thrift.TBase<TAgentInfo, TAgentInf
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStat.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStat.java
index 919996f13..d1c5b2874 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStat.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStat.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-24")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentStat._Fields>, java.io.Serializable, Cloneable, Comparable<TAgentStat> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAgentStat");
 
@@ -39,13 +22,10 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   private static final org.apache.thrift.protocol.TField DATA_SOURCE_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataSourceList", org.apache.thrift.protocol.TType.STRUCT, (short)50);
   private static final org.apache.thrift.protocol.TField METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metadata", org.apache.thrift.protocol.TType.STRING, (short)200);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TAgentStatStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TAgentStatTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TAgentStatStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TAgentStatTupleSchemeFactory();
 
-  private String agentId; // optional
+  private java.lang.String agentId; // optional
   private long startTimestamp; // optional
   private long timestamp; // optional
   private long collectInterval; // optional
@@ -54,7 +34,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   private TTransaction transaction; // optional
   private TActiveTrace activeTrace; // optional
   private TDataSourceList dataSourceList; // optional
-  private String metadata; // optional
+  private java.lang.String metadata; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -69,10 +49,10 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     DATA_SOURCE_LIST((short)50, "dataSourceList"),
     METADATA((short)200, "metadata");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -113,21 +93,21 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -136,7 +116,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -147,9 +127,9 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   private static final int __COLLECTINTERVAL_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.AGENT_ID,_Fields.START_TIMESTAMP,_Fields.TIMESTAMP,_Fields.COLLECT_INTERVAL,_Fields.GC,_Fields.CPU_LOAD,_Fields.TRANSACTION,_Fields.ACTIVE_TRACE,_Fields.DATA_SOURCE_LIST,_Fields.METADATA};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.START_TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("startTimestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -170,7 +150,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "TDataSourceList")));
     tmpMap.put(_Fields.METADATA, new org.apache.thrift.meta_data.FieldMetaData("metadata", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAgentStat.class, metaDataMap);
   }
 
@@ -201,7 +181,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       this.activeTrace = new TActiveTrace(other.activeTrace);
     }
     if (other.isSetDataSourceList()) {
-      this.dataSourceList = other.dataSourceList;
+      this.dataSourceList = new TDataSourceList(other.dataSourceList);
     }
     if (other.isSetMetadata()) {
       this.metadata = other.metadata;
@@ -229,11 +209,11 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     this.metadata = null;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -262,16 +242,16 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   }
 
   public void unsetStartTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field startTimestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   public void setStartTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
   }
 
   public long getTimestamp() {
@@ -284,16 +264,16 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   }
 
   public void unsetTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   public void setTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
   public long getCollectInterval() {
@@ -306,16 +286,16 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   }
 
   public void unsetCollectInterval() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID);
   }
 
   /** Returns true if field collectInterval is set (has been assigned a value) and false otherwise */
   public boolean isSetCollectInterval() {
-    return EncodingUtils.testBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID);
   }
 
   public void setCollectIntervalIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __COLLECTINTERVAL_ISSET_ID, value);
   }
 
   public TJvmGc getGc() {
@@ -433,11 +413,11 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     }
   }
 
-  public String getMetadata() {
+  public java.lang.String getMetadata() {
     return this.metadata;
   }
 
-  public void setMetadata(String metadata) {
+  public void setMetadata(java.lang.String metadata) {
     this.metadata = metadata;
   }
 
@@ -456,13 +436,13 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -470,7 +450,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       if (value == null) {
         unsetStartTimestamp();
       } else {
-        setStartTimestamp((Long)value);
+        setStartTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -478,7 +458,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       if (value == null) {
         unsetTimestamp();
       } else {
-        setTimestamp((Long)value);
+        setTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -486,7 +466,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       if (value == null) {
         unsetCollectInterval();
       } else {
-        setCollectInterval((Long)value);
+        setCollectInterval((java.lang.Long)value);
       }
       break;
 
@@ -534,26 +514,26 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       if (value == null) {
         unsetMetadata();
       } else {
-        setMetadata((String)value);
+        setMetadata((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
 
     case START_TIMESTAMP:
-      return Long.valueOf(getStartTimestamp());
+      return getStartTimestamp();
 
     case TIMESTAMP:
-      return Long.valueOf(getTimestamp());
+      return getTimestamp();
 
     case COLLECT_INTERVAL:
-      return Long.valueOf(getCollectInterval());
+      return getCollectInterval();
 
     case GC:
       return getGc();
@@ -574,13 +554,13 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
       return getMetadata();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -605,11 +585,11 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     case METADATA:
       return isSetMetadata();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TAgentStat)
@@ -620,6 +600,8 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   public boolean equals(TAgentStat that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -716,59 +698,49 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_startTimestamp = true && (isSetStartTimestamp());
-    list.add(present_startTimestamp);
-    if (present_startTimestamp)
-      list.add(startTimestamp);
+    hashCode = hashCode * 8191 + ((isSetStartTimestamp()) ? 131071 : 524287);
+    if (isSetStartTimestamp())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTimestamp);
 
-    boolean present_timestamp = true && (isSetTimestamp());
-    list.add(present_timestamp);
-    if (present_timestamp)
-      list.add(timestamp);
+    hashCode = hashCode * 8191 + ((isSetTimestamp()) ? 131071 : 524287);
+    if (isSetTimestamp())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timestamp);
 
-    boolean present_collectInterval = true && (isSetCollectInterval());
-    list.add(present_collectInterval);
-    if (present_collectInterval)
-      list.add(collectInterval);
+    hashCode = hashCode * 8191 + ((isSetCollectInterval()) ? 131071 : 524287);
+    if (isSetCollectInterval())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(collectInterval);
 
-    boolean present_gc = true && (isSetGc());
-    list.add(present_gc);
-    if (present_gc)
-      list.add(gc);
+    hashCode = hashCode * 8191 + ((isSetGc()) ? 131071 : 524287);
+    if (isSetGc())
+      hashCode = hashCode * 8191 + gc.hashCode();
 
-    boolean present_cpuLoad = true && (isSetCpuLoad());
-    list.add(present_cpuLoad);
-    if (present_cpuLoad)
-      list.add(cpuLoad);
+    hashCode = hashCode * 8191 + ((isSetCpuLoad()) ? 131071 : 524287);
+    if (isSetCpuLoad())
+      hashCode = hashCode * 8191 + cpuLoad.hashCode();
 
-    boolean present_transaction = true && (isSetTransaction());
-    list.add(present_transaction);
-    if (present_transaction)
-      list.add(transaction);
+    hashCode = hashCode * 8191 + ((isSetTransaction()) ? 131071 : 524287);
+    if (isSetTransaction())
+      hashCode = hashCode * 8191 + transaction.hashCode();
 
-    boolean present_activeTrace = true && (isSetActiveTrace());
-    list.add(present_activeTrace);
-    if (present_activeTrace)
-      list.add(activeTrace);
+    hashCode = hashCode * 8191 + ((isSetActiveTrace()) ? 131071 : 524287);
+    if (isSetActiveTrace())
+      hashCode = hashCode * 8191 + activeTrace.hashCode();
 
-    boolean present_dataSourceList = true && (isSetDataSourceList());
-    list.add(present_dataSourceList);
-    if (present_dataSourceList)
-      list.add(dataSourceList);
+    hashCode = hashCode * 8191 + ((isSetDataSourceList()) ? 131071 : 524287);
+    if (isSetDataSourceList())
+      hashCode = hashCode * 8191 + dataSourceList.hashCode();
 
-    boolean present_metadata = true && (isSetMetadata());
-    list.add(present_metadata);
-    if (present_metadata)
-      list.add(metadata);
+    hashCode = hashCode * 8191 + ((isSetMetadata()) ? 131071 : 524287);
+    if (isSetMetadata())
+      hashCode = hashCode * 8191 + metadata.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -779,7 +751,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -789,7 +761,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -799,7 +771,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -809,7 +781,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCollectInterval()).compareTo(other.isSetCollectInterval());
+    lastComparison = java.lang.Boolean.valueOf(isSetCollectInterval()).compareTo(other.isSetCollectInterval());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -819,7 +791,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetGc()).compareTo(other.isSetGc());
+    lastComparison = java.lang.Boolean.valueOf(isSetGc()).compareTo(other.isSetGc());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -829,7 +801,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCpuLoad()).compareTo(other.isSetCpuLoad());
+    lastComparison = java.lang.Boolean.valueOf(isSetCpuLoad()).compareTo(other.isSetCpuLoad());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -839,7 +811,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTransaction()).compareTo(other.isSetTransaction());
+    lastComparison = java.lang.Boolean.valueOf(isSetTransaction()).compareTo(other.isSetTransaction());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -849,7 +821,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetActiveTrace()).compareTo(other.isSetActiveTrace());
+    lastComparison = java.lang.Boolean.valueOf(isSetActiveTrace()).compareTo(other.isSetActiveTrace());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -859,7 +831,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDataSourceList()).compareTo(other.isSetDataSourceList());
+    lastComparison = java.lang.Boolean.valueOf(isSetDataSourceList()).compareTo(other.isSetDataSourceList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -869,7 +841,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMetadata()).compareTo(other.isSetMetadata());
+    lastComparison = java.lang.Boolean.valueOf(isSetMetadata()).compareTo(other.isSetMetadata());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -887,16 +859,16 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TAgentStat(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TAgentStat(");
     boolean first = true;
 
     if (isSetAgentId()) {
@@ -1015,7 +987,7 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1025,13 +997,13 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     }
   }
 
-  private static class TAgentStatStandardSchemeFactory implements SchemeFactory {
+  private static class TAgentStatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentStatStandardScheme getScheme() {
       return new TAgentStatStandardScheme();
     }
   }
 
-  private static class TAgentStatStandardScheme extends StandardScheme<TAgentStat> {
+  private static class TAgentStatStandardScheme extends org.apache.thrift.scheme.StandardScheme<TAgentStat> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TAgentStat struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1211,18 +1183,18 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
 
   }
 
-  private static class TAgentStatTupleSchemeFactory implements SchemeFactory {
+  private static class TAgentStatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentStatTupleScheme getScheme() {
       return new TAgentStatTupleScheme();
     }
   }
 
-  private static class TAgentStatTupleScheme extends TupleScheme<TAgentStat> {
+  private static class TAgentStatTupleScheme extends org.apache.thrift.scheme.TupleScheme<TAgentStat> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TAgentStat struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -1288,8 +1260,8 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TAgentStat struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(10);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(10);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -1338,5 +1310,8 @@ public class TAgentStat implements org.apache.thrift.TBase<TAgentStat, TAgentSta
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStatBatch.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStatBatch.java
index 3ff9786a2..3abc28c5f 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStatBatch.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAgentStatBatch.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch, TAgentStatBatch._Fields>, java.io.Serializable, Cloneable, Comparable<TAgentStatBatch> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAgentStatBatch");
 
@@ -42,15 +15,12 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   private static final org.apache.thrift.protocol.TField START_TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("startTimestamp", org.apache.thrift.protocol.TType.I64, (short)2);
   private static final org.apache.thrift.protocol.TField AGENT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("agentStats", org.apache.thrift.protocol.TType.LIST, (short)10);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TAgentStatBatchStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TAgentStatBatchTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TAgentStatBatchStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TAgentStatBatchTupleSchemeFactory();
 
-  private String agentId; // required
+  private java.lang.String agentId; // required
   private long startTimestamp; // required
-  private List<TAgentStat> agentStats; // required
+  private java.util.List<TAgentStat> agentStats; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     START_TIMESTAMP((short)2, "startTimestamp"),
     AGENT_STATS((short)10, "agentStats");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -88,21 +58,21 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +81,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -119,9 +89,9 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   // isset id assignments
   private static final int __STARTTIMESTAMP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.START_TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("startTimestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -129,7 +99,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     tmpMap.put(_Fields.AGENT_STATS, new org.apache.thrift.meta_data.FieldMetaData("agentStats", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAgentStat.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAgentStatBatch.class, metaDataMap);
   }
 
@@ -137,9 +107,9 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   }
 
   public TAgentStatBatch(
-    String agentId,
+    java.lang.String agentId,
     long startTimestamp,
-    List<TAgentStat> agentStats)
+    java.util.List<TAgentStat> agentStats)
   {
     this();
     this.agentId = agentId;
@@ -158,7 +128,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     }
     this.startTimestamp = other.startTimestamp;
     if (other.isSetAgentStats()) {
-      List<TAgentStat> __this__agentStats = new ArrayList<TAgentStat>(other.agentStats.size());
+      java.util.List<TAgentStat> __this__agentStats = new java.util.ArrayList<TAgentStat>(other.agentStats.size());
       for (TAgentStat other_element : other.agentStats) {
         __this__agentStats.add(new TAgentStat(other_element));
       }
@@ -178,11 +148,11 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     this.agentStats = null;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -211,16 +181,16 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   }
 
   public void unsetStartTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field startTimestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID);
   }
 
   public void setStartTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIMESTAMP_ISSET_ID, value);
   }
 
   public int getAgentStatsSize() {
@@ -233,16 +203,16 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
 
   public void addToAgentStats(TAgentStat elem) {
     if (this.agentStats == null) {
-      this.agentStats = new ArrayList<TAgentStat>();
+      this.agentStats = new java.util.ArrayList<TAgentStat>();
     }
     this.agentStats.add(elem);
   }
 
-  public List<TAgentStat> getAgentStats() {
+  public java.util.List<TAgentStat> getAgentStats() {
     return this.agentStats;
   }
 
-  public void setAgentStats(List<TAgentStat> agentStats) {
+  public void setAgentStats(java.util.List<TAgentStat> agentStats) {
     this.agentStats = agentStats;
   }
 
@@ -261,13 +231,13 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -275,7 +245,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
       if (value == null) {
         unsetStartTimestamp();
       } else {
-        setStartTimestamp((Long)value);
+        setStartTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -283,32 +253,32 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
       if (value == null) {
         unsetAgentStats();
       } else {
-        setAgentStats((List<TAgentStat>)value);
+        setAgentStats((java.util.List<TAgentStat>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
 
     case START_TIMESTAMP:
-      return Long.valueOf(getStartTimestamp());
+      return getStartTimestamp();
 
     case AGENT_STATS:
       return getAgentStats();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -319,11 +289,11 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     case AGENT_STATS:
       return isSetAgentStats();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TAgentStatBatch)
@@ -334,6 +304,8 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   public boolean equals(TAgentStatBatch that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -367,24 +339,19 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_startTimestamp = true;
-    list.add(present_startTimestamp);
-    if (present_startTimestamp)
-      list.add(startTimestamp);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTimestamp);
 
-    boolean present_agentStats = true && (isSetAgentStats());
-    list.add(present_agentStats);
-    if (present_agentStats)
-      list.add(agentStats);
+    hashCode = hashCode * 8191 + ((isSetAgentStats()) ? 131071 : 524287);
+    if (isSetAgentStats())
+      hashCode = hashCode * 8191 + agentStats.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -395,7 +362,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -405,7 +372,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTimestamp()).compareTo(other.isSetStartTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -415,7 +382,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStats()).compareTo(other.isSetAgentStats());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStats()).compareTo(other.isSetAgentStats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -433,16 +400,16 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TAgentStatBatch(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TAgentStatBatch(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -481,7 +448,7 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -491,13 +458,13 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     }
   }
 
-  private static class TAgentStatBatchStandardSchemeFactory implements SchemeFactory {
+  private static class TAgentStatBatchStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentStatBatchStandardScheme getScheme() {
       return new TAgentStatBatchStandardScheme();
     }
   }
 
-  private static class TAgentStatBatchStandardScheme extends StandardScheme<TAgentStatBatch> {
+  private static class TAgentStatBatchStandardScheme extends org.apache.thrift.scheme.StandardScheme<TAgentStatBatch> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TAgentStatBatch struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -528,14 +495,14 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
           case 10: // AGENT_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
-                struct.agentStats = new ArrayList<TAgentStat>(_list24.size);
-                TAgentStat _elem25;
-                for (int _i26 = 0; _i26 < _list24.size; ++_i26)
+                org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
+                struct.agentStats = new java.util.ArrayList<TAgentStat>(_list32.size);
+                TAgentStat _elem33;
+                for (int _i34 = 0; _i34 < _list32.size; ++_i34)
                 {
-                  _elem25 = new TAgentStat();
-                  _elem25.read(iprot);
-                  struct.agentStats.add(_elem25);
+                  _elem33 = new TAgentStat();
+                  _elem33.read(iprot);
+                  struct.agentStats.add(_elem33);
                 }
                 iprot.readListEnd();
               }
@@ -569,9 +536,9 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
         oprot.writeFieldBegin(AGENT_STATS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.agentStats.size()));
-          for (TAgentStat _iter27 : struct.agentStats)
+          for (TAgentStat _iter35 : struct.agentStats)
           {
-            _iter27.write(oprot);
+            _iter35.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -583,18 +550,18 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
 
   }
 
-  private static class TAgentStatBatchTupleSchemeFactory implements SchemeFactory {
+  private static class TAgentStatBatchTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAgentStatBatchTupleScheme getScheme() {
       return new TAgentStatBatchTupleScheme();
     }
   }
 
-  private static class TAgentStatBatchTupleScheme extends TupleScheme<TAgentStatBatch> {
+  private static class TAgentStatBatchTupleScheme extends org.apache.thrift.scheme.TupleScheme<TAgentStatBatch> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TAgentStatBatch struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -614,9 +581,9 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
       if (struct.isSetAgentStats()) {
         {
           oprot.writeI32(struct.agentStats.size());
-          for (TAgentStat _iter28 : struct.agentStats)
+          for (TAgentStat _iter36 : struct.agentStats)
           {
-            _iter28.write(oprot);
+            _iter36.write(oprot);
           }
         }
       }
@@ -624,8 +591,8 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TAgentStatBatch struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -636,14 +603,14 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.agentStats = new ArrayList<TAgentStat>(_list29.size);
-          TAgentStat _elem30;
-          for (int _i31 = 0; _i31 < _list29.size; ++_i31)
+          org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.agentStats = new java.util.ArrayList<TAgentStat>(_list37.size);
+          TAgentStat _elem38;
+          for (int _i39 = 0; _i39 < _list37.size; ++_i39)
           {
-            _elem30 = new TAgentStat();
-            _elem30.read(iprot);
-            struct.agentStats.add(_elem30);
+            _elem38 = new TAgentStat();
+            _elem38.read(iprot);
+            struct.agentStats.add(_elem38);
           }
         }
         struct.setAgentStatsIsSet(true);
@@ -651,5 +618,8 @@ public class TAgentStatBatch implements org.apache.thrift.TBase<TAgentStatBatch,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotation.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotation.java
index a4368147f..b1d28542a 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotation.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotation.java
@@ -1,51 +1,21 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnotation._Fields>, java.io.Serializable, Cloneable, Comparable<TAnnotation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAnnotation");
 
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TAnnotationStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TAnnotationTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TAnnotationStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TAnnotationTupleSchemeFactory();
 
   private int key; // required
   private TAnnotationValue value; // optional
@@ -55,10 +25,10 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     KEY((short)1, "key"),
     VALUE((short)2, "value");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +76,7 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -115,14 +85,14 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
   private static final int __KEY_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.VALUE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAnnotationValue.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAnnotation.class, metaDataMap);
   }
 
@@ -169,16 +139,16 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
   }
 
   public void unsetKey() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __KEY_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __KEY_ISSET_ID);
   }
 
   /** Returns true if field key is set (has been assigned a value) and false otherwise */
   public boolean isSetKey() {
-    return EncodingUtils.testBit(__isset_bitfield, __KEY_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __KEY_ISSET_ID);
   }
 
   public void setKeyIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __KEY_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __KEY_ISSET_ID, value);
   }
 
   public TAnnotationValue getValue() {
@@ -204,13 +174,13 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case KEY:
       if (value == null) {
         unsetKey();
       } else {
-        setKey((Integer)value);
+        setKey((java.lang.Integer)value);
       }
       break;
 
@@ -225,22 +195,22 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case KEY:
-      return Integer.valueOf(getKey());
+      return getKey();
 
     case VALUE:
       return getValue();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -249,11 +219,11 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     case VALUE:
       return isSetValue();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TAnnotation)
@@ -264,6 +234,8 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
   public boolean equals(TAnnotation that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_key = true;
     boolean that_present_key = true;
@@ -288,19 +260,15 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_key = true;
-    list.add(present_key);
-    if (present_key)
-      list.add(key);
+    hashCode = hashCode * 8191 + key;
 
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -311,7 +279,7 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
+    lastComparison = java.lang.Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -321,7 +289,7 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -339,16 +307,16 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TAnnotation(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TAnnotation(");
     boolean first = true;
 
     sb.append("key:");
@@ -381,7 +349,7 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -391,13 +359,13 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     }
   }
 
-  private static class TAnnotationStandardSchemeFactory implements SchemeFactory {
+  private static class TAnnotationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAnnotationStandardScheme getScheme() {
       return new TAnnotationStandardScheme();
     }
   }
 
-  private static class TAnnotationStandardScheme extends StandardScheme<TAnnotation> {
+  private static class TAnnotationStandardScheme extends org.apache.thrift.scheme.StandardScheme<TAnnotation> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TAnnotation struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -455,18 +423,18 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
 
   }
 
-  private static class TAnnotationTupleSchemeFactory implements SchemeFactory {
+  private static class TAnnotationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAnnotationTupleScheme getScheme() {
       return new TAnnotationTupleScheme();
     }
   }
 
-  private static class TAnnotationTupleScheme extends TupleScheme<TAnnotation> {
+  private static class TAnnotationTupleScheme extends org.apache.thrift.scheme.TupleScheme<TAnnotation> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TAnnotation struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetKey()) {
         optionals.set(0);
       }
@@ -484,8 +452,8 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TAnnotation struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.key = iprot.readI32();
         struct.setKeyIsSet(true);
@@ -498,5 +466,8 @@ public class TAnnotation implements org.apache.thrift.TBase<TAnnotation, TAnnota
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotationValue.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotationValue.java
index 188ec01c5..cb8399d83 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotationValue.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TAnnotationValue.java
@@ -1,39 +1,12 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue, TAnnotationValue._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAnnotationValue");
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -60,10 +33,10 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     INT_STRING_VALUE((short)9, "intStringValue"),
     INT_STRING_STRING_VALUE((short)10, "intStringStringValue");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -104,21 +77,21 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -127,35 +100,35 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
-    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
-    tmpMap.put(_Fields.INT_STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intStringValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.INT_STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intStringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TIntStringValue.class)));
-    tmpMap.put(_Fields.INT_STRING_STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intStringStringValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.INT_STRING_STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intStringStringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TIntStringStringValue.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAnnotationValue.class, metaDataMap);
   }
 
@@ -163,7 +136,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     super();
   }
 
-  public TAnnotationValue(_Fields setField, Object value) {
+  public TAnnotationValue(_Fields setField, java.lang.Object value) {
     super(setField, value);
   }
 
@@ -174,7 +147,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     return new TAnnotationValue(this);
   }
 
-  public static TAnnotationValue stringValue(String value) {
+  public static TAnnotationValue stringValue(java.lang.String value) {
     TAnnotationValue x = new TAnnotationValue();
     x.setStringValue(value);
     return x;
@@ -210,7 +183,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     return x;
   }
 
-  public static TAnnotationValue binaryValue(ByteBuffer value) {
+  public static TAnnotationValue binaryValue(java.nio.ByteBuffer value) {
     TAnnotationValue x = new TAnnotationValue();
     x.setBinaryValue(value);
     return x;
@@ -218,7 +191,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public static TAnnotationValue binaryValue(byte[] value) {
     TAnnotationValue x = new TAnnotationValue();
-    x.setBinaryValue(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
+    x.setBinaryValue(java.nio.ByteBuffer.wrap(value.clone()));
     return x;
   }
 
@@ -242,71 +215,71 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
 
   @Override
-  protected void checkType(_Fields setField, Object value) throws ClassCastException {
+  protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException {
     switch (setField) {
       case STRING_VALUE:
-        if (value instanceof String) {
+        if (value instanceof java.lang.String) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type String for field 'stringValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.String for field 'stringValue', but got " + value.getClass().getSimpleName());
       case BOOL_VALUE:
-        if (value instanceof Boolean) {
+        if (value instanceof java.lang.Boolean) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Boolean for field 'boolValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Boolean for field 'boolValue', but got " + value.getClass().getSimpleName());
       case INT_VALUE:
-        if (value instanceof Integer) {
+        if (value instanceof java.lang.Integer) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Integer for field 'intValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Integer for field 'intValue', but got " + value.getClass().getSimpleName());
       case LONG_VALUE:
-        if (value instanceof Long) {
+        if (value instanceof java.lang.Long) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Long for field 'longValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Long for field 'longValue', but got " + value.getClass().getSimpleName());
       case SHORT_VALUE:
-        if (value instanceof Short) {
+        if (value instanceof java.lang.Short) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Short for field 'shortValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Short for field 'shortValue', but got " + value.getClass().getSimpleName());
       case DOUBLE_VALUE:
-        if (value instanceof Double) {
+        if (value instanceof java.lang.Double) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Double for field 'doubleValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Double for field 'doubleValue', but got " + value.getClass().getSimpleName());
       case BINARY_VALUE:
-        if (value instanceof ByteBuffer) {
+        if (value instanceof java.nio.ByteBuffer) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type ByteBuffer for field 'binaryValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.nio.ByteBuffer for field 'binaryValue', but got " + value.getClass().getSimpleName());
       case BYTE_VALUE:
-        if (value instanceof Byte) {
+        if (value instanceof java.lang.Byte) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type Byte for field 'byteValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Byte for field 'byteValue', but got " + value.getClass().getSimpleName());
       case INT_STRING_VALUE:
         if (value instanceof TIntStringValue) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type TIntStringValue for field 'intStringValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type TIntStringValue for field 'intStringValue', but got " + value.getClass().getSimpleName());
       case INT_STRING_STRING_VALUE:
         if (value instanceof TIntStringStringValue) {
           break;
         }
-        throw new ClassCastException("Was expecting value of type TIntStringStringValue for field 'intStringStringValue', but got " + value.getClass().getSimpleName());
+        throw new java.lang.ClassCastException("Was expecting value of type TIntStringStringValue for field 'intStringStringValue', but got " + value.getClass().getSimpleName());
       default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
+        throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
     }
   }
 
   @Override
-  protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
         case STRING_VALUE:
           if (field.type == STRING_VALUE_FIELD_DESC.type) {
-            String stringValue;
+            java.lang.String stringValue;
             stringValue = iprot.readString();
             return stringValue;
           } else {
@@ -315,7 +288,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case BOOL_VALUE:
           if (field.type == BOOL_VALUE_FIELD_DESC.type) {
-            Boolean boolValue;
+            java.lang.Boolean boolValue;
             boolValue = iprot.readBool();
             return boolValue;
           } else {
@@ -324,7 +297,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case INT_VALUE:
           if (field.type == INT_VALUE_FIELD_DESC.type) {
-            Integer intValue;
+            java.lang.Integer intValue;
             intValue = iprot.readI32();
             return intValue;
           } else {
@@ -333,7 +306,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case LONG_VALUE:
           if (field.type == LONG_VALUE_FIELD_DESC.type) {
-            Long longValue;
+            java.lang.Long longValue;
             longValue = iprot.readI64();
             return longValue;
           } else {
@@ -342,7 +315,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case SHORT_VALUE:
           if (field.type == SHORT_VALUE_FIELD_DESC.type) {
-            Short shortValue;
+            java.lang.Short shortValue;
             shortValue = iprot.readI16();
             return shortValue;
           } else {
@@ -351,7 +324,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case DOUBLE_VALUE:
           if (field.type == DOUBLE_VALUE_FIELD_DESC.type) {
-            Double doubleValue;
+            java.lang.Double doubleValue;
             doubleValue = iprot.readDouble();
             return doubleValue;
           } else {
@@ -360,7 +333,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case BINARY_VALUE:
           if (field.type == BINARY_VALUE_FIELD_DESC.type) {
-            ByteBuffer binaryValue;
+            java.nio.ByteBuffer binaryValue;
             binaryValue = iprot.readBinary();
             return binaryValue;
           } else {
@@ -369,7 +342,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           }
         case BYTE_VALUE:
           if (field.type == BYTE_VALUE_FIELD_DESC.type) {
-            Byte byteValue;
+            java.lang.Byte byteValue;
             byteValue = iprot.readByte();
             return byteValue;
           } else {
@@ -397,7 +370,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
             return null;
           }
         default:
-          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+          throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
       org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
@@ -409,35 +382,35 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
   protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     switch (setField_) {
       case STRING_VALUE:
-        String stringValue = (String)value_;
+        java.lang.String stringValue = (java.lang.String)value_;
         oprot.writeString(stringValue);
         return;
       case BOOL_VALUE:
-        Boolean boolValue = (Boolean)value_;
+        java.lang.Boolean boolValue = (java.lang.Boolean)value_;
         oprot.writeBool(boolValue);
         return;
       case INT_VALUE:
-        Integer intValue = (Integer)value_;
+        java.lang.Integer intValue = (java.lang.Integer)value_;
         oprot.writeI32(intValue);
         return;
       case LONG_VALUE:
-        Long longValue = (Long)value_;
+        java.lang.Long longValue = (java.lang.Long)value_;
         oprot.writeI64(longValue);
         return;
       case SHORT_VALUE:
-        Short shortValue = (Short)value_;
+        java.lang.Short shortValue = (java.lang.Short)value_;
         oprot.writeI16(shortValue);
         return;
       case DOUBLE_VALUE:
-        Double doubleValue = (Double)value_;
+        java.lang.Double doubleValue = (java.lang.Double)value_;
         oprot.writeDouble(doubleValue);
         return;
       case BINARY_VALUE:
-        ByteBuffer binaryValue = (ByteBuffer)value_;
+        java.nio.ByteBuffer binaryValue = (java.nio.ByteBuffer)value_;
         oprot.writeBinary(binaryValue);
         return;
       case BYTE_VALUE:
-        Byte byteValue = (Byte)value_;
+        java.lang.Byte byteValue = (java.lang.Byte)value_;
         oprot.writeByte(byteValue);
         return;
       case INT_STRING_VALUE:
@@ -449,45 +422,45 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
         intStringStringValue.write(oprot);
         return;
       default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+        throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
     }
   }
 
   @Override
-  protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
         case STRING_VALUE:
-          String stringValue;
+          java.lang.String stringValue;
           stringValue = iprot.readString();
           return stringValue;
         case BOOL_VALUE:
-          Boolean boolValue;
+          java.lang.Boolean boolValue;
           boolValue = iprot.readBool();
           return boolValue;
         case INT_VALUE:
-          Integer intValue;
+          java.lang.Integer intValue;
           intValue = iprot.readI32();
           return intValue;
         case LONG_VALUE:
-          Long longValue;
+          java.lang.Long longValue;
           longValue = iprot.readI64();
           return longValue;
         case SHORT_VALUE:
-          Short shortValue;
+          java.lang.Short shortValue;
           shortValue = iprot.readI16();
           return shortValue;
         case DOUBLE_VALUE:
-          Double doubleValue;
+          java.lang.Double doubleValue;
           doubleValue = iprot.readDouble();
           return doubleValue;
         case BINARY_VALUE:
-          ByteBuffer binaryValue;
+          java.nio.ByteBuffer binaryValue;
           binaryValue = iprot.readBinary();
           return binaryValue;
         case BYTE_VALUE:
-          Byte byteValue;
+          java.lang.Byte byteValue;
           byteValue = iprot.readByte();
           return byteValue;
         case INT_STRING_VALUE:
@@ -501,10 +474,10 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
           intStringStringValue.read(iprot);
           return intStringStringValue;
         default:
-          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+          throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
@@ -512,35 +485,35 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
   protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     switch (setField_) {
       case STRING_VALUE:
-        String stringValue = (String)value_;
+        java.lang.String stringValue = (java.lang.String)value_;
         oprot.writeString(stringValue);
         return;
       case BOOL_VALUE:
-        Boolean boolValue = (Boolean)value_;
+        java.lang.Boolean boolValue = (java.lang.Boolean)value_;
         oprot.writeBool(boolValue);
         return;
       case INT_VALUE:
-        Integer intValue = (Integer)value_;
+        java.lang.Integer intValue = (java.lang.Integer)value_;
         oprot.writeI32(intValue);
         return;
       case LONG_VALUE:
-        Long longValue = (Long)value_;
+        java.lang.Long longValue = (java.lang.Long)value_;
         oprot.writeI64(longValue);
         return;
       case SHORT_VALUE:
-        Short shortValue = (Short)value_;
+        java.lang.Short shortValue = (java.lang.Short)value_;
         oprot.writeI16(shortValue);
         return;
       case DOUBLE_VALUE:
-        Double doubleValue = (Double)value_;
+        java.lang.Double doubleValue = (java.lang.Double)value_;
         oprot.writeDouble(doubleValue);
         return;
       case BINARY_VALUE:
-        ByteBuffer binaryValue = (ByteBuffer)value_;
+        java.nio.ByteBuffer binaryValue = (java.nio.ByteBuffer)value_;
         oprot.writeBinary(binaryValue);
         return;
       case BYTE_VALUE:
-        Byte byteValue = (Byte)value_;
+        java.lang.Byte byteValue = (java.lang.Byte)value_;
         oprot.writeByte(byteValue);
         return;
       case INT_STRING_VALUE:
@@ -552,7 +525,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
         intStringStringValue.write(oprot);
         return;
       default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+        throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
     }
   }
 
@@ -580,7 +553,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
       case INT_STRING_STRING_VALUE:
         return INT_STRING_STRING_VALUE_FIELD_DESC;
       default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
+        throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
     }
   }
 
@@ -599,25 +572,25 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
   }
 
 
-  public String getStringValue() {
+  public java.lang.String getStringValue() {
     if (getSetField() == _Fields.STRING_VALUE) {
-      return (String)getFieldValue();
+      return (java.lang.String)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'stringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'stringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
-  public void setStringValue(String value) {
-    if (value == null) throw new NullPointerException();
+  public void setStringValue(java.lang.String value) {
+    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.STRING_VALUE;
     value_ = value;
   }
 
   public boolean getBoolValue() {
     if (getSetField() == _Fields.BOOL_VALUE) {
-      return (Boolean)getFieldValue();
+      return (java.lang.Boolean)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'boolValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'boolValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -628,9 +601,9 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public int getIntValue() {
     if (getSetField() == _Fields.INT_VALUE) {
-      return (Integer)getFieldValue();
+      return (java.lang.Integer)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'intValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'intValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -641,9 +614,9 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public long getLongValue() {
     if (getSetField() == _Fields.LONG_VALUE) {
-      return (Long)getFieldValue();
+      return (java.lang.Long)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'longValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'longValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -654,9 +627,9 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public short getShortValue() {
     if (getSetField() == _Fields.SHORT_VALUE) {
-      return (Short)getFieldValue();
+      return (java.lang.Short)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'shortValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'shortValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -667,9 +640,9 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public double getDoubleValue() {
     if (getSetField() == _Fields.DOUBLE_VALUE) {
-      return (Double)getFieldValue();
+      return (java.lang.Double)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'doubleValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'doubleValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -680,33 +653,33 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   public byte[] getBinaryValue() {
     setBinaryValue(org.apache.thrift.TBaseHelper.rightSize(bufferForBinaryValue()));
-    ByteBuffer b = bufferForBinaryValue();
+    java.nio.ByteBuffer b = bufferForBinaryValue();
     return b == null ? null : b.array();
   }
 
-  public ByteBuffer bufferForBinaryValue() {
+  public java.nio.ByteBuffer bufferForBinaryValue() {
     if (getSetField() == _Fields.BINARY_VALUE) {
-      return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());
+      return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
     } else {
-      throw new RuntimeException("Cannot get field 'binaryValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'binaryValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
   public void setBinaryValue(byte[] value) {
-    setBinaryValue(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
+    setBinaryValue(java.nio.ByteBuffer.wrap(value.clone()));
   }
 
-  public void setBinaryValue(ByteBuffer value) {
-    if (value == null) throw new NullPointerException();
+  public void setBinaryValue(java.nio.ByteBuffer value) {
+    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.BINARY_VALUE;
     value_ = value;
   }
 
   public byte getByteValue() {
     if (getSetField() == _Fields.BYTE_VALUE) {
-      return (Byte)getFieldValue();
+      return (java.lang.Byte)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'byteValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'byteValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
@@ -719,12 +692,12 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     if (getSetField() == _Fields.INT_STRING_VALUE) {
       return (TIntStringValue)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'intStringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'intStringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
   public void setIntStringValue(TIntStringValue value) {
-    if (value == null) throw new NullPointerException();
+    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.INT_STRING_VALUE;
     value_ = value;
   }
@@ -733,12 +706,12 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
     if (getSetField() == _Fields.INT_STRING_STRING_VALUE) {
       return (TIntStringStringValue)getFieldValue();
     } else {
-      throw new RuntimeException("Cannot get field 'intStringStringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+      throw new java.lang.RuntimeException("Cannot get field 'intStringStringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
   public void setIntStringStringValue(TIntStringStringValue value) {
-    if (value == null) throw new NullPointerException();
+    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.INT_STRING_STRING_VALUE;
     value_ = value;
   }
@@ -793,7 +766,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
   }
 
 
-  public boolean equals(Object other) {
+  public boolean equals(java.lang.Object other) {
     if (other instanceof TAnnotationValue) {
       return equals((TAnnotationValue)other);
     } else {
@@ -817,12 +790,12 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
     org.apache.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
-      Object value = getFieldValue();
+      java.lang.Object value = getFieldValue();
       if (value instanceof org.apache.thrift.TEnum) {
         list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
       } else {
@@ -840,7 +813,7 @@ public class TAnnotationValue extends org.apache.thrift.TUnion<TAnnotationValue,
   }
 
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TApiMetaData.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TApiMetaData.java
index c60b608e5..37669d10e 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TApiMetaData.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TApiMetaData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiMetaData._Fields>, java.io.Serializable, Cloneable, Comparable<TApiMetaData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TApiMetaData");
 
@@ -45,16 +18,13 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   private static final org.apache.thrift.protocol.TField LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("line", org.apache.thrift.protocol.TType.I32, (short)6);
   private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)10);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TApiMetaDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TApiMetaDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TApiMetaDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TApiMetaDataTupleSchemeFactory();
 
-  private String agentId; // required
+  private java.lang.String agentId; // required
   private long agentStartTime; // required
   private int apiId; // required
-  private String apiInfo; // required
+  private java.lang.String apiInfo; // required
   private int line; // optional
   private int type; // optional
 
@@ -67,10 +37,10 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     LINE((short)6, "line"),
     TYPE((short)10, "type");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -103,21 +73,21 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -126,7 +96,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -138,9 +108,9 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   private static final int __TYPE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.LINE,_Fields.TYPE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.AGENT_START_TIME, new org.apache.thrift.meta_data.FieldMetaData("agentStartTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -153,7 +123,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TApiMetaData.class, metaDataMap);
   }
 
@@ -161,10 +131,10 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public TApiMetaData(
-    String agentId,
+    java.lang.String agentId,
     long agentStartTime,
     int apiId,
-    String apiInfo)
+    java.lang.String apiInfo)
   {
     this();
     this.agentId = agentId;
@@ -210,11 +180,11 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     this.type = 0;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -243,16 +213,16 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public void unsetAgentStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   /** Returns true if field agentStartTime is set (has been assigned a value) and false otherwise */
   public boolean isSetAgentStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   public void setAgentStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
   }
 
   public int getApiId() {
@@ -265,23 +235,23 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public void unsetApiId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   /** Returns true if field apiId is set (has been assigned a value) and false otherwise */
   public boolean isSetApiId() {
-    return EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   public void setApiIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
   }
 
-  public String getApiInfo() {
+  public java.lang.String getApiInfo() {
     return this.apiInfo;
   }
 
-  public void setApiInfo(String apiInfo) {
+  public void setApiInfo(java.lang.String apiInfo) {
     this.apiInfo = apiInfo;
   }
 
@@ -310,16 +280,16 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public void unsetLine() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LINE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LINE_ISSET_ID);
   }
 
   /** Returns true if field line is set (has been assigned a value) and false otherwise */
   public boolean isSetLine() {
-    return EncodingUtils.testBit(__isset_bitfield, __LINE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LINE_ISSET_ID);
   }
 
   public void setLineIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LINE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LINE_ISSET_ID, value);
   }
 
   public int getType() {
@@ -332,25 +302,25 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public void unsetType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TYPE_ISSET_ID);
   }
 
   /** Returns true if field type is set (has been assigned a value) and false otherwise */
   public boolean isSetType() {
-    return EncodingUtils.testBit(__isset_bitfield, __TYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TYPE_ISSET_ID);
   }
 
   public void setTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TYPE_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -358,7 +328,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       if (value == null) {
         unsetAgentStartTime();
       } else {
-        setAgentStartTime((Long)value);
+        setAgentStartTime((java.lang.Long)value);
       }
       break;
 
@@ -366,7 +336,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       if (value == null) {
         unsetApiId();
       } else {
-        setApiId((Integer)value);
+        setApiId((java.lang.Integer)value);
       }
       break;
 
@@ -374,7 +344,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       if (value == null) {
         unsetApiInfo();
       } else {
-        setApiInfo((String)value);
+        setApiInfo((java.lang.String)value);
       }
       break;
 
@@ -382,7 +352,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       if (value == null) {
         unsetLine();
       } else {
-        setLine((Integer)value);
+        setLine((java.lang.Integer)value);
       }
       break;
 
@@ -390,41 +360,41 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
       if (value == null) {
         unsetType();
       } else {
-        setType((Integer)value);
+        setType((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
 
     case AGENT_START_TIME:
-      return Long.valueOf(getAgentStartTime());
+      return getAgentStartTime();
 
     case API_ID:
-      return Integer.valueOf(getApiId());
+      return getApiId();
 
     case API_INFO:
       return getApiInfo();
 
     case LINE:
-      return Integer.valueOf(getLine());
+      return getLine();
 
     case TYPE:
-      return Integer.valueOf(getType());
+      return getType();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -441,11 +411,11 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     case TYPE:
       return isSetType();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TApiMetaData)
@@ -456,6 +426,8 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   public boolean equals(TApiMetaData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -516,39 +488,29 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_agentStartTime = true;
-    list.add(present_agentStartTime);
-    if (present_agentStartTime)
-      list.add(agentStartTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(agentStartTime);
 
-    boolean present_apiId = true;
-    list.add(present_apiId);
-    if (present_apiId)
-      list.add(apiId);
+    hashCode = hashCode * 8191 + apiId;
 
-    boolean present_apiInfo = true && (isSetApiInfo());
-    list.add(present_apiInfo);
-    if (present_apiInfo)
-      list.add(apiInfo);
+    hashCode = hashCode * 8191 + ((isSetApiInfo()) ? 131071 : 524287);
+    if (isSetApiInfo())
+      hashCode = hashCode * 8191 + apiInfo.hashCode();
 
-    boolean present_line = true && (isSetLine());
-    list.add(present_line);
-    if (present_line)
-      list.add(line);
+    hashCode = hashCode * 8191 + ((isSetLine()) ? 131071 : 524287);
+    if (isSetLine())
+      hashCode = hashCode * 8191 + line;
 
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type);
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -559,7 +521,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -569,7 +531,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -579,7 +541,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
+    lastComparison = java.lang.Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -589,7 +551,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApiInfo()).compareTo(other.isSetApiInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetApiInfo()).compareTo(other.isSetApiInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -599,7 +561,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLine()).compareTo(other.isSetLine());
+    lastComparison = java.lang.Boolean.valueOf(isSetLine()).compareTo(other.isSetLine());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -609,7 +571,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -627,16 +589,16 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TApiMetaData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TApiMetaData(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -691,7 +653,7 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -701,13 +663,13 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     }
   }
 
-  private static class TApiMetaDataStandardSchemeFactory implements SchemeFactory {
+  private static class TApiMetaDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TApiMetaDataStandardScheme getScheme() {
       return new TApiMetaDataStandardScheme();
     }
   }
 
-  private static class TApiMetaDataStandardScheme extends StandardScheme<TApiMetaData> {
+  private static class TApiMetaDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<TApiMetaData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TApiMetaData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -812,18 +774,18 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
 
   }
 
-  private static class TApiMetaDataTupleSchemeFactory implements SchemeFactory {
+  private static class TApiMetaDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TApiMetaDataTupleScheme getScheme() {
       return new TApiMetaDataTupleScheme();
     }
   }
 
-  private static class TApiMetaDataTupleScheme extends TupleScheme<TApiMetaData> {
+  private static class TApiMetaDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<TApiMetaData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TApiMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -865,8 +827,8 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TApiMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -894,5 +856,8 @@ public class TApiMetaData implements org.apache.thrift.TBase<TApiMetaData, TApiM
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TCpuLoad.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TCpuLoad.java
index da99ed6a8..f4d2b9a0c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TCpuLoad.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TCpuLoad.java
@@ -1,51 +1,21 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fields>, java.io.Serializable, Cloneable, Comparable<TCpuLoad> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCpuLoad");
 
   private static final org.apache.thrift.protocol.TField JVM_CPU_LOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmCpuLoad", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
   private static final org.apache.thrift.protocol.TField SYSTEM_CPU_LOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("systemCpuLoad", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCpuLoadStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCpuLoadTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCpuLoadStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCpuLoadTupleSchemeFactory();
 
   private double jvmCpuLoad; // optional
   private double systemCpuLoad; // optional
@@ -55,10 +25,10 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
     JVM_CPU_LOAD((short)1, "jvmCpuLoad"),
     SYSTEM_CPU_LOAD((short)2, "systemCpuLoad");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +76,7 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -116,14 +86,14 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
   private static final int __SYSTEMCPULOAD_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.JVM_CPU_LOAD,_Fields.SYSTEM_CPU_LOAD};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.JVM_CPU_LOAD, new org.apache.thrift.meta_data.FieldMetaData("jvmCpuLoad", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.SYSTEM_CPU_LOAD, new org.apache.thrift.meta_data.FieldMetaData("systemCpuLoad", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCpuLoad.class, metaDataMap);
   }
 
@@ -161,16 +131,16 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
   }
 
   public void unsetJvmCpuLoad() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID);
   }
 
   /** Returns true if field jvmCpuLoad is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmCpuLoad() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID);
   }
 
   public void setJvmCpuLoadIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMCPULOAD_ISSET_ID, value);
   }
 
   public double getSystemCpuLoad() {
@@ -183,25 +153,25 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
   }
 
   public void unsetSystemCpuLoad() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID);
   }
 
   /** Returns true if field systemCpuLoad is set (has been assigned a value) and false otherwise */
   public boolean isSetSystemCpuLoad() {
-    return EncodingUtils.testBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID);
   }
 
   public void setSystemCpuLoadIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SYSTEMCPULOAD_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JVM_CPU_LOAD:
       if (value == null) {
         unsetJvmCpuLoad();
       } else {
-        setJvmCpuLoad((Double)value);
+        setJvmCpuLoad((java.lang.Double)value);
       }
       break;
 
@@ -209,29 +179,29 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
       if (value == null) {
         unsetSystemCpuLoad();
       } else {
-        setSystemCpuLoad((Double)value);
+        setSystemCpuLoad((java.lang.Double)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JVM_CPU_LOAD:
-      return Double.valueOf(getJvmCpuLoad());
+      return getJvmCpuLoad();
 
     case SYSTEM_CPU_LOAD:
-      return Double.valueOf(getSystemCpuLoad());
+      return getSystemCpuLoad();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -240,11 +210,11 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
     case SYSTEM_CPU_LOAD:
       return isSetSystemCpuLoad();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCpuLoad)
@@ -255,6 +225,8 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
   public boolean equals(TCpuLoad that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jvmCpuLoad = true && this.isSetJvmCpuLoad();
     boolean that_present_jvmCpuLoad = true && that.isSetJvmCpuLoad();
@@ -279,19 +251,17 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jvmCpuLoad = true && (isSetJvmCpuLoad());
-    list.add(present_jvmCpuLoad);
-    if (present_jvmCpuLoad)
-      list.add(jvmCpuLoad);
+    hashCode = hashCode * 8191 + ((isSetJvmCpuLoad()) ? 131071 : 524287);
+    if (isSetJvmCpuLoad())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmCpuLoad);
 
-    boolean present_systemCpuLoad = true && (isSetSystemCpuLoad());
-    list.add(present_systemCpuLoad);
-    if (present_systemCpuLoad)
-      list.add(systemCpuLoad);
+    hashCode = hashCode * 8191 + ((isSetSystemCpuLoad()) ? 131071 : 524287);
+    if (isSetSystemCpuLoad())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(systemCpuLoad);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -302,7 +272,7 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetJvmCpuLoad()).compareTo(other.isSetJvmCpuLoad());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmCpuLoad()).compareTo(other.isSetJvmCpuLoad());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -312,7 +282,7 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSystemCpuLoad()).compareTo(other.isSetSystemCpuLoad());
+    lastComparison = java.lang.Boolean.valueOf(isSetSystemCpuLoad()).compareTo(other.isSetSystemCpuLoad());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -330,16 +300,16 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCpuLoad(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCpuLoad(");
     boolean first = true;
 
     if (isSetJvmCpuLoad()) {
@@ -370,7 +340,7 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -380,13 +350,13 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
     }
   }
 
-  private static class TCpuLoadStandardSchemeFactory implements SchemeFactory {
+  private static class TCpuLoadStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCpuLoadStandardScheme getScheme() {
       return new TCpuLoadStandardScheme();
     }
   }
 
-  private static class TCpuLoadStandardScheme extends StandardScheme<TCpuLoad> {
+  private static class TCpuLoadStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCpuLoad> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCpuLoad struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -443,18 +413,18 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
 
   }
 
-  private static class TCpuLoadTupleSchemeFactory implements SchemeFactory {
+  private static class TCpuLoadTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCpuLoadTupleScheme getScheme() {
       return new TCpuLoadTupleScheme();
     }
   }
 
-  private static class TCpuLoadTupleScheme extends TupleScheme<TCpuLoad> {
+  private static class TCpuLoadTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCpuLoad> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCpuLoad struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetJvmCpuLoad()) {
         optionals.set(0);
       }
@@ -472,8 +442,8 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCpuLoad struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.jvmCpuLoad = iprot.readDouble();
         struct.setJvmCpuLoadIsSet(true);
@@ -485,5 +455,8 @@ public class TCpuLoad implements org.apache.thrift.TBase<TCpuLoad, TCpuLoad._Fie
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSource.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSource.java
index a38b1271d..397586880 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSource.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSource.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-2-22")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSource._Fields>, java.io.Serializable, Cloneable, Comparable<TDataSource> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDataSource");
 
@@ -35,16 +18,13 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   private static final org.apache.thrift.protocol.TField ACTIVE_CONNECTION_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("activeConnectionSize", org.apache.thrift.protocol.TType.I32, (short)5);
   private static final org.apache.thrift.protocol.TField MAX_CONNECTION_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("maxConnectionSize", org.apache.thrift.protocol.TType.I32, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TDataSourceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TDataSourceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TDataSourceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TDataSourceTupleSchemeFactory();
 
   private int id; // required
   private short serviceTypeCode; // optional
-  private String databaseName; // optional
-  private String url; // optional
+  private java.lang.String databaseName; // optional
+  private java.lang.String url; // optional
   private int activeConnectionSize; // optional
   private int maxConnectionSize; // optional
 
@@ -57,10 +37,10 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     ACTIVE_CONNECTION_SIZE((short)5, "activeConnectionSize"),
     MAX_CONNECTION_SIZE((short)6, "maxConnectionSize");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +73,21 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +96,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -128,9 +108,9 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   private static final int __MAXCONNECTIONSIZE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.SERVICE_TYPE_CODE,_Fields.DATABASE_NAME,_Fields.URL,_Fields.ACTIVE_CONNECTION_SIZE,_Fields.MAX_CONNECTION_SIZE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.SERVICE_TYPE_CODE, new org.apache.thrift.meta_data.FieldMetaData("serviceTypeCode", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -143,7 +123,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.MAX_CONNECTION_SIZE, new org.apache.thrift.meta_data.FieldMetaData("maxConnectionSize", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDataSource.class, metaDataMap);
   }
 
@@ -205,16 +185,16 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   }
 
   public void unsetId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
   }
 
   /** Returns true if field id is set (has been assigned a value) and false otherwise */
   public boolean isSetId() {
-    return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
   }
 
   public void setIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
   public short getServiceTypeCode() {
@@ -227,23 +207,23 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   }
 
   public void unsetServiceTypeCode() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID);
   }
 
   /** Returns true if field serviceTypeCode is set (has been assigned a value) and false otherwise */
   public boolean isSetServiceTypeCode() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID);
   }
 
   public void setServiceTypeCodeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVICETYPECODE_ISSET_ID, value);
   }
 
-  public String getDatabaseName() {
+  public java.lang.String getDatabaseName() {
     return this.databaseName;
   }
 
-  public void setDatabaseName(String databaseName) {
+  public void setDatabaseName(java.lang.String databaseName) {
     this.databaseName = databaseName;
   }
 
@@ -262,11 +242,11 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     }
   }
 
-  public String getUrl() {
+  public java.lang.String getUrl() {
     return this.url;
   }
 
-  public void setUrl(String url) {
+  public void setUrl(java.lang.String url) {
     this.url = url;
   }
 
@@ -295,16 +275,16 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   }
 
   public void unsetActiveConnectionSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID);
   }
 
   /** Returns true if field activeConnectionSize is set (has been assigned a value) and false otherwise */
   public boolean isSetActiveConnectionSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID);
   }
 
   public void setActiveConnectionSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ACTIVECONNECTIONSIZE_ISSET_ID, value);
   }
 
   public int getMaxConnectionSize() {
@@ -317,25 +297,25 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   }
 
   public void unsetMaxConnectionSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID);
   }
 
   /** Returns true if field maxConnectionSize is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxConnectionSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID);
   }
 
   public void setMaxConnectionSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXCONNECTIONSIZE_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case ID:
       if (value == null) {
         unsetId();
       } else {
-        setId((Integer)value);
+        setId((java.lang.Integer)value);
       }
       break;
 
@@ -343,7 +323,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       if (value == null) {
         unsetServiceTypeCode();
       } else {
-        setServiceTypeCode((Short)value);
+        setServiceTypeCode((java.lang.Short)value);
       }
       break;
 
@@ -351,7 +331,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       if (value == null) {
         unsetDatabaseName();
       } else {
-        setDatabaseName((String)value);
+        setDatabaseName((java.lang.String)value);
       }
       break;
 
@@ -359,7 +339,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       if (value == null) {
         unsetUrl();
       } else {
-        setUrl((String)value);
+        setUrl((java.lang.String)value);
       }
       break;
 
@@ -367,7 +347,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       if (value == null) {
         unsetActiveConnectionSize();
       } else {
-        setActiveConnectionSize((Integer)value);
+        setActiveConnectionSize((java.lang.Integer)value);
       }
       break;
 
@@ -375,20 +355,20 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       if (value == null) {
         unsetMaxConnectionSize();
       } else {
-        setMaxConnectionSize((Integer)value);
+        setMaxConnectionSize((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
-      return Integer.valueOf(getId());
+      return getId();
 
     case SERVICE_TYPE_CODE:
-      return Short.valueOf(getServiceTypeCode());
+      return getServiceTypeCode();
 
     case DATABASE_NAME:
       return getDatabaseName();
@@ -397,19 +377,19 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
       return getUrl();
 
     case ACTIVE_CONNECTION_SIZE:
-      return Integer.valueOf(getActiveConnectionSize());
+      return getActiveConnectionSize();
 
     case MAX_CONNECTION_SIZE:
-      return Integer.valueOf(getMaxConnectionSize());
+      return getMaxConnectionSize();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -426,11 +406,11 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     case MAX_CONNECTION_SIZE:
       return isSetMaxConnectionSize();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TDataSource)
@@ -441,6 +421,8 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   public boolean equals(TDataSource that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_id = true;
     boolean that_present_id = true;
@@ -501,39 +483,31 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_id = true;
-    list.add(present_id);
-    if (present_id)
-      list.add(id);
+    hashCode = hashCode * 8191 + id;
 
-    boolean present_serviceTypeCode = true && (isSetServiceTypeCode());
-    list.add(present_serviceTypeCode);
-    if (present_serviceTypeCode)
-      list.add(serviceTypeCode);
+    hashCode = hashCode * 8191 + ((isSetServiceTypeCode()) ? 131071 : 524287);
+    if (isSetServiceTypeCode())
+      hashCode = hashCode * 8191 + serviceTypeCode;
 
-    boolean present_databaseName = true && (isSetDatabaseName());
-    list.add(present_databaseName);
-    if (present_databaseName)
-      list.add(databaseName);
+    hashCode = hashCode * 8191 + ((isSetDatabaseName()) ? 131071 : 524287);
+    if (isSetDatabaseName())
+      hashCode = hashCode * 8191 + databaseName.hashCode();
 
-    boolean present_url = true && (isSetUrl());
-    list.add(present_url);
-    if (present_url)
-      list.add(url);
+    hashCode = hashCode * 8191 + ((isSetUrl()) ? 131071 : 524287);
+    if (isSetUrl())
+      hashCode = hashCode * 8191 + url.hashCode();
 
-    boolean present_activeConnectionSize = true && (isSetActiveConnectionSize());
-    list.add(present_activeConnectionSize);
-    if (present_activeConnectionSize)
-      list.add(activeConnectionSize);
+    hashCode = hashCode * 8191 + ((isSetActiveConnectionSize()) ? 131071 : 524287);
+    if (isSetActiveConnectionSize())
+      hashCode = hashCode * 8191 + activeConnectionSize;
 
-    boolean present_maxConnectionSize = true && (isSetMaxConnectionSize());
-    list.add(present_maxConnectionSize);
-    if (present_maxConnectionSize)
-      list.add(maxConnectionSize);
+    hashCode = hashCode * 8191 + ((isSetMaxConnectionSize()) ? 131071 : 524287);
+    if (isSetMaxConnectionSize())
+      hashCode = hashCode * 8191 + maxConnectionSize;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -544,7 +518,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
+    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -554,7 +528,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceTypeCode()).compareTo(other.isSetServiceTypeCode());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceTypeCode()).compareTo(other.isSetServiceTypeCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -564,7 +538,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDatabaseName()).compareTo(other.isSetDatabaseName());
+    lastComparison = java.lang.Boolean.valueOf(isSetDatabaseName()).compareTo(other.isSetDatabaseName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -574,7 +548,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUrl()).compareTo(other.isSetUrl());
+    lastComparison = java.lang.Boolean.valueOf(isSetUrl()).compareTo(other.isSetUrl());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -584,7 +558,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetActiveConnectionSize()).compareTo(other.isSetActiveConnectionSize());
+    lastComparison = java.lang.Boolean.valueOf(isSetActiveConnectionSize()).compareTo(other.isSetActiveConnectionSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -594,7 +568,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxConnectionSize()).compareTo(other.isSetMaxConnectionSize());
+    lastComparison = java.lang.Boolean.valueOf(isSetMaxConnectionSize()).compareTo(other.isSetMaxConnectionSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -612,16 +586,16 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TDataSource(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TDataSource(");
     boolean first = true;
 
     sb.append("id:");
@@ -682,7 +656,7 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -692,13 +666,13 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     }
   }
 
-  private static class TDataSourceStandardSchemeFactory implements SchemeFactory {
+  private static class TDataSourceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDataSourceStandardScheme getScheme() {
       return new TDataSourceStandardScheme();
     }
   }
 
-  private static class TDataSourceStandardScheme extends StandardScheme<TDataSource> {
+  private static class TDataSourceStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDataSource> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDataSource struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -809,18 +783,18 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
 
   }
 
-  private static class TDataSourceTupleSchemeFactory implements SchemeFactory {
+  private static class TDataSourceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDataSourceTupleScheme getScheme() {
       return new TDataSourceTupleScheme();
     }
   }
 
-  private static class TDataSourceTupleScheme extends TupleScheme<TDataSource> {
+  private static class TDataSourceTupleScheme extends org.apache.thrift.scheme.TupleScheme<TDataSource> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TDataSource struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetId()) {
         optionals.set(0);
       }
@@ -862,8 +836,8 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDataSource struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.id = iprot.readI32();
         struct.setIdIsSet(true);
@@ -891,5 +865,8 @@ public class TDataSource implements org.apache.thrift.TBase<TDataSource, TDataSo
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSourceList.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSourceList.java
index d756a744e..b40b20795 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSourceList.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TDataSourceList.java
@@ -1,50 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList, TDataSourceList._Fields>, java.io.Serializable, Cloneable, Comparable<TDataSourceList> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDataSourceList");
 
   private static final org.apache.thrift.protocol.TField DATA_SOURCE_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataSourceList", org.apache.thrift.protocol.TType.LIST, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TDataSourceListStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TDataSourceListTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TDataSourceListStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TDataSourceListTupleSchemeFactory();
 
-  private List<TDataSource> dataSourceList; // required
+  private java.util.List<TDataSource> dataSourceList; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     DATA_SOURCE_LIST((short)1, "dataSourceList");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -67,21 +48,21 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -90,19 +71,19 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.DATA_SOURCE_LIST, new org.apache.thrift.meta_data.FieldMetaData("dataSourceList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDataSource.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDataSourceList.class, metaDataMap);
   }
 
@@ -110,7 +91,7 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
   }
 
   public TDataSourceList(
-    List<TDataSource> dataSourceList)
+    java.util.List<TDataSource> dataSourceList)
   {
     this();
     this.dataSourceList = dataSourceList;
@@ -121,7 +102,7 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
    */
   public TDataSourceList(TDataSourceList other) {
     if (other.isSetDataSourceList()) {
-      List<TDataSource> __this__dataSourceList = new ArrayList<TDataSource>(other.dataSourceList.size());
+      java.util.List<TDataSource> __this__dataSourceList = new java.util.ArrayList<TDataSource>(other.dataSourceList.size());
       for (TDataSource other_element : other.dataSourceList) {
         __this__dataSourceList.add(new TDataSource(other_element));
       }
@@ -148,16 +129,16 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
 
   public void addToDataSourceList(TDataSource elem) {
     if (this.dataSourceList == null) {
-      this.dataSourceList = new ArrayList<TDataSource>();
+      this.dataSourceList = new java.util.ArrayList<TDataSource>();
     }
     this.dataSourceList.add(elem);
   }
 
-  public List<TDataSource> getDataSourceList() {
+  public java.util.List<TDataSource> getDataSourceList() {
     return this.dataSourceList;
   }
 
-  public void setDataSourceList(List<TDataSource> dataSourceList) {
+  public void setDataSourceList(java.util.List<TDataSource> dataSourceList) {
     this.dataSourceList = dataSourceList;
   }
 
@@ -176,43 +157,43 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case DATA_SOURCE_LIST:
       if (value == null) {
         unsetDataSourceList();
       } else {
-        setDataSourceList((List<TDataSource>)value);
+        setDataSourceList((java.util.List<TDataSource>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATA_SOURCE_LIST:
       return getDataSourceList();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case DATA_SOURCE_LIST:
       return isSetDataSourceList();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TDataSourceList)
@@ -223,6 +204,8 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
   public boolean equals(TDataSourceList that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_dataSourceList = true && this.isSetDataSourceList();
     boolean that_present_dataSourceList = true && that.isSetDataSourceList();
@@ -238,14 +221,13 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_dataSourceList = true && (isSetDataSourceList());
-    list.add(present_dataSourceList);
-    if (present_dataSourceList)
-      list.add(dataSourceList);
+    hashCode = hashCode * 8191 + ((isSetDataSourceList()) ? 131071 : 524287);
+    if (isSetDataSourceList())
+      hashCode = hashCode * 8191 + dataSourceList.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -256,7 +238,7 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetDataSourceList()).compareTo(other.isSetDataSourceList());
+    lastComparison = java.lang.Boolean.valueOf(isSetDataSourceList()).compareTo(other.isSetDataSourceList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -274,16 +256,16 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TDataSourceList(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TDataSourceList(");
     boolean first = true;
 
     sb.append("dataSourceList:");
@@ -310,7 +292,7 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -318,13 +300,13 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
     }
   }
 
-  private static class TDataSourceListStandardSchemeFactory implements SchemeFactory {
+  private static class TDataSourceListStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDataSourceListStandardScheme getScheme() {
       return new TDataSourceListStandardScheme();
     }
   }
 
-  private static class TDataSourceListStandardScheme extends StandardScheme<TDataSourceList> {
+  private static class TDataSourceListStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDataSourceList> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDataSourceList struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -340,7 +322,7 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list40 = iprot.readListBegin();
-                struct.dataSourceList = new ArrayList<TDataSource>(_list40.size);
+                struct.dataSourceList = new java.util.ArrayList<TDataSource>(_list40.size);
                 TDataSource _elem41;
                 for (int _i42 = 0; _i42 < _list40.size; ++_i42)
                 {
@@ -386,18 +368,18 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
 
   }
 
-  private static class TDataSourceListTupleSchemeFactory implements SchemeFactory {
+  private static class TDataSourceListTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDataSourceListTupleScheme getScheme() {
       return new TDataSourceListTupleScheme();
     }
   }
 
-  private static class TDataSourceListTupleScheme extends TupleScheme<TDataSourceList> {
+  private static class TDataSourceListTupleScheme extends org.apache.thrift.scheme.TupleScheme<TDataSourceList> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TDataSourceList struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetDataSourceList()) {
         optionals.set(0);
       }
@@ -415,12 +397,12 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDataSourceList struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.dataSourceList = new ArrayList<TDataSource>(_list45.size);
+          struct.dataSourceList = new java.util.ArrayList<TDataSource>(_list45.size);
           TDataSource _elem46;
           for (int _i47 = 0; _i47 < _list45.size; ++_i47)
           {
@@ -434,5 +416,8 @@ public class TDataSourceList implements org.apache.thrift.TBase<TDataSourceList,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringStringValue.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringStringValue.java
index 7dad228b9..d4d57062a 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringStringValue.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringStringValue.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TIntStringStringValue implements org.apache.thrift.TBase<TIntStringStringValue, TIntStringStringValue._Fields>, java.io.Serializable, Cloneable, Comparable<TIntStringStringValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIntStringStringValue");
 
@@ -42,15 +15,12 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
   private static final org.apache.thrift.protocol.TField STRING_VALUE1_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue1", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField STRING_VALUE2_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue2", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TIntStringStringValueStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TIntStringStringValueTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TIntStringStringValueStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TIntStringStringValueTupleSchemeFactory();
 
   private int intValue; // required
-  private String stringValue1; // optional
-  private String stringValue2; // optional
+  private java.lang.String stringValue1; // optional
+  private java.lang.String stringValue2; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     STRING_VALUE1((short)2, "stringValue1"),
     STRING_VALUE2((short)3, "stringValue2");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -88,21 +58,21 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +81,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -120,16 +90,16 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
   private static final int __INTVALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.STRING_VALUE1,_Fields.STRING_VALUE2};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.STRING_VALUE1, new org.apache.thrift.meta_data.FieldMetaData("stringValue1", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.STRING_VALUE2, new org.apache.thrift.meta_data.FieldMetaData("stringValue2", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TIntStringStringValue.class, metaDataMap);
   }
 
@@ -180,23 +150,23 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
   }
 
   public void unsetIntValue() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INTVALUE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INTVALUE_ISSET_ID);
   }
 
   /** Returns true if field intValue is set (has been assigned a value) and false otherwise */
   public boolean isSetIntValue() {
-    return EncodingUtils.testBit(__isset_bitfield, __INTVALUE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INTVALUE_ISSET_ID);
   }
 
   public void setIntValueIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INTVALUE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INTVALUE_ISSET_ID, value);
   }
 
-  public String getStringValue1() {
+  public java.lang.String getStringValue1() {
     return this.stringValue1;
   }
 
-  public void setStringValue1(String stringValue1) {
+  public void setStringValue1(java.lang.String stringValue1) {
     this.stringValue1 = stringValue1;
   }
 
@@ -215,11 +185,11 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     }
   }
 
-  public String getStringValue2() {
+  public java.lang.String getStringValue2() {
     return this.stringValue2;
   }
 
-  public void setStringValue2(String stringValue2) {
+  public void setStringValue2(java.lang.String stringValue2) {
     this.stringValue2 = stringValue2;
   }
 
@@ -238,13 +208,13 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case INT_VALUE:
       if (value == null) {
         unsetIntValue();
       } else {
-        setIntValue((Integer)value);
+        setIntValue((java.lang.Integer)value);
       }
       break;
 
@@ -252,7 +222,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
       if (value == null) {
         unsetStringValue1();
       } else {
-        setStringValue1((String)value);
+        setStringValue1((java.lang.String)value);
       }
       break;
 
@@ -260,17 +230,17 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
       if (value == null) {
         unsetStringValue2();
       } else {
-        setStringValue2((String)value);
+        setStringValue2((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case INT_VALUE:
-      return Integer.valueOf(getIntValue());
+      return getIntValue();
 
     case STRING_VALUE1:
       return getStringValue1();
@@ -279,13 +249,13 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
       return getStringValue2();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -296,11 +266,11 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     case STRING_VALUE2:
       return isSetStringValue2();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TIntStringStringValue)
@@ -311,6 +281,8 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
   public boolean equals(TIntStringStringValue that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_intValue = true;
     boolean that_present_intValue = true;
@@ -344,24 +316,19 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_intValue = true;
-    list.add(present_intValue);
-    if (present_intValue)
-      list.add(intValue);
+    hashCode = hashCode * 8191 + intValue;
 
-    boolean present_stringValue1 = true && (isSetStringValue1());
-    list.add(present_stringValue1);
-    if (present_stringValue1)
-      list.add(stringValue1);
+    hashCode = hashCode * 8191 + ((isSetStringValue1()) ? 131071 : 524287);
+    if (isSetStringValue1())
+      hashCode = hashCode * 8191 + stringValue1.hashCode();
 
-    boolean present_stringValue2 = true && (isSetStringValue2());
-    list.add(present_stringValue2);
-    if (present_stringValue2)
-      list.add(stringValue2);
+    hashCode = hashCode * 8191 + ((isSetStringValue2()) ? 131071 : 524287);
+    if (isSetStringValue2())
+      hashCode = hashCode * 8191 + stringValue2.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -372,7 +339,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetIntValue()).compareTo(other.isSetIntValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetIntValue()).compareTo(other.isSetIntValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -382,7 +349,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStringValue1()).compareTo(other.isSetStringValue1());
+    lastComparison = java.lang.Boolean.valueOf(isSetStringValue1()).compareTo(other.isSetStringValue1());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -392,7 +359,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStringValue2()).compareTo(other.isSetStringValue2());
+    lastComparison = java.lang.Boolean.valueOf(isSetStringValue2()).compareTo(other.isSetStringValue2());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -410,16 +377,16 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TIntStringStringValue(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TIntStringStringValue(");
     boolean first = true;
 
     sb.append("intValue:");
@@ -462,7 +429,7 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -472,13 +439,13 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     }
   }
 
-  private static class TIntStringStringValueStandardSchemeFactory implements SchemeFactory {
+  private static class TIntStringStringValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TIntStringStringValueStandardScheme getScheme() {
       return new TIntStringStringValueStandardScheme();
     }
   }
 
-  private static class TIntStringStringValueStandardScheme extends StandardScheme<TIntStringStringValue> {
+  private static class TIntStringStringValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TIntStringStringValue> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TIntStringStringValue struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -550,18 +517,18 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
 
   }
 
-  private static class TIntStringStringValueTupleSchemeFactory implements SchemeFactory {
+  private static class TIntStringStringValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TIntStringStringValueTupleScheme getScheme() {
       return new TIntStringStringValueTupleScheme();
     }
   }
 
-  private static class TIntStringStringValueTupleScheme extends TupleScheme<TIntStringStringValue> {
+  private static class TIntStringStringValueTupleScheme extends org.apache.thrift.scheme.TupleScheme<TIntStringStringValue> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TIntStringStringValue struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetIntValue()) {
         optionals.set(0);
       }
@@ -585,8 +552,8 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TIntStringStringValue struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.intValue = iprot.readI32();
         struct.setIntValueIsSet(true);
@@ -602,5 +569,8 @@ public class TIntStringStringValue implements org.apache.thrift.TBase<TIntString
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringValue.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringValue.java
index dbd17535b..f82e63e89 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringValue.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TIntStringValue.java
@@ -1,64 +1,34 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue, TIntStringValue._Fields>, java.io.Serializable, Cloneable, Comparable<TIntStringValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIntStringValue");
 
   private static final org.apache.thrift.protocol.TField INT_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("intValue", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TIntStringValueStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TIntStringValueTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TIntStringValueStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TIntStringValueTupleSchemeFactory();
 
   private int intValue; // required
-  private String stringValue; // optional
+  private java.lang.String stringValue; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     INT_VALUE((short)1, "intValue"),
     STRING_VALUE((short)2, "stringValue");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +76,7 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -115,14 +85,14 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
   private static final int __INTVALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.STRING_VALUE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TIntStringValue.class, metaDataMap);
   }
 
@@ -169,23 +139,23 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
   }
 
   public void unsetIntValue() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INTVALUE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INTVALUE_ISSET_ID);
   }
 
   /** Returns true if field intValue is set (has been assigned a value) and false otherwise */
   public boolean isSetIntValue() {
-    return EncodingUtils.testBit(__isset_bitfield, __INTVALUE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INTVALUE_ISSET_ID);
   }
 
   public void setIntValueIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INTVALUE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INTVALUE_ISSET_ID, value);
   }
 
-  public String getStringValue() {
+  public java.lang.String getStringValue() {
     return this.stringValue;
   }
 
-  public void setStringValue(String stringValue) {
+  public void setStringValue(java.lang.String stringValue) {
     this.stringValue = stringValue;
   }
 
@@ -204,13 +174,13 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case INT_VALUE:
       if (value == null) {
         unsetIntValue();
       } else {
-        setIntValue((Integer)value);
+        setIntValue((java.lang.Integer)value);
       }
       break;
 
@@ -218,29 +188,29 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
       if (value == null) {
         unsetStringValue();
       } else {
-        setStringValue((String)value);
+        setStringValue((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case INT_VALUE:
-      return Integer.valueOf(getIntValue());
+      return getIntValue();
 
     case STRING_VALUE:
       return getStringValue();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -249,11 +219,11 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
     case STRING_VALUE:
       return isSetStringValue();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TIntStringValue)
@@ -264,6 +234,8 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
   public boolean equals(TIntStringValue that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_intValue = true;
     boolean that_present_intValue = true;
@@ -288,19 +260,15 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_intValue = true;
-    list.add(present_intValue);
-    if (present_intValue)
-      list.add(intValue);
+    hashCode = hashCode * 8191 + intValue;
 
-    boolean present_stringValue = true && (isSetStringValue());
-    list.add(present_stringValue);
-    if (present_stringValue)
-      list.add(stringValue);
+    hashCode = hashCode * 8191 + ((isSetStringValue()) ? 131071 : 524287);
+    if (isSetStringValue())
+      hashCode = hashCode * 8191 + stringValue.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -311,7 +279,7 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetIntValue()).compareTo(other.isSetIntValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetIntValue()).compareTo(other.isSetIntValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -321,7 +289,7 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStringValue()).compareTo(other.isSetStringValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetStringValue()).compareTo(other.isSetStringValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -339,16 +307,16 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TIntStringValue(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TIntStringValue(");
     boolean first = true;
 
     sb.append("intValue:");
@@ -381,7 +349,7 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -391,13 +359,13 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
     }
   }
 
-  private static class TIntStringValueStandardSchemeFactory implements SchemeFactory {
+  private static class TIntStringValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TIntStringValueStandardScheme getScheme() {
       return new TIntStringValueStandardScheme();
     }
   }
 
-  private static class TIntStringValueStandardScheme extends StandardScheme<TIntStringValue> {
+  private static class TIntStringValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TIntStringValue> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TIntStringValue struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -454,18 +422,18 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
 
   }
 
-  private static class TIntStringValueTupleSchemeFactory implements SchemeFactory {
+  private static class TIntStringValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TIntStringValueTupleScheme getScheme() {
       return new TIntStringValueTupleScheme();
     }
   }
 
-  private static class TIntStringValueTupleScheme extends TupleScheme<TIntStringValue> {
+  private static class TIntStringValueTupleScheme extends org.apache.thrift.scheme.TupleScheme<TIntStringValue> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TIntStringValue struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetIntValue()) {
         optionals.set(0);
       }
@@ -483,8 +451,8 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TIntStringValue struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.intValue = iprot.readI32();
         struct.setIntValueIsSet(true);
@@ -496,5 +464,8 @@ public class TIntStringValue implements org.apache.thrift.TBase<TIntStringValue,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGc.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGc.java
index 782e45fe3..9cd537260 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGc.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGc.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-18")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>, java.io.Serializable, Cloneable, Comparable<TJvmGc> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TJvmGc");
 
@@ -47,11 +20,8 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   private static final org.apache.thrift.protocol.TField JVM_GC_OLD_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmGcOldTime", org.apache.thrift.protocol.TType.I64, (short)7);
   private static final org.apache.thrift.protocol.TField JVM_GC_DETAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmGcDetailed", org.apache.thrift.protocol.TType.STRUCT, (short)8);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TJvmGcStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TJvmGcTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TJvmGcStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TJvmGcTupleSchemeFactory();
 
   private TJvmGcType type; // required
   private long jvmMemoryHeapUsed; // required
@@ -77,10 +47,10 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     JVM_GC_OLD_TIME((short)7, "jvmGcOldTime"),
     JVM_GC_DETAILED((short)8, "jvmGcDetailed");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -117,21 +87,21 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -140,7 +110,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -154,9 +124,9 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   private static final int __JVMGCOLDTIME_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.JVM_GC_DETAILED};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TJvmGcType.class)));
     tmpMap.put(_Fields.JVM_MEMORY_HEAP_USED, new org.apache.thrift.meta_data.FieldMetaData("jvmMemoryHeapUsed", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -173,7 +143,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.JVM_GC_DETAILED, new org.apache.thrift.meta_data.FieldMetaData("jvmGcDetailed", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "TJvmGcDetailed")));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TJvmGc.class, metaDataMap);
   }
 
@@ -222,7 +192,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     this.jvmGcOldCount = other.jvmGcOldCount;
     this.jvmGcOldTime = other.jvmGcOldTime;
     if (other.isSetJvmGcDetailed()) {
-      this.jvmGcDetailed = other.jvmGcDetailed;
+      this.jvmGcDetailed = new TJvmGcDetailed(other.jvmGcDetailed);
     }
   }
 
@@ -290,16 +260,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmMemoryHeapUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmMemoryHeapUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmMemoryHeapUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID);
   }
 
   public void setJvmMemoryHeapUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYHEAPUSED_ISSET_ID, value);
   }
 
   public long getJvmMemoryHeapMax() {
@@ -312,16 +282,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmMemoryHeapMax() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID);
   }
 
   /** Returns true if field jvmMemoryHeapMax is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmMemoryHeapMax() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID);
   }
 
   public void setJvmMemoryHeapMaxIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYHEAPMAX_ISSET_ID, value);
   }
 
   public long getJvmMemoryNonHeapUsed() {
@@ -334,16 +304,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmMemoryNonHeapUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmMemoryNonHeapUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmMemoryNonHeapUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID);
   }
 
   public void setJvmMemoryNonHeapUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYNONHEAPUSED_ISSET_ID, value);
   }
 
   public long getJvmMemoryNonHeapMax() {
@@ -356,16 +326,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmMemoryNonHeapMax() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID);
   }
 
   /** Returns true if field jvmMemoryNonHeapMax is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmMemoryNonHeapMax() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID);
   }
 
   public void setJvmMemoryNonHeapMaxIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMMEMORYNONHEAPMAX_ISSET_ID, value);
   }
 
   public long getJvmGcOldCount() {
@@ -378,16 +348,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmGcOldCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID);
   }
 
   /** Returns true if field jvmGcOldCount is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmGcOldCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID);
   }
 
   public void setJvmGcOldCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMGCOLDCOUNT_ISSET_ID, value);
   }
 
   public long getJvmGcOldTime() {
@@ -400,16 +370,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void unsetJvmGcOldTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID);
   }
 
   /** Returns true if field jvmGcOldTime is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmGcOldTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID);
   }
 
   public void setJvmGcOldTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMGCOLDTIME_ISSET_ID, value);
   }
 
   public TJvmGcDetailed getJvmGcDetailed() {
@@ -435,7 +405,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case TYPE:
       if (value == null) {
@@ -449,7 +419,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmMemoryHeapUsed();
       } else {
-        setJvmMemoryHeapUsed((Long)value);
+        setJvmMemoryHeapUsed((java.lang.Long)value);
       }
       break;
 
@@ -457,7 +427,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmMemoryHeapMax();
       } else {
-        setJvmMemoryHeapMax((Long)value);
+        setJvmMemoryHeapMax((java.lang.Long)value);
       }
       break;
 
@@ -465,7 +435,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmMemoryNonHeapUsed();
       } else {
-        setJvmMemoryNonHeapUsed((Long)value);
+        setJvmMemoryNonHeapUsed((java.lang.Long)value);
       }
       break;
 
@@ -473,7 +443,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmMemoryNonHeapMax();
       } else {
-        setJvmMemoryNonHeapMax((Long)value);
+        setJvmMemoryNonHeapMax((java.lang.Long)value);
       }
       break;
 
@@ -481,7 +451,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmGcOldCount();
       } else {
-        setJvmGcOldCount((Long)value);
+        setJvmGcOldCount((java.lang.Long)value);
       }
       break;
 
@@ -489,7 +459,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
       if (value == null) {
         unsetJvmGcOldTime();
       } else {
-        setJvmGcOldTime((Long)value);
+        setJvmGcOldTime((java.lang.Long)value);
       }
       break;
 
@@ -504,40 +474,40 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
       return getType();
 
     case JVM_MEMORY_HEAP_USED:
-      return Long.valueOf(getJvmMemoryHeapUsed());
+      return getJvmMemoryHeapUsed();
 
     case JVM_MEMORY_HEAP_MAX:
-      return Long.valueOf(getJvmMemoryHeapMax());
+      return getJvmMemoryHeapMax();
 
     case JVM_MEMORY_NON_HEAP_USED:
-      return Long.valueOf(getJvmMemoryNonHeapUsed());
+      return getJvmMemoryNonHeapUsed();
 
     case JVM_MEMORY_NON_HEAP_MAX:
-      return Long.valueOf(getJvmMemoryNonHeapMax());
+      return getJvmMemoryNonHeapMax();
 
     case JVM_GC_OLD_COUNT:
-      return Long.valueOf(getJvmGcOldCount());
+      return getJvmGcOldCount();
 
     case JVM_GC_OLD_TIME:
-      return Long.valueOf(getJvmGcOldTime());
+      return getJvmGcOldTime();
 
     case JVM_GC_DETAILED:
       return getJvmGcDetailed();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -558,11 +528,11 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     case JVM_GC_DETAILED:
       return isSetJvmGcDetailed();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TJvmGc)
@@ -573,6 +543,8 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   public boolean equals(TJvmGc that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_type = true && this.isSetType();
     boolean that_present_type = true && that.isSetType();
@@ -651,49 +623,29 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type.getValue());
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.getValue();
 
-    boolean present_jvmMemoryHeapUsed = true;
-    list.add(present_jvmMemoryHeapUsed);
-    if (present_jvmMemoryHeapUsed)
-      list.add(jvmMemoryHeapUsed);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmMemoryHeapUsed);
 
-    boolean present_jvmMemoryHeapMax = true;
-    list.add(present_jvmMemoryHeapMax);
-    if (present_jvmMemoryHeapMax)
-      list.add(jvmMemoryHeapMax);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmMemoryHeapMax);
 
-    boolean present_jvmMemoryNonHeapUsed = true;
-    list.add(present_jvmMemoryNonHeapUsed);
-    if (present_jvmMemoryNonHeapUsed)
-      list.add(jvmMemoryNonHeapUsed);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmMemoryNonHeapUsed);
 
-    boolean present_jvmMemoryNonHeapMax = true;
-    list.add(present_jvmMemoryNonHeapMax);
-    if (present_jvmMemoryNonHeapMax)
-      list.add(jvmMemoryNonHeapMax);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmMemoryNonHeapMax);
 
-    boolean present_jvmGcOldCount = true;
-    list.add(present_jvmGcOldCount);
-    if (present_jvmGcOldCount)
-      list.add(jvmGcOldCount);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmGcOldCount);
 
-    boolean present_jvmGcOldTime = true;
-    list.add(present_jvmGcOldTime);
-    if (present_jvmGcOldTime)
-      list.add(jvmGcOldTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmGcOldTime);
 
-    boolean present_jvmGcDetailed = true && (isSetJvmGcDetailed());
-    list.add(present_jvmGcDetailed);
-    if (present_jvmGcDetailed)
-      list.add(jvmGcDetailed);
+    hashCode = hashCode * 8191 + ((isSetJvmGcDetailed()) ? 131071 : 524287);
+    if (isSetJvmGcDetailed())
+      hashCode = hashCode * 8191 + jvmGcDetailed.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -704,7 +656,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -714,7 +666,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmMemoryHeapUsed()).compareTo(other.isSetJvmMemoryHeapUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmMemoryHeapUsed()).compareTo(other.isSetJvmMemoryHeapUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -724,7 +676,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmMemoryHeapMax()).compareTo(other.isSetJvmMemoryHeapMax());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmMemoryHeapMax()).compareTo(other.isSetJvmMemoryHeapMax());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -734,7 +686,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmMemoryNonHeapUsed()).compareTo(other.isSetJvmMemoryNonHeapUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmMemoryNonHeapUsed()).compareTo(other.isSetJvmMemoryNonHeapUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -744,7 +696,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmMemoryNonHeapMax()).compareTo(other.isSetJvmMemoryNonHeapMax());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmMemoryNonHeapMax()).compareTo(other.isSetJvmMemoryNonHeapMax());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -754,7 +706,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmGcOldCount()).compareTo(other.isSetJvmGcOldCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmGcOldCount()).compareTo(other.isSetJvmGcOldCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -764,7 +716,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmGcOldTime()).compareTo(other.isSetJvmGcOldTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmGcOldTime()).compareTo(other.isSetJvmGcOldTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -774,7 +726,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmGcDetailed()).compareTo(other.isSetJvmGcDetailed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmGcDetailed()).compareTo(other.isSetJvmGcDetailed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -792,16 +744,16 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TJvmGc(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TJvmGc(");
     boolean first = true;
 
     sb.append("type:");
@@ -862,7 +814,7 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -872,13 +824,13 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     }
   }
 
-  private static class TJvmGcStandardSchemeFactory implements SchemeFactory {
+  private static class TJvmGcStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmGcStandardScheme getScheme() {
       return new TJvmGcStandardScheme();
     }
   }
 
-  private static class TJvmGcStandardScheme extends StandardScheme<TJvmGc> {
+  private static class TJvmGcStandardScheme extends org.apache.thrift.scheme.StandardScheme<TJvmGc> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TJvmGc struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1004,18 +956,18 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
 
   }
 
-  private static class TJvmGcTupleSchemeFactory implements SchemeFactory {
+  private static class TJvmGcTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmGcTupleScheme getScheme() {
       return new TJvmGcTupleScheme();
     }
   }
 
-  private static class TJvmGcTupleScheme extends TupleScheme<TJvmGc> {
+  private static class TJvmGcTupleScheme extends org.apache.thrift.scheme.TupleScheme<TJvmGc> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TJvmGc struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetType()) {
         optionals.set(0);
       }
@@ -1069,8 +1021,8 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TJvmGc struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(8);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         struct.type = com.navercorp.pinpoint.thrift.dto.TJvmGcType.findByValue(iprot.readI32());
         struct.setTypeIsSet(true);
@@ -1107,5 +1059,8 @@ public class TJvmGc implements org.apache.thrift.TBase<TJvmGc, TJvmGc._Fields>,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcDetailed.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcDetailed.java
index c8b6ff2f1..32b083420 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcDetailed.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcDetailed.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-18")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, TJvmGcDetailed._Fields>, java.io.Serializable, Cloneable, Comparable<TJvmGcDetailed> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TJvmGcDetailed");
 
@@ -47,11 +20,8 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   private static final org.apache.thrift.protocol.TField JVM_POOL_PERM_GEN_USED_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmPoolPermGenUsed", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
   private static final org.apache.thrift.protocol.TField JVM_POOL_METASPACE_USED_FIELD_DESC = new org.apache.thrift.protocol.TField("jvmPoolMetaspaceUsed", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TJvmGcDetailedStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TJvmGcDetailedTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TJvmGcDetailedStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TJvmGcDetailedTupleSchemeFactory();
 
   private long jvmGcNewCount; // optional
   private long jvmGcNewTime; // optional
@@ -73,10 +43,10 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
     JVM_POOL_PERM_GEN_USED((short)7, "jvmPoolPermGenUsed"),
     JVM_POOL_METASPACE_USED((short)8, "jvmPoolMetaspaceUsed");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -113,21 +83,21 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -136,7 +106,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -152,9 +122,9 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   private static final int __JVMPOOLMETASPACEUSED_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.JVM_GC_NEW_COUNT,_Fields.JVM_GC_NEW_TIME,_Fields.JVM_POOL_CODE_CACHE_USED,_Fields.JVM_POOL_NEW_GEN_USED,_Fields.JVM_POOL_OLD_GEN_USED,_Fields.JVM_POOL_SURVIVOR_SPACE_USED,_Fields.JVM_POOL_PERM_GEN_USED,_Fields.JVM_POOL_METASPACE_USED};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.JVM_GC_NEW_COUNT, new org.apache.thrift.meta_data.FieldMetaData("jvmGcNewCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.JVM_GC_NEW_TIME, new org.apache.thrift.meta_data.FieldMetaData("jvmGcNewTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -171,7 +141,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.JVM_POOL_METASPACE_USED, new org.apache.thrift.meta_data.FieldMetaData("jvmPoolMetaspaceUsed", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TJvmGcDetailed.class, metaDataMap);
   }
 
@@ -227,16 +197,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmGcNewCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID);
   }
 
   /** Returns true if field jvmGcNewCount is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmGcNewCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID);
   }
 
   public void setJvmGcNewCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMGCNEWCOUNT_ISSET_ID, value);
   }
 
   public long getJvmGcNewTime() {
@@ -249,16 +219,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmGcNewTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID);
   }
 
   /** Returns true if field jvmGcNewTime is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmGcNewTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID);
   }
 
   public void setJvmGcNewTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMGCNEWTIME_ISSET_ID, value);
   }
 
   public double getJvmPoolCodeCacheUsed() {
@@ -271,16 +241,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolCodeCacheUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolCodeCacheUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolCodeCacheUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID);
   }
 
   public void setJvmPoolCodeCacheUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLCODECACHEUSED_ISSET_ID, value);
   }
 
   public double getJvmPoolNewGenUsed() {
@@ -293,16 +263,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolNewGenUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolNewGenUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolNewGenUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID);
   }
 
   public void setJvmPoolNewGenUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLNEWGENUSED_ISSET_ID, value);
   }
 
   public double getJvmPoolOldGenUsed() {
@@ -315,16 +285,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolOldGenUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolOldGenUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolOldGenUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID);
   }
 
   public void setJvmPoolOldGenUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLOLDGENUSED_ISSET_ID, value);
   }
 
   public double getJvmPoolSurvivorSpaceUsed() {
@@ -337,16 +307,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolSurvivorSpaceUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolSurvivorSpaceUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolSurvivorSpaceUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID);
   }
 
   public void setJvmPoolSurvivorSpaceUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLSURVIVORSPACEUSED_ISSET_ID, value);
   }
 
   public double getJvmPoolPermGenUsed() {
@@ -359,16 +329,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolPermGenUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolPermGenUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolPermGenUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID);
   }
 
   public void setJvmPoolPermGenUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLPERMGENUSED_ISSET_ID, value);
   }
 
   public double getJvmPoolMetaspaceUsed() {
@@ -381,25 +351,25 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void unsetJvmPoolMetaspaceUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID);
   }
 
   /** Returns true if field jvmPoolMetaspaceUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetJvmPoolMetaspaceUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID);
   }
 
   public void setJvmPoolMetaspaceUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __JVMPOOLMETASPACEUSED_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JVM_GC_NEW_COUNT:
       if (value == null) {
         unsetJvmGcNewCount();
       } else {
-        setJvmGcNewCount((Long)value);
+        setJvmGcNewCount((java.lang.Long)value);
       }
       break;
 
@@ -407,7 +377,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmGcNewTime();
       } else {
-        setJvmGcNewTime((Long)value);
+        setJvmGcNewTime((java.lang.Long)value);
       }
       break;
 
@@ -415,7 +385,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolCodeCacheUsed();
       } else {
-        setJvmPoolCodeCacheUsed((Double)value);
+        setJvmPoolCodeCacheUsed((java.lang.Double)value);
       }
       break;
 
@@ -423,7 +393,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolNewGenUsed();
       } else {
-        setJvmPoolNewGenUsed((Double)value);
+        setJvmPoolNewGenUsed((java.lang.Double)value);
       }
       break;
 
@@ -431,7 +401,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolOldGenUsed();
       } else {
-        setJvmPoolOldGenUsed((Double)value);
+        setJvmPoolOldGenUsed((java.lang.Double)value);
       }
       break;
 
@@ -439,7 +409,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolSurvivorSpaceUsed();
       } else {
-        setJvmPoolSurvivorSpaceUsed((Double)value);
+        setJvmPoolSurvivorSpaceUsed((java.lang.Double)value);
       }
       break;
 
@@ -447,7 +417,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolPermGenUsed();
       } else {
-        setJvmPoolPermGenUsed((Double)value);
+        setJvmPoolPermGenUsed((java.lang.Double)value);
       }
       break;
 
@@ -455,47 +425,47 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
       if (value == null) {
         unsetJvmPoolMetaspaceUsed();
       } else {
-        setJvmPoolMetaspaceUsed((Double)value);
+        setJvmPoolMetaspaceUsed((java.lang.Double)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JVM_GC_NEW_COUNT:
-      return Long.valueOf(getJvmGcNewCount());
+      return getJvmGcNewCount();
 
     case JVM_GC_NEW_TIME:
-      return Long.valueOf(getJvmGcNewTime());
+      return getJvmGcNewTime();
 
     case JVM_POOL_CODE_CACHE_USED:
-      return Double.valueOf(getJvmPoolCodeCacheUsed());
+      return getJvmPoolCodeCacheUsed();
 
     case JVM_POOL_NEW_GEN_USED:
-      return Double.valueOf(getJvmPoolNewGenUsed());
+      return getJvmPoolNewGenUsed();
 
     case JVM_POOL_OLD_GEN_USED:
-      return Double.valueOf(getJvmPoolOldGenUsed());
+      return getJvmPoolOldGenUsed();
 
     case JVM_POOL_SURVIVOR_SPACE_USED:
-      return Double.valueOf(getJvmPoolSurvivorSpaceUsed());
+      return getJvmPoolSurvivorSpaceUsed();
 
     case JVM_POOL_PERM_GEN_USED:
-      return Double.valueOf(getJvmPoolPermGenUsed());
+      return getJvmPoolPermGenUsed();
 
     case JVM_POOL_METASPACE_USED:
-      return Double.valueOf(getJvmPoolMetaspaceUsed());
+      return getJvmPoolMetaspaceUsed();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -516,11 +486,11 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
     case JVM_POOL_METASPACE_USED:
       return isSetJvmPoolMetaspaceUsed();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TJvmGcDetailed)
@@ -531,6 +501,8 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   public boolean equals(TJvmGcDetailed that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jvmGcNewCount = true && this.isSetJvmGcNewCount();
     boolean that_present_jvmGcNewCount = true && that.isSetJvmGcNewCount();
@@ -609,49 +581,41 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jvmGcNewCount = true && (isSetJvmGcNewCount());
-    list.add(present_jvmGcNewCount);
-    if (present_jvmGcNewCount)
-      list.add(jvmGcNewCount);
+    hashCode = hashCode * 8191 + ((isSetJvmGcNewCount()) ? 131071 : 524287);
+    if (isSetJvmGcNewCount())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmGcNewCount);
 
-    boolean present_jvmGcNewTime = true && (isSetJvmGcNewTime());
-    list.add(present_jvmGcNewTime);
-    if (present_jvmGcNewTime)
-      list.add(jvmGcNewTime);
+    hashCode = hashCode * 8191 + ((isSetJvmGcNewTime()) ? 131071 : 524287);
+    if (isSetJvmGcNewTime())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmGcNewTime);
 
-    boolean present_jvmPoolCodeCacheUsed = true && (isSetJvmPoolCodeCacheUsed());
-    list.add(present_jvmPoolCodeCacheUsed);
-    if (present_jvmPoolCodeCacheUsed)
-      list.add(jvmPoolCodeCacheUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolCodeCacheUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolCodeCacheUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolCodeCacheUsed);
 
-    boolean present_jvmPoolNewGenUsed = true && (isSetJvmPoolNewGenUsed());
-    list.add(present_jvmPoolNewGenUsed);
-    if (present_jvmPoolNewGenUsed)
-      list.add(jvmPoolNewGenUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolNewGenUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolNewGenUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolNewGenUsed);
 
-    boolean present_jvmPoolOldGenUsed = true && (isSetJvmPoolOldGenUsed());
-    list.add(present_jvmPoolOldGenUsed);
-    if (present_jvmPoolOldGenUsed)
-      list.add(jvmPoolOldGenUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolOldGenUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolOldGenUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolOldGenUsed);
 
-    boolean present_jvmPoolSurvivorSpaceUsed = true && (isSetJvmPoolSurvivorSpaceUsed());
-    list.add(present_jvmPoolSurvivorSpaceUsed);
-    if (present_jvmPoolSurvivorSpaceUsed)
-      list.add(jvmPoolSurvivorSpaceUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolSurvivorSpaceUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolSurvivorSpaceUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolSurvivorSpaceUsed);
 
-    boolean present_jvmPoolPermGenUsed = true && (isSetJvmPoolPermGenUsed());
-    list.add(present_jvmPoolPermGenUsed);
-    if (present_jvmPoolPermGenUsed)
-      list.add(jvmPoolPermGenUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolPermGenUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolPermGenUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolPermGenUsed);
 
-    boolean present_jvmPoolMetaspaceUsed = true && (isSetJvmPoolMetaspaceUsed());
-    list.add(present_jvmPoolMetaspaceUsed);
-    if (present_jvmPoolMetaspaceUsed)
-      list.add(jvmPoolMetaspaceUsed);
+    hashCode = hashCode * 8191 + ((isSetJvmPoolMetaspaceUsed()) ? 131071 : 524287);
+    if (isSetJvmPoolMetaspaceUsed())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(jvmPoolMetaspaceUsed);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -662,7 +626,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetJvmGcNewCount()).compareTo(other.isSetJvmGcNewCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmGcNewCount()).compareTo(other.isSetJvmGcNewCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -672,7 +636,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmGcNewTime()).compareTo(other.isSetJvmGcNewTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmGcNewTime()).compareTo(other.isSetJvmGcNewTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -682,7 +646,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolCodeCacheUsed()).compareTo(other.isSetJvmPoolCodeCacheUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolCodeCacheUsed()).compareTo(other.isSetJvmPoolCodeCacheUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -692,7 +656,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolNewGenUsed()).compareTo(other.isSetJvmPoolNewGenUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolNewGenUsed()).compareTo(other.isSetJvmPoolNewGenUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -702,7 +666,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolOldGenUsed()).compareTo(other.isSetJvmPoolOldGenUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolOldGenUsed()).compareTo(other.isSetJvmPoolOldGenUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -712,7 +676,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolSurvivorSpaceUsed()).compareTo(other.isSetJvmPoolSurvivorSpaceUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolSurvivorSpaceUsed()).compareTo(other.isSetJvmPoolSurvivorSpaceUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -722,7 +686,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolPermGenUsed()).compareTo(other.isSetJvmPoolPermGenUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolPermGenUsed()).compareTo(other.isSetJvmPoolPermGenUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -732,7 +696,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJvmPoolMetaspaceUsed()).compareTo(other.isSetJvmPoolMetaspaceUsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetJvmPoolMetaspaceUsed()).compareTo(other.isSetJvmPoolMetaspaceUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -750,16 +714,16 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TJvmGcDetailed(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TJvmGcDetailed(");
     boolean first = true;
 
     if (isSetJvmGcNewCount()) {
@@ -826,7 +790,7 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -836,13 +800,13 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
     }
   }
 
-  private static class TJvmGcDetailedStandardSchemeFactory implements SchemeFactory {
+  private static class TJvmGcDetailedStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmGcDetailedStandardScheme getScheme() {
       return new TJvmGcDetailedStandardScheme();
     }
   }
 
-  private static class TJvmGcDetailedStandardScheme extends StandardScheme<TJvmGcDetailed> {
+  private static class TJvmGcDetailedStandardScheme extends org.apache.thrift.scheme.StandardScheme<TJvmGcDetailed> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TJvmGcDetailed struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -977,18 +941,18 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
 
   }
 
-  private static class TJvmGcDetailedTupleSchemeFactory implements SchemeFactory {
+  private static class TJvmGcDetailedTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmGcDetailedTupleScheme getScheme() {
       return new TJvmGcDetailedTupleScheme();
     }
   }
 
-  private static class TJvmGcDetailedTupleScheme extends TupleScheme<TJvmGcDetailed> {
+  private static class TJvmGcDetailedTupleScheme extends org.apache.thrift.scheme.TupleScheme<TJvmGcDetailed> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TJvmGcDetailed struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetJvmGcNewCount()) {
         optionals.set(0);
       }
@@ -1042,8 +1006,8 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TJvmGcDetailed struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(8);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         struct.jvmGcNewCount = iprot.readI64();
         struct.setJvmGcNewCountIsSet(true);
@@ -1079,5 +1043,8 @@ public class TJvmGcDetailed implements org.apache.thrift.TBase<TJvmGcDetailed, T
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcType.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcType.java
index dbac0fa4e..9fb054c0e 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcType.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmGcType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmInfo.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmInfo.java
index 2cef868a1..e43f35a97 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmInfo.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TJvmInfo.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-2-15")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TJvmInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TJvmInfo");
 
@@ -42,14 +15,11 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
   private static final org.apache.thrift.protocol.TField VM_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("vmVersion", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField GC_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("gcType", org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TJvmInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TJvmInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TJvmInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TJvmInfoTupleSchemeFactory();
 
   private short version; // required
-  private String vmVersion; // optional
+  private java.lang.String vmVersion; // optional
   private TJvmGcType gcType; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -62,10 +32,10 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
      */
     GC_TYPE((short)3, "gcType");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -92,21 +62,21 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -115,7 +85,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -124,16 +94,16 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
   private static final int __VERSION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.VM_VERSION,_Fields.GC_TYPE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
     tmpMap.put(_Fields.VM_VERSION, new org.apache.thrift.meta_data.FieldMetaData("vmVersion", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.GC_TYPE, new org.apache.thrift.meta_data.FieldMetaData("gcType", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TJvmGcType.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TJvmInfo.class, metaDataMap);
   }
 
@@ -189,23 +159,23 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
   }
 
   public void unsetVersion() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   /** Returns true if field version is set (has been assigned a value) and false otherwise */
   public boolean isSetVersion() {
-    return EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   public void setVersionIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
   }
 
-  public String getVmVersion() {
+  public java.lang.String getVmVersion() {
     return this.vmVersion;
   }
 
-  public void setVmVersion(String vmVersion) {
+  public void setVmVersion(java.lang.String vmVersion) {
     this.vmVersion = vmVersion;
   }
 
@@ -255,13 +225,13 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case VERSION:
       if (value == null) {
         unsetVersion();
       } else {
-        setVersion((Short)value);
+        setVersion((java.lang.Short)value);
       }
       break;
 
@@ -269,7 +239,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
       if (value == null) {
         unsetVmVersion();
       } else {
-        setVmVersion((String)value);
+        setVmVersion((java.lang.String)value);
       }
       break;
 
@@ -284,10 +254,10 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VERSION:
-      return Short.valueOf(getVersion());
+      return getVersion();
 
     case VM_VERSION:
       return getVmVersion();
@@ -296,13 +266,13 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
       return getGcType();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -313,11 +283,11 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     case GC_TYPE:
       return isSetGcType();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TJvmInfo)
@@ -328,6 +298,8 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
   public boolean equals(TJvmInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_version = true;
     boolean that_present_version = true;
@@ -361,24 +333,19 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_version = true;
-    list.add(present_version);
-    if (present_version)
-      list.add(version);
+    hashCode = hashCode * 8191 + version;
 
-    boolean present_vmVersion = true && (isSetVmVersion());
-    list.add(present_vmVersion);
-    if (present_vmVersion)
-      list.add(vmVersion);
+    hashCode = hashCode * 8191 + ((isSetVmVersion()) ? 131071 : 524287);
+    if (isSetVmVersion())
+      hashCode = hashCode * 8191 + vmVersion.hashCode();
 
-    boolean present_gcType = true && (isSetGcType());
-    list.add(present_gcType);
-    if (present_gcType)
-      list.add(gcType.getValue());
+    hashCode = hashCode * 8191 + ((isSetGcType()) ? 131071 : 524287);
+    if (isSetGcType())
+      hashCode = hashCode * 8191 + gcType.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -389,7 +356,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -399,7 +366,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVmVersion()).compareTo(other.isSetVmVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVmVersion()).compareTo(other.isSetVmVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -409,7 +376,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetGcType()).compareTo(other.isSetGcType());
+    lastComparison = java.lang.Boolean.valueOf(isSetGcType()).compareTo(other.isSetGcType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,16 +394,16 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TJvmInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TJvmInfo(");
     boolean first = true;
 
     sb.append("version:");
@@ -479,7 +446,7 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -489,13 +456,13 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     }
   }
 
-  private static class TJvmInfoStandardSchemeFactory implements SchemeFactory {
+  private static class TJvmInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmInfoStandardScheme getScheme() {
       return new TJvmInfoStandardScheme();
     }
   }
 
-  private static class TJvmInfoStandardScheme extends StandardScheme<TJvmInfo> {
+  private static class TJvmInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TJvmInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TJvmInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -567,18 +534,18 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
 
   }
 
-  private static class TJvmInfoTupleSchemeFactory implements SchemeFactory {
+  private static class TJvmInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TJvmInfoTupleScheme getScheme() {
       return new TJvmInfoTupleScheme();
     }
   }
 
-  private static class TJvmInfoTupleScheme extends TupleScheme<TJvmInfo> {
+  private static class TJvmInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TJvmInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TJvmInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetVersion()) {
         optionals.set(0);
       }
@@ -602,8 +569,8 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TJvmInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.version = iprot.readI16();
         struct.setVersionIsSet(true);
@@ -619,5 +586,8 @@ public class TJvmInfo implements org.apache.thrift.TBase<TJvmInfo, TJvmInfo._Fie
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TResult.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TResult.java
index ac2822179..32897e438 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TResult.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TResult.java
@@ -1,64 +1,34 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields>, java.io.Serializable, Cloneable, Comparable<TResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TResult");
 
   private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)1);
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TResultTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TResultStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TResultTupleSchemeFactory();
 
   private boolean success; // required
-  private String message; // optional
+  private java.lang.String message; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     SUCCESS((short)1, "success"),
     MESSAGE((short)2, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +76,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -115,14 +85,14 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   private static final int __SUCCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.MESSAGE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TResult.class, metaDataMap);
   }
 
@@ -169,23 +139,23 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   }
 
   public void unsetSuccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
   }
 
   /** Returns true if field success is set (has been assigned a value) and false otherwise */
   public boolean isSetSuccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
   }
 
   public void setSuccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
   }
 
-  public String getMessage() {
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(java.lang.String message) {
     this.message = message;
   }
 
@@ -204,13 +174,13 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SUCCESS:
       if (value == null) {
         unsetSuccess();
       } else {
-        setSuccess((Boolean)value);
+        setSuccess((java.lang.Boolean)value);
       }
       break;
 
@@ -218,29 +188,29 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUCCESS:
-      return Boolean.valueOf(isSuccess());
+      return isSuccess();
 
     case MESSAGE:
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -249,11 +219,11 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TResult)
@@ -264,6 +234,8 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   public boolean equals(TResult that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_success = true;
     boolean that_present_success = true;
@@ -288,19 +260,15 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_success = true;
-    list.add(present_success);
-    if (present_success)
-      list.add(success);
+    hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -311,7 +279,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+    lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -321,7 +289,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -339,16 +307,16 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TResult(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TResult(");
     boolean first = true;
 
     sb.append("success:");
@@ -381,7 +349,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -391,13 +359,13 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
     }
   }
 
-  private static class TResultStandardSchemeFactory implements SchemeFactory {
+  private static class TResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TResultStandardScheme getScheme() {
       return new TResultStandardScheme();
     }
   }
 
-  private static class TResultStandardScheme extends StandardScheme<TResult> {
+  private static class TResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<TResult> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TResult struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -454,18 +422,18 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
 
   }
 
-  private static class TResultTupleSchemeFactory implements SchemeFactory {
+  private static class TResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TResultTupleScheme getScheme() {
       return new TResultTupleScheme();
     }
   }
 
-  private static class TResultTupleScheme extends TupleScheme<TResult> {
+  private static class TResultTupleScheme extends org.apache.thrift.scheme.TupleScheme<TResult> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSuccess()) {
         optionals.set(0);
       }
@@ -483,8 +451,8 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.success = iprot.readBool();
         struct.setSuccessIsSet(true);
@@ -496,5 +464,8 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServerMetaData.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServerMetaData.java
index 964d7c3e1..a846b1eef 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServerMetaData.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServerMetaData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData, TServerMetaData._Fields>, java.io.Serializable, Cloneable, Comparable<TServerMetaData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServerMetaData");
 
@@ -42,15 +15,12 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
   private static final org.apache.thrift.protocol.TField VM_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("vmArgs", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField SERVICE_INFOS_FIELD_DESC = new org.apache.thrift.protocol.TField("serviceInfos", org.apache.thrift.protocol.TType.LIST, (short)10);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TServerMetaDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TServerMetaDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TServerMetaDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TServerMetaDataTupleSchemeFactory();
 
-  private String serverInfo; // optional
-  private List<String> vmArgs; // optional
-  private List<TServiceInfo> serviceInfos; // optional
+  private java.lang.String serverInfo; // optional
+  private java.util.List<java.lang.String> vmArgs; // optional
+  private java.util.List<TServiceInfo> serviceInfos; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     VM_ARGS((short)2, "vmArgs"),
     SERVICE_INFOS((short)10, "serviceInfos");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -88,21 +58,21 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,16 +81,16 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.SERVER_INFO,_Fields.VM_ARGS,_Fields.SERVICE_INFOS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SERVER_INFO, new org.apache.thrift.meta_data.FieldMetaData("serverInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VM_ARGS, new org.apache.thrift.meta_data.FieldMetaData("vmArgs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -129,7 +99,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     tmpMap.put(_Fields.SERVICE_INFOS, new org.apache.thrift.meta_data.FieldMetaData("serviceInfos", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TServiceInfo.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TServerMetaData.class, metaDataMap);
   }
 
@@ -144,11 +114,11 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       this.serverInfo = other.serverInfo;
     }
     if (other.isSetVmArgs()) {
-      List<String> __this__vmArgs = new ArrayList<String>(other.vmArgs);
+      java.util.List<java.lang.String> __this__vmArgs = new java.util.ArrayList<java.lang.String>(other.vmArgs);
       this.vmArgs = __this__vmArgs;
     }
     if (other.isSetServiceInfos()) {
-      List<TServiceInfo> __this__serviceInfos = new ArrayList<TServiceInfo>(other.serviceInfos.size());
+      java.util.List<TServiceInfo> __this__serviceInfos = new java.util.ArrayList<TServiceInfo>(other.serviceInfos.size());
       for (TServiceInfo other_element : other.serviceInfos) {
         __this__serviceInfos.add(new TServiceInfo(other_element));
       }
@@ -167,11 +137,11 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     this.serviceInfos = null;
   }
 
-  public String getServerInfo() {
+  public java.lang.String getServerInfo() {
     return this.serverInfo;
   }
 
-  public void setServerInfo(String serverInfo) {
+  public void setServerInfo(java.lang.String serverInfo) {
     this.serverInfo = serverInfo;
   }
 
@@ -194,22 +164,22 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     return (this.vmArgs == null) ? 0 : this.vmArgs.size();
   }
 
-  public java.util.Iterator<String> getVmArgsIterator() {
+  public java.util.Iterator<java.lang.String> getVmArgsIterator() {
     return (this.vmArgs == null) ? null : this.vmArgs.iterator();
   }
 
-  public void addToVmArgs(String elem) {
+  public void addToVmArgs(java.lang.String elem) {
     if (this.vmArgs == null) {
-      this.vmArgs = new ArrayList<String>();
+      this.vmArgs = new java.util.ArrayList<java.lang.String>();
     }
     this.vmArgs.add(elem);
   }
 
-  public List<String> getVmArgs() {
+  public java.util.List<java.lang.String> getVmArgs() {
     return this.vmArgs;
   }
 
-  public void setVmArgs(List<String> vmArgs) {
+  public void setVmArgs(java.util.List<java.lang.String> vmArgs) {
     this.vmArgs = vmArgs;
   }
 
@@ -238,16 +208,16 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
 
   public void addToServiceInfos(TServiceInfo elem) {
     if (this.serviceInfos == null) {
-      this.serviceInfos = new ArrayList<TServiceInfo>();
+      this.serviceInfos = new java.util.ArrayList<TServiceInfo>();
     }
     this.serviceInfos.add(elem);
   }
 
-  public List<TServiceInfo> getServiceInfos() {
+  public java.util.List<TServiceInfo> getServiceInfos() {
     return this.serviceInfos;
   }
 
-  public void setServiceInfos(List<TServiceInfo> serviceInfos) {
+  public void setServiceInfos(java.util.List<TServiceInfo> serviceInfos) {
     this.serviceInfos = serviceInfos;
   }
 
@@ -266,13 +236,13 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SERVER_INFO:
       if (value == null) {
         unsetServerInfo();
       } else {
-        setServerInfo((String)value);
+        setServerInfo((java.lang.String)value);
       }
       break;
 
@@ -280,7 +250,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       if (value == null) {
         unsetVmArgs();
       } else {
-        setVmArgs((List<String>)value);
+        setVmArgs((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -288,14 +258,14 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       if (value == null) {
         unsetServiceInfos();
       } else {
-        setServiceInfos((List<TServiceInfo>)value);
+        setServiceInfos((java.util.List<TServiceInfo>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SERVER_INFO:
       return getServerInfo();
@@ -307,13 +277,13 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       return getServiceInfos();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -324,11 +294,11 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     case SERVICE_INFOS:
       return isSetServiceInfos();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TServerMetaData)
@@ -339,6 +309,8 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
   public boolean equals(TServerMetaData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_serverInfo = true && this.isSetServerInfo();
     boolean that_present_serverInfo = true && that.isSetServerInfo();
@@ -372,24 +344,21 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_serverInfo = true && (isSetServerInfo());
-    list.add(present_serverInfo);
-    if (present_serverInfo)
-      list.add(serverInfo);
+    hashCode = hashCode * 8191 + ((isSetServerInfo()) ? 131071 : 524287);
+    if (isSetServerInfo())
+      hashCode = hashCode * 8191 + serverInfo.hashCode();
 
-    boolean present_vmArgs = true && (isSetVmArgs());
-    list.add(present_vmArgs);
-    if (present_vmArgs)
-      list.add(vmArgs);
+    hashCode = hashCode * 8191 + ((isSetVmArgs()) ? 131071 : 524287);
+    if (isSetVmArgs())
+      hashCode = hashCode * 8191 + vmArgs.hashCode();
 
-    boolean present_serviceInfos = true && (isSetServiceInfos());
-    list.add(present_serviceInfos);
-    if (present_serviceInfos)
-      list.add(serviceInfos);
+    hashCode = hashCode * 8191 + ((isSetServiceInfos()) ? 131071 : 524287);
+    if (isSetServiceInfos())
+      hashCode = hashCode * 8191 + serviceInfos.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -400,7 +369,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetServerInfo()).compareTo(other.isSetServerInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetServerInfo()).compareTo(other.isSetServerInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -410,7 +379,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVmArgs()).compareTo(other.isSetVmArgs());
+    lastComparison = java.lang.Boolean.valueOf(isSetVmArgs()).compareTo(other.isSetVmArgs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -420,7 +389,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceInfos()).compareTo(other.isSetServiceInfos());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceInfos()).compareTo(other.isSetServiceInfos());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -438,16 +407,16 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TServerMetaData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TServerMetaData(");
     boolean first = true;
 
     if (isSetServerInfo()) {
@@ -496,7 +465,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -504,13 +473,13 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     }
   }
 
-  private static class TServerMetaDataStandardSchemeFactory implements SchemeFactory {
+  private static class TServerMetaDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TServerMetaDataStandardScheme getScheme() {
       return new TServerMetaDataStandardScheme();
     }
   }
 
-  private static class TServerMetaDataStandardScheme extends StandardScheme<TServerMetaData> {
+  private static class TServerMetaDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<TServerMetaData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TServerMetaData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -534,8 +503,8 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.vmArgs = new ArrayList<String>(_list8.size);
-                String _elem9;
+                struct.vmArgs = new java.util.ArrayList<java.lang.String>(_list8.size);
+                java.lang.String _elem9;
                 for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
                   _elem9 = iprot.readString();
@@ -552,7 +521,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
-                struct.serviceInfos = new ArrayList<TServiceInfo>(_list11.size);
+                struct.serviceInfos = new java.util.ArrayList<TServiceInfo>(_list11.size);
                 TServiceInfo _elem12;
                 for (int _i13 = 0; _i13 < _list11.size; ++_i13)
                 {
@@ -592,7 +561,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
           oprot.writeFieldBegin(VM_ARGS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.vmArgs.size()));
-            for (String _iter14 : struct.vmArgs)
+            for (java.lang.String _iter14 : struct.vmArgs)
             {
               oprot.writeString(_iter14);
             }
@@ -621,18 +590,18 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
 
   }
 
-  private static class TServerMetaDataTupleSchemeFactory implements SchemeFactory {
+  private static class TServerMetaDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TServerMetaDataTupleScheme getScheme() {
       return new TServerMetaDataTupleScheme();
     }
   }
 
-  private static class TServerMetaDataTupleScheme extends TupleScheme<TServerMetaData> {
+  private static class TServerMetaDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<TServerMetaData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TServerMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetServerInfo()) {
         optionals.set(0);
       }
@@ -649,7 +618,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       if (struct.isSetVmArgs()) {
         {
           oprot.writeI32(struct.vmArgs.size());
-          for (String _iter16 : struct.vmArgs)
+          for (java.lang.String _iter16 : struct.vmArgs)
           {
             oprot.writeString(_iter16);
           }
@@ -668,8 +637,8 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TServerMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.serverInfo = iprot.readString();
         struct.setServerInfoIsSet(true);
@@ -677,8 +646,8 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.vmArgs = new ArrayList<String>(_list18.size);
-          String _elem19;
+          struct.vmArgs = new java.util.ArrayList<java.lang.String>(_list18.size);
+          java.lang.String _elem19;
           for (int _i20 = 0; _i20 < _list18.size; ++_i20)
           {
             _elem19 = iprot.readString();
@@ -690,7 +659,7 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.serviceInfos = new ArrayList<TServiceInfo>(_list21.size);
+          struct.serviceInfos = new java.util.ArrayList<TServiceInfo>(_list21.size);
           TServiceInfo _elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
@@ -704,5 +673,8 @@ public class TServerMetaData implements org.apache.thrift.TBase<TServerMetaData,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServiceInfo.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServiceInfo.java
index 7055a2196..f7f35c291 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServiceInfo.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TServiceInfo.java
@@ -1,64 +1,34 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServiceInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TServiceInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServiceInfo");
 
   private static final org.apache.thrift.protocol.TField SERVICE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("serviceName", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField SERVICE_LIBS_FIELD_DESC = new org.apache.thrift.protocol.TField("serviceLibs", org.apache.thrift.protocol.TType.LIST, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TServiceInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TServiceInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TServiceInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TServiceInfoTupleSchemeFactory();
 
-  private String serviceName; // optional
-  private List<String> serviceLibs; // optional
+  private java.lang.String serviceName; // optional
+  private java.util.List<java.lang.String> serviceLibs; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     SERVICE_NAME((short)1, "serviceName"),
     SERVICE_LIBS((short)2, "serviceLibs");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,22 +76,22 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.SERVICE_NAME,_Fields.SERVICE_LIBS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SERVICE_NAME, new org.apache.thrift.meta_data.FieldMetaData("serviceName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SERVICE_LIBS, new org.apache.thrift.meta_data.FieldMetaData("serviceLibs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TServiceInfo.class, metaDataMap);
   }
 
@@ -136,7 +106,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       this.serviceName = other.serviceName;
     }
     if (other.isSetServiceLibs()) {
-      List<String> __this__serviceLibs = new ArrayList<String>(other.serviceLibs);
+      java.util.List<java.lang.String> __this__serviceLibs = new java.util.ArrayList<java.lang.String>(other.serviceLibs);
       this.serviceLibs = __this__serviceLibs;
     }
   }
@@ -151,11 +121,11 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     this.serviceLibs = null;
   }
 
-  public String getServiceName() {
+  public java.lang.String getServiceName() {
     return this.serviceName;
   }
 
-  public void setServiceName(String serviceName) {
+  public void setServiceName(java.lang.String serviceName) {
     this.serviceName = serviceName;
   }
 
@@ -178,22 +148,22 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     return (this.serviceLibs == null) ? 0 : this.serviceLibs.size();
   }
 
-  public java.util.Iterator<String> getServiceLibsIterator() {
+  public java.util.Iterator<java.lang.String> getServiceLibsIterator() {
     return (this.serviceLibs == null) ? null : this.serviceLibs.iterator();
   }
 
-  public void addToServiceLibs(String elem) {
+  public void addToServiceLibs(java.lang.String elem) {
     if (this.serviceLibs == null) {
-      this.serviceLibs = new ArrayList<String>();
+      this.serviceLibs = new java.util.ArrayList<java.lang.String>();
     }
     this.serviceLibs.add(elem);
   }
 
-  public List<String> getServiceLibs() {
+  public java.util.List<java.lang.String> getServiceLibs() {
     return this.serviceLibs;
   }
 
-  public void setServiceLibs(List<String> serviceLibs) {
+  public void setServiceLibs(java.util.List<java.lang.String> serviceLibs) {
     this.serviceLibs = serviceLibs;
   }
 
@@ -212,13 +182,13 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SERVICE_NAME:
       if (value == null) {
         unsetServiceName();
       } else {
-        setServiceName((String)value);
+        setServiceName((java.lang.String)value);
       }
       break;
 
@@ -226,14 +196,14 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       if (value == null) {
         unsetServiceLibs();
       } else {
-        setServiceLibs((List<String>)value);
+        setServiceLibs((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SERVICE_NAME:
       return getServiceName();
@@ -242,13 +212,13 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       return getServiceLibs();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -257,11 +227,11 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     case SERVICE_LIBS:
       return isSetServiceLibs();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TServiceInfo)
@@ -272,6 +242,8 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
   public boolean equals(TServiceInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_serviceName = true && this.isSetServiceName();
     boolean that_present_serviceName = true && that.isSetServiceName();
@@ -296,19 +268,17 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_serviceName = true && (isSetServiceName());
-    list.add(present_serviceName);
-    if (present_serviceName)
-      list.add(serviceName);
+    hashCode = hashCode * 8191 + ((isSetServiceName()) ? 131071 : 524287);
+    if (isSetServiceName())
+      hashCode = hashCode * 8191 + serviceName.hashCode();
 
-    boolean present_serviceLibs = true && (isSetServiceLibs());
-    list.add(present_serviceLibs);
-    if (present_serviceLibs)
-      list.add(serviceLibs);
+    hashCode = hashCode * 8191 + ((isSetServiceLibs()) ? 131071 : 524287);
+    if (isSetServiceLibs())
+      hashCode = hashCode * 8191 + serviceLibs.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -319,7 +289,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetServiceName()).compareTo(other.isSetServiceName());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceName()).compareTo(other.isSetServiceName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -329,7 +299,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceLibs()).compareTo(other.isSetServiceLibs());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceLibs()).compareTo(other.isSetServiceLibs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -347,16 +317,16 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TServiceInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TServiceInfo(");
     boolean first = true;
 
     if (isSetServiceName()) {
@@ -395,7 +365,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -403,13 +373,13 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     }
   }
 
-  private static class TServiceInfoStandardSchemeFactory implements SchemeFactory {
+  private static class TServiceInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TServiceInfoStandardScheme getScheme() {
       return new TServiceInfoStandardScheme();
     }
   }
 
-  private static class TServiceInfoStandardScheme extends StandardScheme<TServiceInfo> {
+  private static class TServiceInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TServiceInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TServiceInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -433,8 +403,8 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.serviceLibs = new ArrayList<String>(_list0.size);
-                String _elem1;
+                struct.serviceLibs = new java.util.ArrayList<java.lang.String>(_list0.size);
+                java.lang.String _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
                   _elem1 = iprot.readString();
@@ -472,7 +442,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
           oprot.writeFieldBegin(SERVICE_LIBS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.serviceLibs.size()));
-            for (String _iter3 : struct.serviceLibs)
+            for (java.lang.String _iter3 : struct.serviceLibs)
             {
               oprot.writeString(_iter3);
             }
@@ -487,18 +457,18 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
 
   }
 
-  private static class TServiceInfoTupleSchemeFactory implements SchemeFactory {
+  private static class TServiceInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TServiceInfoTupleScheme getScheme() {
       return new TServiceInfoTupleScheme();
     }
   }
 
-  private static class TServiceInfoTupleScheme extends TupleScheme<TServiceInfo> {
+  private static class TServiceInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TServiceInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TServiceInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetServiceName()) {
         optionals.set(0);
       }
@@ -512,7 +482,7 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       if (struct.isSetServiceLibs()) {
         {
           oprot.writeI32(struct.serviceLibs.size());
-          for (String _iter4 : struct.serviceLibs)
+          for (java.lang.String _iter4 : struct.serviceLibs)
           {
             oprot.writeString(_iter4);
           }
@@ -522,8 +492,8 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TServiceInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.serviceName = iprot.readString();
         struct.setServiceNameIsSet(true);
@@ -531,8 +501,8 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.serviceLibs = new ArrayList<String>(_list5.size);
-          String _elem6;
+          struct.serviceLibs = new java.util.ArrayList<java.lang.String>(_list5.size);
+          java.lang.String _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
           {
             _elem6 = iprot.readString();
@@ -544,5 +514,8 @@ public class TServiceInfo implements org.apache.thrift.TBase<TServiceInfo, TServ
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpan.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpan.java
index 8b4e7eddc..e6601abe3 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpan.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpan.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-12-9")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, java.io.Serializable, Cloneable, Comparable<TSpan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSpan");
 
@@ -62,31 +35,28 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   private static final org.apache.thrift.protocol.TField APPLICATION_SERVICE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationServiceType", org.apache.thrift.protocol.TType.I16, (short)30);
   private static final org.apache.thrift.protocol.TField LOGGING_TRANSACTION_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("loggingTransactionInfo", org.apache.thrift.protocol.TType.BYTE, (short)31);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TSpanStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TSpanTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TSpanStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TSpanTupleSchemeFactory();
 
-  private String agentId; // required
-  private String applicationName; // required
+  private java.lang.String agentId; // required
+  private java.lang.String applicationName; // required
   private long agentStartTime; // required
-  private ByteBuffer transactionId; // required
+  private java.nio.ByteBuffer transactionId; // required
   private long spanId; // required
   private long parentSpanId; // optional
   private long startTime; // required
   private int elapsed; // optional
-  private String rpc; // optional
+  private java.lang.String rpc; // optional
   private short serviceType; // required
-  private String endPoint; // optional
-  private String remoteAddr; // optional
-  private List<TAnnotation> annotations; // optional
+  private java.lang.String endPoint; // optional
+  private java.lang.String remoteAddr; // optional
+  private java.util.List<TAnnotation> annotations; // optional
   private short flag; // optional
   private int err; // optional
-  private List<TSpanEvent> spanEventList; // optional
-  private String parentApplicationName; // optional
+  private java.util.List<TSpanEvent> spanEventList; // optional
+  private java.lang.String parentApplicationName; // optional
   private short parentApplicationType; // optional
-  private String acceptorHost; // optional
+  private java.lang.String acceptorHost; // optional
   private int apiId; // optional
   private TIntStringValue exceptionInfo; // optional
   private short applicationServiceType; // optional
@@ -118,10 +88,10 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     APPLICATION_SERVICE_TYPE((short)30, "applicationServiceType"),
     LOGGING_TRANSACTION_INFO((short)31, "loggingTransactionInfo");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -188,21 +158,21 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -211,7 +181,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -231,9 +201,9 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   private static final int __LOGGINGTRANSACTIONINFO_ISSET_ID = 11;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.PARENT_SPAN_ID,_Fields.ELAPSED,_Fields.RPC,_Fields.END_POINT,_Fields.REMOTE_ADDR,_Fields.ANNOTATIONS,_Fields.FLAG,_Fields.ERR,_Fields.SPAN_EVENT_LIST,_Fields.PARENT_APPLICATION_NAME,_Fields.PARENT_APPLICATION_TYPE,_Fields.ACCEPTOR_HOST,_Fields.API_ID,_Fields.EXCEPTION_INFO,_Fields.APPLICATION_SERVICE_TYPE,_Fields.LOGGING_TRANSACTION_INFO};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.APPLICATION_NAME, new org.apache.thrift.meta_data.FieldMetaData("applicationName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -282,7 +252,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
     tmpMap.put(_Fields.LOGGING_TRANSACTION_INFO, new org.apache.thrift.meta_data.FieldMetaData("loggingTransactionInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TSpan.class, metaDataMap);
   }
 
@@ -296,10 +266,10 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public TSpan(
-    String agentId,
-    String applicationName,
+    java.lang.String agentId,
+    java.lang.String applicationName,
     long agentStartTime,
-    ByteBuffer transactionId,
+    java.nio.ByteBuffer transactionId,
     long spanId,
     long startTime,
     short serviceType)
@@ -348,7 +318,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       this.remoteAddr = other.remoteAddr;
     }
     if (other.isSetAnnotations()) {
-      List<TAnnotation> __this__annotations = new ArrayList<TAnnotation>(other.annotations.size());
+      java.util.List<TAnnotation> __this__annotations = new java.util.ArrayList<TAnnotation>(other.annotations.size());
       for (TAnnotation other_element : other.annotations) {
         __this__annotations.add(new TAnnotation(other_element));
       }
@@ -357,7 +327,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     this.flag = other.flag;
     this.err = other.err;
     if (other.isSetSpanEventList()) {
-      List<TSpanEvent> __this__spanEventList = new ArrayList<TSpanEvent>(other.spanEventList.size());
+      java.util.List<TSpanEvent> __this__spanEventList = new java.util.ArrayList<TSpanEvent>(other.spanEventList.size());
       for (TSpanEvent other_element : other.spanEventList) {
         __this__spanEventList.add(new TSpanEvent(other_element));
       }
@@ -421,11 +391,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     this.loggingTransactionInfo = 0;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -444,11 +414,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
-  public String getApplicationName() {
+  public java.lang.String getApplicationName() {
     return this.applicationName;
   }
 
-  public void setApplicationName(String applicationName) {
+  public void setApplicationName(java.lang.String applicationName) {
     this.applicationName = applicationName;
   }
 
@@ -477,16 +447,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetAgentStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   /** Returns true if field agentStartTime is set (has been assigned a value) and false otherwise */
   public boolean isSetAgentStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   public void setAgentStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
   }
 
   public byte[] getTransactionId() {
@@ -494,15 +464,15 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     return transactionId == null ? null : transactionId.array();
   }
 
-  public ByteBuffer bufferForTransactionId() {
+  public java.nio.ByteBuffer bufferForTransactionId() {
     return org.apache.thrift.TBaseHelper.copyBinary(transactionId);
   }
 
   public void setTransactionId(byte[] transactionId) {
-    this.transactionId = transactionId == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(transactionId, transactionId.length));
+    this.transactionId = transactionId == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(transactionId.clone());
   }
 
-  public void setTransactionId(ByteBuffer transactionId) {
+  public void setTransactionId(java.nio.ByteBuffer transactionId) {
     this.transactionId = org.apache.thrift.TBaseHelper.copyBinary(transactionId);
   }
 
@@ -531,16 +501,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetSpanId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   /** Returns true if field spanId is set (has been assigned a value) and false otherwise */
   public boolean isSetSpanId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   public void setSpanIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
   }
 
   public long getParentSpanId() {
@@ -553,16 +523,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetParentSpanId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTSPANID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARENTSPANID_ISSET_ID);
   }
 
   /** Returns true if field parentSpanId is set (has been assigned a value) and false otherwise */
   public boolean isSetParentSpanId() {
-    return EncodingUtils.testBit(__isset_bitfield, __PARENTSPANID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PARENTSPANID_ISSET_ID);
   }
 
   public void setParentSpanIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTSPANID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARENTSPANID_ISSET_ID, value);
   }
 
   public long getStartTime() {
@@ -575,16 +545,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public int getElapsed() {
@@ -597,23 +567,23 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetElapsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ELAPSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ELAPSED_ISSET_ID);
   }
 
   /** Returns true if field elapsed is set (has been assigned a value) and false otherwise */
   public boolean isSetElapsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __ELAPSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ELAPSED_ISSET_ID);
   }
 
   public void setElapsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ELAPSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ELAPSED_ISSET_ID, value);
   }
 
-  public String getRpc() {
+  public java.lang.String getRpc() {
     return this.rpc;
   }
 
-  public void setRpc(String rpc) {
+  public void setRpc(java.lang.String rpc) {
     this.rpc = rpc;
   }
 
@@ -642,23 +612,23 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field serviceType is set (has been assigned a value) and false otherwise */
   public boolean isSetServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   public void setServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
   }
 
-  public String getEndPoint() {
+  public java.lang.String getEndPoint() {
     return this.endPoint;
   }
 
-  public void setEndPoint(String endPoint) {
+  public void setEndPoint(java.lang.String endPoint) {
     this.endPoint = endPoint;
   }
 
@@ -677,11 +647,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
-  public String getRemoteAddr() {
+  public java.lang.String getRemoteAddr() {
     return this.remoteAddr;
   }
 
-  public void setRemoteAddr(String remoteAddr) {
+  public void setRemoteAddr(java.lang.String remoteAddr) {
     this.remoteAddr = remoteAddr;
   }
 
@@ -710,16 +680,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
   public void addToAnnotations(TAnnotation elem) {
     if (this.annotations == null) {
-      this.annotations = new ArrayList<TAnnotation>();
+      this.annotations = new java.util.ArrayList<TAnnotation>();
     }
     this.annotations.add(elem);
   }
 
-  public List<TAnnotation> getAnnotations() {
+  public java.util.List<TAnnotation> getAnnotations() {
     return this.annotations;
   }
 
-  public void setAnnotations(List<TAnnotation> annotations) {
+  public void setAnnotations(java.util.List<TAnnotation> annotations) {
     this.annotations = annotations;
   }
 
@@ -748,16 +718,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetFlag() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FLAG_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLAG_ISSET_ID);
   }
 
   /** Returns true if field flag is set (has been assigned a value) and false otherwise */
   public boolean isSetFlag() {
-    return EncodingUtils.testBit(__isset_bitfield, __FLAG_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLAG_ISSET_ID);
   }
 
   public void setFlagIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FLAG_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLAG_ISSET_ID, value);
   }
 
   public int getErr() {
@@ -770,16 +740,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetErr() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ERR_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ERR_ISSET_ID);
   }
 
   /** Returns true if field err is set (has been assigned a value) and false otherwise */
   public boolean isSetErr() {
-    return EncodingUtils.testBit(__isset_bitfield, __ERR_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ERR_ISSET_ID);
   }
 
   public void setErrIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ERR_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ERR_ISSET_ID, value);
   }
 
   public int getSpanEventListSize() {
@@ -792,16 +762,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
   public void addToSpanEventList(TSpanEvent elem) {
     if (this.spanEventList == null) {
-      this.spanEventList = new ArrayList<TSpanEvent>();
+      this.spanEventList = new java.util.ArrayList<TSpanEvent>();
     }
     this.spanEventList.add(elem);
   }
 
-  public List<TSpanEvent> getSpanEventList() {
+  public java.util.List<TSpanEvent> getSpanEventList() {
     return this.spanEventList;
   }
 
-  public void setSpanEventList(List<TSpanEvent> spanEventList) {
+  public void setSpanEventList(java.util.List<TSpanEvent> spanEventList) {
     this.spanEventList = spanEventList;
   }
 
@@ -820,11 +790,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
-  public String getParentApplicationName() {
+  public java.lang.String getParentApplicationName() {
     return this.parentApplicationName;
   }
 
-  public void setParentApplicationName(String parentApplicationName) {
+  public void setParentApplicationName(java.lang.String parentApplicationName) {
     this.parentApplicationName = parentApplicationName;
   }
 
@@ -853,23 +823,23 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetParentApplicationType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID);
   }
 
   /** Returns true if field parentApplicationType is set (has been assigned a value) and false otherwise */
   public boolean isSetParentApplicationType() {
-    return EncodingUtils.testBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID);
   }
 
   public void setParentApplicationTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARENTAPPLICATIONTYPE_ISSET_ID, value);
   }
 
-  public String getAcceptorHost() {
+  public java.lang.String getAcceptorHost() {
     return this.acceptorHost;
   }
 
-  public void setAcceptorHost(String acceptorHost) {
+  public void setAcceptorHost(java.lang.String acceptorHost) {
     this.acceptorHost = acceptorHost;
   }
 
@@ -898,16 +868,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetApiId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   /** Returns true if field apiId is set (has been assigned a value) and false otherwise */
   public boolean isSetApiId() {
-    return EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   public void setApiIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
   }
 
   public TIntStringValue getExceptionInfo() {
@@ -943,16 +913,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetApplicationServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field applicationServiceType is set (has been assigned a value) and false otherwise */
   public boolean isSetApplicationServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
   }
 
   public void setApplicationServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID, value);
   }
 
   public byte getLoggingTransactionInfo() {
@@ -965,25 +935,25 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void unsetLoggingTransactionInfo() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID);
   }
 
   /** Returns true if field loggingTransactionInfo is set (has been assigned a value) and false otherwise */
   public boolean isSetLoggingTransactionInfo() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID);
   }
 
   public void setLoggingTransactionInfoIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOGGINGTRANSACTIONINFO_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -991,7 +961,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -999,7 +969,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetAgentStartTime();
       } else {
-        setAgentStartTime((Long)value);
+        setAgentStartTime((java.lang.Long)value);
       }
       break;
 
@@ -1007,7 +977,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetTransactionId();
       } else {
-        setTransactionId((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setTransactionId((byte[])value);
+        } else {
+          setTransactionId((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -1015,7 +989,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetSpanId();
       } else {
-        setSpanId((Long)value);
+        setSpanId((java.lang.Long)value);
       }
       break;
 
@@ -1023,7 +997,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetParentSpanId();
       } else {
-        setParentSpanId((Long)value);
+        setParentSpanId((java.lang.Long)value);
       }
       break;
 
@@ -1031,7 +1005,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -1039,7 +1013,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetElapsed();
       } else {
-        setElapsed((Integer)value);
+        setElapsed((java.lang.Integer)value);
       }
       break;
 
@@ -1047,7 +1021,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetRpc();
       } else {
-        setRpc((String)value);
+        setRpc((java.lang.String)value);
       }
       break;
 
@@ -1055,7 +1029,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetServiceType();
       } else {
-        setServiceType((Short)value);
+        setServiceType((java.lang.Short)value);
       }
       break;
 
@@ -1063,7 +1037,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetEndPoint();
       } else {
-        setEndPoint((String)value);
+        setEndPoint((java.lang.String)value);
       }
       break;
 
@@ -1071,7 +1045,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetRemoteAddr();
       } else {
-        setRemoteAddr((String)value);
+        setRemoteAddr((java.lang.String)value);
       }
       break;
 
@@ -1079,7 +1053,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetAnnotations();
       } else {
-        setAnnotations((List<TAnnotation>)value);
+        setAnnotations((java.util.List<TAnnotation>)value);
       }
       break;
 
@@ -1087,7 +1061,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetFlag();
       } else {
-        setFlag((Short)value);
+        setFlag((java.lang.Short)value);
       }
       break;
 
@@ -1095,7 +1069,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetErr();
       } else {
-        setErr((Integer)value);
+        setErr((java.lang.Integer)value);
       }
       break;
 
@@ -1103,7 +1077,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetSpanEventList();
       } else {
-        setSpanEventList((List<TSpanEvent>)value);
+        setSpanEventList((java.util.List<TSpanEvent>)value);
       }
       break;
 
@@ -1111,7 +1085,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetParentApplicationName();
       } else {
-        setParentApplicationName((String)value);
+        setParentApplicationName((java.lang.String)value);
       }
       break;
 
@@ -1119,7 +1093,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetParentApplicationType();
       } else {
-        setParentApplicationType((Short)value);
+        setParentApplicationType((java.lang.Short)value);
       }
       break;
 
@@ -1127,7 +1101,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetAcceptorHost();
       } else {
-        setAcceptorHost((String)value);
+        setAcceptorHost((java.lang.String)value);
       }
       break;
 
@@ -1135,7 +1109,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetApiId();
       } else {
-        setApiId((Integer)value);
+        setApiId((java.lang.Integer)value);
       }
       break;
 
@@ -1151,7 +1125,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetApplicationServiceType();
       } else {
-        setApplicationServiceType((Short)value);
+        setApplicationServiceType((java.lang.Short)value);
       }
       break;
 
@@ -1159,14 +1133,14 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (value == null) {
         unsetLoggingTransactionInfo();
       } else {
-        setLoggingTransactionInfo((Byte)value);
+        setLoggingTransactionInfo((java.lang.Byte)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
@@ -1175,28 +1149,28 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       return getApplicationName();
 
     case AGENT_START_TIME:
-      return Long.valueOf(getAgentStartTime());
+      return getAgentStartTime();
 
     case TRANSACTION_ID:
       return getTransactionId();
 
     case SPAN_ID:
-      return Long.valueOf(getSpanId());
+      return getSpanId();
 
     case PARENT_SPAN_ID:
-      return Long.valueOf(getParentSpanId());
+      return getParentSpanId();
 
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case ELAPSED:
-      return Integer.valueOf(getElapsed());
+      return getElapsed();
 
     case RPC:
       return getRpc();
 
     case SERVICE_TYPE:
-      return Short.valueOf(getServiceType());
+      return getServiceType();
 
     case END_POINT:
       return getEndPoint();
@@ -1208,10 +1182,10 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       return getAnnotations();
 
     case FLAG:
-      return Short.valueOf(getFlag());
+      return getFlag();
 
     case ERR:
-      return Integer.valueOf(getErr());
+      return getErr();
 
     case SPAN_EVENT_LIST:
       return getSpanEventList();
@@ -1220,31 +1194,31 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       return getParentApplicationName();
 
     case PARENT_APPLICATION_TYPE:
-      return Short.valueOf(getParentApplicationType());
+      return getParentApplicationType();
 
     case ACCEPTOR_HOST:
       return getAcceptorHost();
 
     case API_ID:
-      return Integer.valueOf(getApiId());
+      return getApiId();
 
     case EXCEPTION_INFO:
       return getExceptionInfo();
 
     case APPLICATION_SERVICE_TYPE:
-      return Short.valueOf(getApplicationServiceType());
+      return getApplicationServiceType();
 
     case LOGGING_TRANSACTION_INFO:
-      return Byte.valueOf(getLoggingTransactionInfo());
+      return getLoggingTransactionInfo();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1295,11 +1269,11 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     case LOGGING_TRANSACTION_INFO:
       return isSetLoggingTransactionInfo();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TSpan)
@@ -1310,6 +1284,8 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   public boolean equals(TSpan that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -1523,124 +1499,93 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_applicationName = true && (isSetApplicationName());
-    list.add(present_applicationName);
-    if (present_applicationName)
-      list.add(applicationName);
+    hashCode = hashCode * 8191 + ((isSetApplicationName()) ? 131071 : 524287);
+    if (isSetApplicationName())
+      hashCode = hashCode * 8191 + applicationName.hashCode();
 
-    boolean present_agentStartTime = true;
-    list.add(present_agentStartTime);
-    if (present_agentStartTime)
-      list.add(agentStartTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(agentStartTime);
 
-    boolean present_transactionId = true && (isSetTransactionId());
-    list.add(present_transactionId);
-    if (present_transactionId)
-      list.add(transactionId);
+    hashCode = hashCode * 8191 + ((isSetTransactionId()) ? 131071 : 524287);
+    if (isSetTransactionId())
+      hashCode = hashCode * 8191 + transactionId.hashCode();
 
-    boolean present_spanId = true;
-    list.add(present_spanId);
-    if (present_spanId)
-      list.add(spanId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(spanId);
 
-    boolean present_parentSpanId = true && (isSetParentSpanId());
-    list.add(present_parentSpanId);
-    if (present_parentSpanId)
-      list.add(parentSpanId);
+    hashCode = hashCode * 8191 + ((isSetParentSpanId()) ? 131071 : 524287);
+    if (isSetParentSpanId())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(parentSpanId);
 
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
 
-    boolean present_elapsed = true && (isSetElapsed());
-    list.add(present_elapsed);
-    if (present_elapsed)
-      list.add(elapsed);
+    hashCode = hashCode * 8191 + ((isSetElapsed()) ? 131071 : 524287);
+    if (isSetElapsed())
+      hashCode = hashCode * 8191 + elapsed;
 
-    boolean present_rpc = true && (isSetRpc());
-    list.add(present_rpc);
-    if (present_rpc)
-      list.add(rpc);
+    hashCode = hashCode * 8191 + ((isSetRpc()) ? 131071 : 524287);
+    if (isSetRpc())
+      hashCode = hashCode * 8191 + rpc.hashCode();
 
-    boolean present_serviceType = true;
-    list.add(present_serviceType);
-    if (present_serviceType)
-      list.add(serviceType);
+    hashCode = hashCode * 8191 + serviceType;
 
-    boolean present_endPoint = true && (isSetEndPoint());
-    list.add(present_endPoint);
-    if (present_endPoint)
-      list.add(endPoint);
+    hashCode = hashCode * 8191 + ((isSetEndPoint()) ? 131071 : 524287);
+    if (isSetEndPoint())
+      hashCode = hashCode * 8191 + endPoint.hashCode();
 
-    boolean present_remoteAddr = true && (isSetRemoteAddr());
-    list.add(present_remoteAddr);
-    if (present_remoteAddr)
-      list.add(remoteAddr);
+    hashCode = hashCode * 8191 + ((isSetRemoteAddr()) ? 131071 : 524287);
+    if (isSetRemoteAddr())
+      hashCode = hashCode * 8191 + remoteAddr.hashCode();
 
-    boolean present_annotations = true && (isSetAnnotations());
-    list.add(present_annotations);
-    if (present_annotations)
-      list.add(annotations);
+    hashCode = hashCode * 8191 + ((isSetAnnotations()) ? 131071 : 524287);
+    if (isSetAnnotations())
+      hashCode = hashCode * 8191 + annotations.hashCode();
 
-    boolean present_flag = true && (isSetFlag());
-    list.add(present_flag);
-    if (present_flag)
-      list.add(flag);
+    hashCode = hashCode * 8191 + ((isSetFlag()) ? 131071 : 524287);
+    if (isSetFlag())
+      hashCode = hashCode * 8191 + flag;
 
-    boolean present_err = true && (isSetErr());
-    list.add(present_err);
-    if (present_err)
-      list.add(err);
+    hashCode = hashCode * 8191 + ((isSetErr()) ? 131071 : 524287);
+    if (isSetErr())
+      hashCode = hashCode * 8191 + err;
 
-    boolean present_spanEventList = true && (isSetSpanEventList());
-    list.add(present_spanEventList);
-    if (present_spanEventList)
-      list.add(spanEventList);
+    hashCode = hashCode * 8191 + ((isSetSpanEventList()) ? 131071 : 524287);
+    if (isSetSpanEventList())
+      hashCode = hashCode * 8191 + spanEventList.hashCode();
 
-    boolean present_parentApplicationName = true && (isSetParentApplicationName());
-    list.add(present_parentApplicationName);
-    if (present_parentApplicationName)
-      list.add(parentApplicationName);
+    hashCode = hashCode * 8191 + ((isSetParentApplicationName()) ? 131071 : 524287);
+    if (isSetParentApplicationName())
+      hashCode = hashCode * 8191 + parentApplicationName.hashCode();
 
-    boolean present_parentApplicationType = true && (isSetParentApplicationType());
-    list.add(present_parentApplicationType);
-    if (present_parentApplicationType)
-      list.add(parentApplicationType);
+    hashCode = hashCode * 8191 + ((isSetParentApplicationType()) ? 131071 : 524287);
+    if (isSetParentApplicationType())
+      hashCode = hashCode * 8191 + parentApplicationType;
 
-    boolean present_acceptorHost = true && (isSetAcceptorHost());
-    list.add(present_acceptorHost);
-    if (present_acceptorHost)
-      list.add(acceptorHost);
+    hashCode = hashCode * 8191 + ((isSetAcceptorHost()) ? 131071 : 524287);
+    if (isSetAcceptorHost())
+      hashCode = hashCode * 8191 + acceptorHost.hashCode();
 
-    boolean present_apiId = true && (isSetApiId());
-    list.add(present_apiId);
-    if (present_apiId)
-      list.add(apiId);
+    hashCode = hashCode * 8191 + ((isSetApiId()) ? 131071 : 524287);
+    if (isSetApiId())
+      hashCode = hashCode * 8191 + apiId;
 
-    boolean present_exceptionInfo = true && (isSetExceptionInfo());
-    list.add(present_exceptionInfo);
-    if (present_exceptionInfo)
-      list.add(exceptionInfo);
+    hashCode = hashCode * 8191 + ((isSetExceptionInfo()) ? 131071 : 524287);
+    if (isSetExceptionInfo())
+      hashCode = hashCode * 8191 + exceptionInfo.hashCode();
 
-    boolean present_applicationServiceType = true && (isSetApplicationServiceType());
-    list.add(present_applicationServiceType);
-    if (present_applicationServiceType)
-      list.add(applicationServiceType);
+    hashCode = hashCode * 8191 + ((isSetApplicationServiceType()) ? 131071 : 524287);
+    if (isSetApplicationServiceType())
+      hashCode = hashCode * 8191 + applicationServiceType;
 
-    boolean present_loggingTransactionInfo = true && (isSetLoggingTransactionInfo());
-    list.add(present_loggingTransactionInfo);
-    if (present_loggingTransactionInfo)
-      list.add(loggingTransactionInfo);
+    hashCode = hashCode * 8191 + ((isSetLoggingTransactionInfo()) ? 131071 : 524287);
+    if (isSetLoggingTransactionInfo())
+      hashCode = hashCode * 8191 + (int) (loggingTransactionInfo);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -1651,7 +1596,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1661,7 +1606,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1671,7 +1616,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1681,7 +1626,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
+    lastComparison = java.lang.Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1691,7 +1636,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
+    lastComparison = java.lang.Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1701,7 +1646,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetParentSpanId()).compareTo(other.isSetParentSpanId());
+    lastComparison = java.lang.Boolean.valueOf(isSetParentSpanId()).compareTo(other.isSetParentSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1711,7 +1656,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1721,7 +1666,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1731,7 +1676,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRpc()).compareTo(other.isSetRpc());
+    lastComparison = java.lang.Boolean.valueOf(isSetRpc()).compareTo(other.isSetRpc());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1741,7 +1686,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1751,7 +1696,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1761,7 +1706,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRemoteAddr()).compareTo(other.isSetRemoteAddr());
+    lastComparison = java.lang.Boolean.valueOf(isSetRemoteAddr()).compareTo(other.isSetRemoteAddr());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1771,7 +1716,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
+    lastComparison = java.lang.Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1781,7 +1726,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFlag()).compareTo(other.isSetFlag());
+    lastComparison = java.lang.Boolean.valueOf(isSetFlag()).compareTo(other.isSetFlag());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1791,7 +1736,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetErr()).compareTo(other.isSetErr());
+    lastComparison = java.lang.Boolean.valueOf(isSetErr()).compareTo(other.isSetErr());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1801,7 +1746,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSpanEventList()).compareTo(other.isSetSpanEventList());
+    lastComparison = java.lang.Boolean.valueOf(isSetSpanEventList()).compareTo(other.isSetSpanEventList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1811,7 +1756,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetParentApplicationName()).compareTo(other.isSetParentApplicationName());
+    lastComparison = java.lang.Boolean.valueOf(isSetParentApplicationName()).compareTo(other.isSetParentApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1821,7 +1766,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetParentApplicationType()).compareTo(other.isSetParentApplicationType());
+    lastComparison = java.lang.Boolean.valueOf(isSetParentApplicationType()).compareTo(other.isSetParentApplicationType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1831,7 +1776,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAcceptorHost()).compareTo(other.isSetAcceptorHost());
+    lastComparison = java.lang.Boolean.valueOf(isSetAcceptorHost()).compareTo(other.isSetAcceptorHost());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1841,7 +1786,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
+    lastComparison = java.lang.Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1851,7 +1796,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetExceptionInfo()).compareTo(other.isSetExceptionInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetExceptionInfo()).compareTo(other.isSetExceptionInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1861,7 +1806,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationServiceType()).compareTo(other.isSetApplicationServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationServiceType()).compareTo(other.isSetApplicationServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1871,7 +1816,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLoggingTransactionInfo()).compareTo(other.isSetLoggingTransactionInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetLoggingTransactionInfo()).compareTo(other.isSetLoggingTransactionInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1889,16 +1834,16 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TSpan(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TSpan(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -2088,7 +2033,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -2098,13 +2043,13 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
-  private static class TSpanStandardSchemeFactory implements SchemeFactory {
+  private static class TSpanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanStandardScheme getScheme() {
       return new TSpanStandardScheme();
     }
   }
 
-  private static class TSpanStandardScheme extends StandardScheme<TSpan> {
+  private static class TSpanStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSpan> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSpan struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -2216,7 +2161,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.annotations = new ArrayList<TAnnotation>(_list8.size);
+                struct.annotations = new java.util.ArrayList<TAnnotation>(_list8.size);
                 TAnnotation _elem9;
                 for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
@@ -2251,7 +2196,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
-                struct.spanEventList = new ArrayList<TSpanEvent>(_list11.size);
+                struct.spanEventList = new java.util.ArrayList<TSpanEvent>(_list11.size);
                 TSpanEvent _elem12;
                 for (int _i13 = 0; _i13 < _list11.size; ++_i13)
                 {
@@ -2479,18 +2424,18 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
   }
 
-  private static class TSpanTupleSchemeFactory implements SchemeFactory {
+  private static class TSpanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanTupleScheme getScheme() {
       return new TSpanTupleScheme();
     }
   }
 
-  private static class TSpanTupleScheme extends TupleScheme<TSpan> {
+  private static class TSpanTupleScheme extends org.apache.thrift.scheme.TupleScheme<TSpan> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TSpan struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -2646,8 +2591,8 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSpan struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(23);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(23);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -2699,7 +2644,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (incoming.get(12)) {
         {
           org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.annotations = new ArrayList<TAnnotation>(_list18.size);
+          struct.annotations = new java.util.ArrayList<TAnnotation>(_list18.size);
           TAnnotation _elem19;
           for (int _i20 = 0; _i20 < _list18.size; ++_i20)
           {
@@ -2721,7 +2666,7 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
       if (incoming.get(15)) {
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.spanEventList = new ArrayList<TSpanEvent>(_list21.size);
+          struct.spanEventList = new java.util.ArrayList<TSpanEvent>(_list21.size);
           TSpanEvent _elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
@@ -2764,5 +2709,8 @@ public class TSpan implements org.apache.thrift.TBase<TSpan, TSpan._Fields>, jav
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanChunk.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanChunk.java
index 82bd42a73..4ed29060f 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanChunk.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanChunk.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChunk._Fields>, java.io.Serializable, Cloneable, Comparable<TSpanChunk> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSpanChunk");
 
@@ -48,20 +21,17 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   private static final org.apache.thrift.protocol.TField SPAN_EVENT_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("spanEventList", org.apache.thrift.protocol.TType.LIST, (short)10);
   private static final org.apache.thrift.protocol.TField APPLICATION_SERVICE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationServiceType", org.apache.thrift.protocol.TType.I16, (short)11);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TSpanChunkStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TSpanChunkTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TSpanChunkStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TSpanChunkTupleSchemeFactory();
 
-  private String agentId; // required
-  private String applicationName; // required
+  private java.lang.String agentId; // required
+  private java.lang.String applicationName; // required
   private long agentStartTime; // required
   private short serviceType; // required
-  private ByteBuffer transactionId; // required
+  private java.nio.ByteBuffer transactionId; // required
   private long spanId; // required
-  private String endPoint; // optional
-  private List<TSpanEvent> spanEventList; // required
+  private java.lang.String endPoint; // optional
+  private java.util.List<TSpanEvent> spanEventList; // required
   private short applicationServiceType; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -76,10 +46,10 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     SPAN_EVENT_LIST((short)10, "spanEventList"),
     APPLICATION_SERVICE_TYPE((short)11, "applicationServiceType");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -118,21 +88,21 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -141,7 +111,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -153,9 +123,9 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   private static final int __APPLICATIONSERVICETYPE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.END_POINT,_Fields.APPLICATION_SERVICE_TYPE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.APPLICATION_NAME, new org.apache.thrift.meta_data.FieldMetaData("applicationName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -175,7 +145,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TSpanEvent.class))));
     tmpMap.put(_Fields.APPLICATION_SERVICE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("applicationServiceType", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TSpanChunk.class, metaDataMap);
   }
 
@@ -183,13 +153,13 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public TSpanChunk(
-    String agentId,
-    String applicationName,
+    java.lang.String agentId,
+    java.lang.String applicationName,
     long agentStartTime,
     short serviceType,
-    ByteBuffer transactionId,
+    java.nio.ByteBuffer transactionId,
     long spanId,
-    List<TSpanEvent> spanEventList)
+    java.util.List<TSpanEvent> spanEventList)
   {
     this();
     this.agentId = agentId;
@@ -225,7 +195,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       this.endPoint = other.endPoint;
     }
     if (other.isSetSpanEventList()) {
-      List<TSpanEvent> __this__spanEventList = new ArrayList<TSpanEvent>(other.spanEventList.size());
+      java.util.List<TSpanEvent> __this__spanEventList = new java.util.ArrayList<TSpanEvent>(other.spanEventList.size());
       for (TSpanEvent other_element : other.spanEventList) {
         __this__spanEventList.add(new TSpanEvent(other_element));
       }
@@ -255,11 +225,11 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     this.applicationServiceType = 0;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -278,11 +248,11 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     }
   }
 
-  public String getApplicationName() {
+  public java.lang.String getApplicationName() {
     return this.applicationName;
   }
 
-  public void setApplicationName(String applicationName) {
+  public void setApplicationName(java.lang.String applicationName) {
     this.applicationName = applicationName;
   }
 
@@ -311,16 +281,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public void unsetAgentStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   /** Returns true if field agentStartTime is set (has been assigned a value) and false otherwise */
   public boolean isSetAgentStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   public void setAgentStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
   }
 
   public short getServiceType() {
@@ -333,16 +303,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public void unsetServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field serviceType is set (has been assigned a value) and false otherwise */
   public boolean isSetServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   public void setServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
   }
 
   public byte[] getTransactionId() {
@@ -350,15 +320,15 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     return transactionId == null ? null : transactionId.array();
   }
 
-  public ByteBuffer bufferForTransactionId() {
+  public java.nio.ByteBuffer bufferForTransactionId() {
     return org.apache.thrift.TBaseHelper.copyBinary(transactionId);
   }
 
   public void setTransactionId(byte[] transactionId) {
-    this.transactionId = transactionId == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(transactionId, transactionId.length));
+    this.transactionId = transactionId == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(transactionId.clone());
   }
 
-  public void setTransactionId(ByteBuffer transactionId) {
+  public void setTransactionId(java.nio.ByteBuffer transactionId) {
     this.transactionId = org.apache.thrift.TBaseHelper.copyBinary(transactionId);
   }
 
@@ -387,23 +357,23 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public void unsetSpanId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   /** Returns true if field spanId is set (has been assigned a value) and false otherwise */
   public boolean isSetSpanId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   public void setSpanIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
   }
 
-  public String getEndPoint() {
+  public java.lang.String getEndPoint() {
     return this.endPoint;
   }
 
-  public void setEndPoint(String endPoint) {
+  public void setEndPoint(java.lang.String endPoint) {
     this.endPoint = endPoint;
   }
 
@@ -432,16 +402,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
 
   public void addToSpanEventList(TSpanEvent elem) {
     if (this.spanEventList == null) {
-      this.spanEventList = new ArrayList<TSpanEvent>();
+      this.spanEventList = new java.util.ArrayList<TSpanEvent>();
     }
     this.spanEventList.add(elem);
   }
 
-  public List<TSpanEvent> getSpanEventList() {
+  public java.util.List<TSpanEvent> getSpanEventList() {
     return this.spanEventList;
   }
 
-  public void setSpanEventList(List<TSpanEvent> spanEventList) {
+  public void setSpanEventList(java.util.List<TSpanEvent> spanEventList) {
     this.spanEventList = spanEventList;
   }
 
@@ -470,25 +440,25 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public void unsetApplicationServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field applicationServiceType is set (has been assigned a value) and false otherwise */
   public boolean isSetApplicationServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID);
   }
 
   public void setApplicationServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __APPLICATIONSERVICETYPE_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -496,7 +466,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -504,7 +474,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetAgentStartTime();
       } else {
-        setAgentStartTime((Long)value);
+        setAgentStartTime((java.lang.Long)value);
       }
       break;
 
@@ -512,7 +482,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetServiceType();
       } else {
-        setServiceType((Short)value);
+        setServiceType((java.lang.Short)value);
       }
       break;
 
@@ -520,7 +490,11 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetTransactionId();
       } else {
-        setTransactionId((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setTransactionId((byte[])value);
+        } else {
+          setTransactionId((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -528,7 +502,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetSpanId();
       } else {
-        setSpanId((Long)value);
+        setSpanId((java.lang.Long)value);
       }
       break;
 
@@ -536,7 +510,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetEndPoint();
       } else {
-        setEndPoint((String)value);
+        setEndPoint((java.lang.String)value);
       }
       break;
 
@@ -544,7 +518,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetSpanEventList();
       } else {
-        setSpanEventList((List<TSpanEvent>)value);
+        setSpanEventList((java.util.List<TSpanEvent>)value);
       }
       break;
 
@@ -552,14 +526,14 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (value == null) {
         unsetApplicationServiceType();
       } else {
-        setApplicationServiceType((Short)value);
+        setApplicationServiceType((java.lang.Short)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
@@ -568,16 +542,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       return getApplicationName();
 
     case AGENT_START_TIME:
-      return Long.valueOf(getAgentStartTime());
+      return getAgentStartTime();
 
     case SERVICE_TYPE:
-      return Short.valueOf(getServiceType());
+      return getServiceType();
 
     case TRANSACTION_ID:
       return getTransactionId();
 
     case SPAN_ID:
-      return Long.valueOf(getSpanId());
+      return getSpanId();
 
     case END_POINT:
       return getEndPoint();
@@ -586,16 +560,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       return getSpanEventList();
 
     case APPLICATION_SERVICE_TYPE:
-      return Short.valueOf(getApplicationServiceType());
+      return getApplicationServiceType();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -618,11 +592,11 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     case APPLICATION_SERVICE_TYPE:
       return isSetApplicationServiceType();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TSpanChunk)
@@ -633,6 +607,8 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   public boolean equals(TSpanChunk that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -720,54 +696,39 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_applicationName = true && (isSetApplicationName());
-    list.add(present_applicationName);
-    if (present_applicationName)
-      list.add(applicationName);
+    hashCode = hashCode * 8191 + ((isSetApplicationName()) ? 131071 : 524287);
+    if (isSetApplicationName())
+      hashCode = hashCode * 8191 + applicationName.hashCode();
 
-    boolean present_agentStartTime = true;
-    list.add(present_agentStartTime);
-    if (present_agentStartTime)
-      list.add(agentStartTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(agentStartTime);
 
-    boolean present_serviceType = true;
-    list.add(present_serviceType);
-    if (present_serviceType)
-      list.add(serviceType);
+    hashCode = hashCode * 8191 + serviceType;
 
-    boolean present_transactionId = true && (isSetTransactionId());
-    list.add(present_transactionId);
-    if (present_transactionId)
-      list.add(transactionId);
+    hashCode = hashCode * 8191 + ((isSetTransactionId()) ? 131071 : 524287);
+    if (isSetTransactionId())
+      hashCode = hashCode * 8191 + transactionId.hashCode();
 
-    boolean present_spanId = true;
-    list.add(present_spanId);
-    if (present_spanId)
-      list.add(spanId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(spanId);
 
-    boolean present_endPoint = true && (isSetEndPoint());
-    list.add(present_endPoint);
-    if (present_endPoint)
-      list.add(endPoint);
+    hashCode = hashCode * 8191 + ((isSetEndPoint()) ? 131071 : 524287);
+    if (isSetEndPoint())
+      hashCode = hashCode * 8191 + endPoint.hashCode();
 
-    boolean present_spanEventList = true && (isSetSpanEventList());
-    list.add(present_spanEventList);
-    if (present_spanEventList)
-      list.add(spanEventList);
+    hashCode = hashCode * 8191 + ((isSetSpanEventList()) ? 131071 : 524287);
+    if (isSetSpanEventList())
+      hashCode = hashCode * 8191 + spanEventList.hashCode();
 
-    boolean present_applicationServiceType = true && (isSetApplicationServiceType());
-    list.add(present_applicationServiceType);
-    if (present_applicationServiceType)
-      list.add(applicationServiceType);
+    hashCode = hashCode * 8191 + ((isSetApplicationServiceType()) ? 131071 : 524287);
+    if (isSetApplicationServiceType())
+      hashCode = hashCode * 8191 + applicationServiceType;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -778,7 +739,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -788,7 +749,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -798,7 +759,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -808,7 +769,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -818,7 +779,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
+    lastComparison = java.lang.Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -828,7 +789,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
+    lastComparison = java.lang.Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -838,7 +799,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -848,7 +809,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSpanEventList()).compareTo(other.isSetSpanEventList());
+    lastComparison = java.lang.Boolean.valueOf(isSetSpanEventList()).compareTo(other.isSetSpanEventList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -858,7 +819,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationServiceType()).compareTo(other.isSetApplicationServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationServiceType()).compareTo(other.isSetApplicationServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -876,16 +837,16 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TSpanChunk(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TSpanChunk(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -964,7 +925,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -974,13 +935,13 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     }
   }
 
-  private static class TSpanChunkStandardSchemeFactory implements SchemeFactory {
+  private static class TSpanChunkStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanChunkStandardScheme getScheme() {
       return new TSpanChunkStandardScheme();
     }
   }
 
-  private static class TSpanChunkStandardScheme extends StandardScheme<TSpanChunk> {
+  private static class TSpanChunkStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSpanChunk> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSpanChunk struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1052,7 +1013,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
-                struct.spanEventList = new ArrayList<TSpanEvent>(_list24.size);
+                struct.spanEventList = new java.util.ArrayList<TSpanEvent>(_list24.size);
                 TSpanEvent _elem25;
                 for (int _i26 = 0; _i26 < _list24.size; ++_i26)
                 {
@@ -1142,18 +1103,18 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
 
   }
 
-  private static class TSpanChunkTupleSchemeFactory implements SchemeFactory {
+  private static class TSpanChunkTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanChunkTupleScheme getScheme() {
       return new TSpanChunkTupleScheme();
     }
   }
 
-  private static class TSpanChunkTupleScheme extends TupleScheme<TSpanChunk> {
+  private static class TSpanChunkTupleScheme extends org.apache.thrift.scheme.TupleScheme<TSpanChunk> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TSpanChunk struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -1219,8 +1180,8 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSpanChunk struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(9);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -1252,7 +1213,7 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
       if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.spanEventList = new ArrayList<TSpanEvent>(_list29.size);
+          struct.spanEventList = new java.util.ArrayList<TSpanEvent>(_list29.size);
           TSpanEvent _elem30;
           for (int _i31 = 0; _i31 < _list29.size; ++_i31)
           {
@@ -1270,5 +1231,8 @@ public class TSpanChunk implements org.apache.thrift.TBase<TSpanChunk, TSpanChun
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanEvent.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanEvent.java
index fa51f2866..cffd592f8 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanEvent.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSpanEvent.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TSpanEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSpanEvent");
 
@@ -55,23 +28,20 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   private static final org.apache.thrift.protocol.TField NEXT_ASYNC_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("nextAsyncId", org.apache.thrift.protocol.TType.I32, (short)31);
   private static final org.apache.thrift.protocol.TField ASYNC_SEQUENCE_FIELD_DESC = new org.apache.thrift.protocol.TField("asyncSequence", org.apache.thrift.protocol.TType.I16, (short)32);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TSpanEventStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TSpanEventTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TSpanEventStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TSpanEventTupleSchemeFactory();
 
   private long spanId; // optional
   private short sequence; // required
   private int startElapsed; // required
   private int endElapsed; // optional
-  private String rpc; // optional
+  private java.lang.String rpc; // optional
   private short serviceType; // required
-  private String endPoint; // optional
-  private List<TAnnotation> annotations; // optional
+  private java.lang.String endPoint; // optional
+  private java.util.List<TAnnotation> annotations; // optional
   private int depth; // optional
   private long nextSpanId; // optional
-  private String destinationId; // optional
+  private java.lang.String destinationId; // optional
   private int apiId; // optional
   private TIntStringValue exceptionInfo; // optional
   private int asyncId; // optional
@@ -97,10 +67,10 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
     NEXT_ASYNC_ID((short)31, "nextAsyncId"),
     ASYNC_SEQUENCE((short)32, "asyncSequence");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -153,21 +123,21 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -176,7 +146,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -195,9 +165,9 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   private static final int __ASYNCSEQUENCE_ISSET_ID = 10;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.SPAN_ID,_Fields.END_ELAPSED,_Fields.RPC,_Fields.END_POINT,_Fields.ANNOTATIONS,_Fields.DEPTH,_Fields.NEXT_SPAN_ID,_Fields.DESTINATION_ID,_Fields.API_ID,_Fields.EXCEPTION_INFO,_Fields.ASYNC_ID,_Fields.NEXT_ASYNC_ID,_Fields.ASYNC_SEQUENCE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SPAN_ID, new org.apache.thrift.meta_data.FieldMetaData("spanId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("sequence", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -231,7 +201,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.ASYNC_SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("asyncSequence", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TSpanEvent.class, metaDataMap);
   }
 
@@ -275,7 +245,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       this.endPoint = other.endPoint;
     }
     if (other.isSetAnnotations()) {
-      List<TAnnotation> __this__annotations = new ArrayList<TAnnotation>(other.annotations.size());
+      java.util.List<TAnnotation> __this__annotations = new java.util.ArrayList<TAnnotation>(other.annotations.size());
       for (TAnnotation other_element : other.annotations) {
         __this__annotations.add(new TAnnotation(other_element));
       }
@@ -340,16 +310,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetSpanId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   /** Returns true if field spanId is set (has been assigned a value) and false otherwise */
   public boolean isSetSpanId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
   }
 
   public void setSpanIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
   }
 
   public short getSequence() {
@@ -362,16 +332,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetSequence() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SEQUENCE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SEQUENCE_ISSET_ID);
   }
 
   /** Returns true if field sequence is set (has been assigned a value) and false otherwise */
   public boolean isSetSequence() {
-    return EncodingUtils.testBit(__isset_bitfield, __SEQUENCE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SEQUENCE_ISSET_ID);
   }
 
   public void setSequenceIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SEQUENCE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SEQUENCE_ISSET_ID, value);
   }
 
   public int getStartElapsed() {
@@ -384,16 +354,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetStartElapsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTELAPSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTELAPSED_ISSET_ID);
   }
 
   /** Returns true if field startElapsed is set (has been assigned a value) and false otherwise */
   public boolean isSetStartElapsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTELAPSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTELAPSED_ISSET_ID);
   }
 
   public void setStartElapsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTELAPSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTELAPSED_ISSET_ID, value);
   }
 
   public int getEndElapsed() {
@@ -406,23 +376,23 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetEndElapsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDELAPSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDELAPSED_ISSET_ID);
   }
 
   /** Returns true if field endElapsed is set (has been assigned a value) and false otherwise */
   public boolean isSetEndElapsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDELAPSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDELAPSED_ISSET_ID);
   }
 
   public void setEndElapsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDELAPSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDELAPSED_ISSET_ID, value);
   }
 
-  public String getRpc() {
+  public java.lang.String getRpc() {
     return this.rpc;
   }
 
-  public void setRpc(String rpc) {
+  public void setRpc(java.lang.String rpc) {
     this.rpc = rpc;
   }
 
@@ -451,23 +421,23 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetServiceType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   /** Returns true if field serviceType is set (has been assigned a value) and false otherwise */
   public boolean isSetServiceType() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVICETYPE_ISSET_ID);
   }
 
   public void setServiceTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVICETYPE_ISSET_ID, value);
   }
 
-  public String getEndPoint() {
+  public java.lang.String getEndPoint() {
     return this.endPoint;
   }
 
-  public void setEndPoint(String endPoint) {
+  public void setEndPoint(java.lang.String endPoint) {
     this.endPoint = endPoint;
   }
 
@@ -496,16 +466,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
 
   public void addToAnnotations(TAnnotation elem) {
     if (this.annotations == null) {
-      this.annotations = new ArrayList<TAnnotation>();
+      this.annotations = new java.util.ArrayList<TAnnotation>();
     }
     this.annotations.add(elem);
   }
 
-  public List<TAnnotation> getAnnotations() {
+  public java.util.List<TAnnotation> getAnnotations() {
     return this.annotations;
   }
 
-  public void setAnnotations(List<TAnnotation> annotations) {
+  public void setAnnotations(java.util.List<TAnnotation> annotations) {
     this.annotations = annotations;
   }
 
@@ -534,16 +504,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetDepth() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEPTH_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DEPTH_ISSET_ID);
   }
 
   /** Returns true if field depth is set (has been assigned a value) and false otherwise */
   public boolean isSetDepth() {
-    return EncodingUtils.testBit(__isset_bitfield, __DEPTH_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DEPTH_ISSET_ID);
   }
 
   public void setDepthIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEPTH_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DEPTH_ISSET_ID, value);
   }
 
   public long getNextSpanId() {
@@ -556,23 +526,23 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetNextSpanId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NEXTSPANID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NEXTSPANID_ISSET_ID);
   }
 
   /** Returns true if field nextSpanId is set (has been assigned a value) and false otherwise */
   public boolean isSetNextSpanId() {
-    return EncodingUtils.testBit(__isset_bitfield, __NEXTSPANID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NEXTSPANID_ISSET_ID);
   }
 
   public void setNextSpanIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NEXTSPANID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NEXTSPANID_ISSET_ID, value);
   }
 
-  public String getDestinationId() {
+  public java.lang.String getDestinationId() {
     return this.destinationId;
   }
 
-  public void setDestinationId(String destinationId) {
+  public void setDestinationId(java.lang.String destinationId) {
     this.destinationId = destinationId;
   }
 
@@ -601,16 +571,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetApiId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   /** Returns true if field apiId is set (has been assigned a value) and false otherwise */
   public boolean isSetApiId() {
-    return EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __APIID_ISSET_ID);
   }
 
   public void setApiIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __APIID_ISSET_ID, value);
   }
 
   public TIntStringValue getExceptionInfo() {
@@ -646,16 +616,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetAsyncId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASYNCID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASYNCID_ISSET_ID);
   }
 
   /** Returns true if field asyncId is set (has been assigned a value) and false otherwise */
   public boolean isSetAsyncId() {
-    return EncodingUtils.testBit(__isset_bitfield, __ASYNCID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASYNCID_ISSET_ID);
   }
 
   public void setAsyncIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASYNCID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASYNCID_ISSET_ID, value);
   }
 
   public int getNextAsyncId() {
@@ -668,16 +638,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetNextAsyncId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID);
   }
 
   /** Returns true if field nextAsyncId is set (has been assigned a value) and false otherwise */
   public boolean isSetNextAsyncId() {
-    return EncodingUtils.testBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID);
   }
 
   public void setNextAsyncIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NEXTASYNCID_ISSET_ID, value);
   }
 
   public short getAsyncSequence() {
@@ -690,25 +660,25 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void unsetAsyncSequence() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID);
   }
 
   /** Returns true if field asyncSequence is set (has been assigned a value) and false otherwise */
   public boolean isSetAsyncSequence() {
-    return EncodingUtils.testBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID);
   }
 
   public void setAsyncSequenceIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASYNCSEQUENCE_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SPAN_ID:
       if (value == null) {
         unsetSpanId();
       } else {
-        setSpanId((Long)value);
+        setSpanId((java.lang.Long)value);
       }
       break;
 
@@ -716,7 +686,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetSequence();
       } else {
-        setSequence((Short)value);
+        setSequence((java.lang.Short)value);
       }
       break;
 
@@ -724,7 +694,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetStartElapsed();
       } else {
-        setStartElapsed((Integer)value);
+        setStartElapsed((java.lang.Integer)value);
       }
       break;
 
@@ -732,7 +702,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetEndElapsed();
       } else {
-        setEndElapsed((Integer)value);
+        setEndElapsed((java.lang.Integer)value);
       }
       break;
 
@@ -740,7 +710,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetRpc();
       } else {
-        setRpc((String)value);
+        setRpc((java.lang.String)value);
       }
       break;
 
@@ -748,7 +718,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetServiceType();
       } else {
-        setServiceType((Short)value);
+        setServiceType((java.lang.Short)value);
       }
       break;
 
@@ -756,7 +726,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetEndPoint();
       } else {
-        setEndPoint((String)value);
+        setEndPoint((java.lang.String)value);
       }
       break;
 
@@ -764,7 +734,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetAnnotations();
       } else {
-        setAnnotations((List<TAnnotation>)value);
+        setAnnotations((java.util.List<TAnnotation>)value);
       }
       break;
 
@@ -772,7 +742,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetDepth();
       } else {
-        setDepth((Integer)value);
+        setDepth((java.lang.Integer)value);
       }
       break;
 
@@ -780,7 +750,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetNextSpanId();
       } else {
-        setNextSpanId((Long)value);
+        setNextSpanId((java.lang.Long)value);
       }
       break;
 
@@ -788,7 +758,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetDestinationId();
       } else {
-        setDestinationId((String)value);
+        setDestinationId((java.lang.String)value);
       }
       break;
 
@@ -796,7 +766,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetApiId();
       } else {
-        setApiId((Integer)value);
+        setApiId((java.lang.Integer)value);
       }
       break;
 
@@ -812,7 +782,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetAsyncId();
       } else {
-        setAsyncId((Integer)value);
+        setAsyncId((java.lang.Integer)value);
       }
       break;
 
@@ -820,7 +790,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetNextAsyncId();
       } else {
-        setNextAsyncId((Integer)value);
+        setNextAsyncId((java.lang.Integer)value);
       }
       break;
 
@@ -828,32 +798,32 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (value == null) {
         unsetAsyncSequence();
       } else {
-        setAsyncSequence((Short)value);
+        setAsyncSequence((java.lang.Short)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SPAN_ID:
-      return Long.valueOf(getSpanId());
+      return getSpanId();
 
     case SEQUENCE:
-      return Short.valueOf(getSequence());
+      return getSequence();
 
     case START_ELAPSED:
-      return Integer.valueOf(getStartElapsed());
+      return getStartElapsed();
 
     case END_ELAPSED:
-      return Integer.valueOf(getEndElapsed());
+      return getEndElapsed();
 
     case RPC:
       return getRpc();
 
     case SERVICE_TYPE:
-      return Short.valueOf(getServiceType());
+      return getServiceType();
 
     case END_POINT:
       return getEndPoint();
@@ -862,37 +832,37 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       return getAnnotations();
 
     case DEPTH:
-      return Integer.valueOf(getDepth());
+      return getDepth();
 
     case NEXT_SPAN_ID:
-      return Long.valueOf(getNextSpanId());
+      return getNextSpanId();
 
     case DESTINATION_ID:
       return getDestinationId();
 
     case API_ID:
-      return Integer.valueOf(getApiId());
+      return getApiId();
 
     case EXCEPTION_INFO:
       return getExceptionInfo();
 
     case ASYNC_ID:
-      return Integer.valueOf(getAsyncId());
+      return getAsyncId();
 
     case NEXT_ASYNC_ID:
-      return Integer.valueOf(getNextAsyncId());
+      return getNextAsyncId();
 
     case ASYNC_SEQUENCE:
-      return Short.valueOf(getAsyncSequence());
+      return getAsyncSequence();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -929,11 +899,11 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
     case ASYNC_SEQUENCE:
       return isSetAsyncSequence();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TSpanEvent)
@@ -944,6 +914,8 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   public boolean equals(TSpanEvent that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_spanId = true && this.isSetSpanId();
     boolean that_present_spanId = true && that.isSetSpanId();
@@ -1094,89 +1066,67 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_spanId = true && (isSetSpanId());
-    list.add(present_spanId);
-    if (present_spanId)
-      list.add(spanId);
+    hashCode = hashCode * 8191 + ((isSetSpanId()) ? 131071 : 524287);
+    if (isSetSpanId())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(spanId);
 
-    boolean present_sequence = true;
-    list.add(present_sequence);
-    if (present_sequence)
-      list.add(sequence);
+    hashCode = hashCode * 8191 + sequence;
 
-    boolean present_startElapsed = true;
-    list.add(present_startElapsed);
-    if (present_startElapsed)
-      list.add(startElapsed);
+    hashCode = hashCode * 8191 + startElapsed;
 
-    boolean present_endElapsed = true && (isSetEndElapsed());
-    list.add(present_endElapsed);
-    if (present_endElapsed)
-      list.add(endElapsed);
+    hashCode = hashCode * 8191 + ((isSetEndElapsed()) ? 131071 : 524287);
+    if (isSetEndElapsed())
+      hashCode = hashCode * 8191 + endElapsed;
 
-    boolean present_rpc = true && (isSetRpc());
-    list.add(present_rpc);
-    if (present_rpc)
-      list.add(rpc);
+    hashCode = hashCode * 8191 + ((isSetRpc()) ? 131071 : 524287);
+    if (isSetRpc())
+      hashCode = hashCode * 8191 + rpc.hashCode();
 
-    boolean present_serviceType = true;
-    list.add(present_serviceType);
-    if (present_serviceType)
-      list.add(serviceType);
+    hashCode = hashCode * 8191 + serviceType;
 
-    boolean present_endPoint = true && (isSetEndPoint());
-    list.add(present_endPoint);
-    if (present_endPoint)
-      list.add(endPoint);
+    hashCode = hashCode * 8191 + ((isSetEndPoint()) ? 131071 : 524287);
+    if (isSetEndPoint())
+      hashCode = hashCode * 8191 + endPoint.hashCode();
 
-    boolean present_annotations = true && (isSetAnnotations());
-    list.add(present_annotations);
-    if (present_annotations)
-      list.add(annotations);
+    hashCode = hashCode * 8191 + ((isSetAnnotations()) ? 131071 : 524287);
+    if (isSetAnnotations())
+      hashCode = hashCode * 8191 + annotations.hashCode();
 
-    boolean present_depth = true && (isSetDepth());
-    list.add(present_depth);
-    if (present_depth)
-      list.add(depth);
+    hashCode = hashCode * 8191 + ((isSetDepth()) ? 131071 : 524287);
+    if (isSetDepth())
+      hashCode = hashCode * 8191 + depth;
 
-    boolean present_nextSpanId = true && (isSetNextSpanId());
-    list.add(present_nextSpanId);
-    if (present_nextSpanId)
-      list.add(nextSpanId);
+    hashCode = hashCode * 8191 + ((isSetNextSpanId()) ? 131071 : 524287);
+    if (isSetNextSpanId())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(nextSpanId);
 
-    boolean present_destinationId = true && (isSetDestinationId());
-    list.add(present_destinationId);
-    if (present_destinationId)
-      list.add(destinationId);
+    hashCode = hashCode * 8191 + ((isSetDestinationId()) ? 131071 : 524287);
+    if (isSetDestinationId())
+      hashCode = hashCode * 8191 + destinationId.hashCode();
 
-    boolean present_apiId = true && (isSetApiId());
-    list.add(present_apiId);
-    if (present_apiId)
-      list.add(apiId);
+    hashCode = hashCode * 8191 + ((isSetApiId()) ? 131071 : 524287);
+    if (isSetApiId())
+      hashCode = hashCode * 8191 + apiId;
 
-    boolean present_exceptionInfo = true && (isSetExceptionInfo());
-    list.add(present_exceptionInfo);
-    if (present_exceptionInfo)
-      list.add(exceptionInfo);
+    hashCode = hashCode * 8191 + ((isSetExceptionInfo()) ? 131071 : 524287);
+    if (isSetExceptionInfo())
+      hashCode = hashCode * 8191 + exceptionInfo.hashCode();
 
-    boolean present_asyncId = true && (isSetAsyncId());
-    list.add(present_asyncId);
-    if (present_asyncId)
-      list.add(asyncId);
+    hashCode = hashCode * 8191 + ((isSetAsyncId()) ? 131071 : 524287);
+    if (isSetAsyncId())
+      hashCode = hashCode * 8191 + asyncId;
 
-    boolean present_nextAsyncId = true && (isSetNextAsyncId());
-    list.add(present_nextAsyncId);
-    if (present_nextAsyncId)
-      list.add(nextAsyncId);
+    hashCode = hashCode * 8191 + ((isSetNextAsyncId()) ? 131071 : 524287);
+    if (isSetNextAsyncId())
+      hashCode = hashCode * 8191 + nextAsyncId;
 
-    boolean present_asyncSequence = true && (isSetAsyncSequence());
-    list.add(present_asyncSequence);
-    if (present_asyncSequence)
-      list.add(asyncSequence);
+    hashCode = hashCode * 8191 + ((isSetAsyncSequence()) ? 131071 : 524287);
+    if (isSetAsyncSequence())
+      hashCode = hashCode * 8191 + asyncSequence;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -1187,7 +1137,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
+    lastComparison = java.lang.Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1197,7 +1147,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSequence()).compareTo(other.isSetSequence());
+    lastComparison = java.lang.Boolean.valueOf(isSetSequence()).compareTo(other.isSetSequence());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1207,7 +1157,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartElapsed()).compareTo(other.isSetStartElapsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartElapsed()).compareTo(other.isSetStartElapsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1217,7 +1167,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndElapsed()).compareTo(other.isSetEndElapsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndElapsed()).compareTo(other.isSetEndElapsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1227,7 +1177,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRpc()).compareTo(other.isSetRpc());
+    lastComparison = java.lang.Boolean.valueOf(isSetRpc()).compareTo(other.isSetRpc());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1237,7 +1187,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
+    lastComparison = java.lang.Boolean.valueOf(isSetServiceType()).compareTo(other.isSetServiceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1247,7 +1197,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetEndPoint()).compareTo(other.isSetEndPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1257,7 +1207,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
+    lastComparison = java.lang.Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1267,7 +1217,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDepth()).compareTo(other.isSetDepth());
+    lastComparison = java.lang.Boolean.valueOf(isSetDepth()).compareTo(other.isSetDepth());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1277,7 +1227,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNextSpanId()).compareTo(other.isSetNextSpanId());
+    lastComparison = java.lang.Boolean.valueOf(isSetNextSpanId()).compareTo(other.isSetNextSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1287,7 +1237,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDestinationId()).compareTo(other.isSetDestinationId());
+    lastComparison = java.lang.Boolean.valueOf(isSetDestinationId()).compareTo(other.isSetDestinationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1297,7 +1247,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
+    lastComparison = java.lang.Boolean.valueOf(isSetApiId()).compareTo(other.isSetApiId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1307,7 +1257,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetExceptionInfo()).compareTo(other.isSetExceptionInfo());
+    lastComparison = java.lang.Boolean.valueOf(isSetExceptionInfo()).compareTo(other.isSetExceptionInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1317,7 +1267,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAsyncId()).compareTo(other.isSetAsyncId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAsyncId()).compareTo(other.isSetAsyncId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1327,7 +1277,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNextAsyncId()).compareTo(other.isSetNextAsyncId());
+    lastComparison = java.lang.Boolean.valueOf(isSetNextAsyncId()).compareTo(other.isSetNextAsyncId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1337,7 +1287,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAsyncSequence()).compareTo(other.isSetAsyncSequence());
+    lastComparison = java.lang.Boolean.valueOf(isSetAsyncSequence()).compareTo(other.isSetAsyncSequence());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1355,16 +1305,16 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TSpanEvent(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TSpanEvent(");
     boolean first = true;
 
     if (isSetSpanId()) {
@@ -1496,7 +1446,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1506,13 +1456,13 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
     }
   }
 
-  private static class TSpanEventStandardSchemeFactory implements SchemeFactory {
+  private static class TSpanEventStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanEventStandardScheme getScheme() {
       return new TSpanEventStandardScheme();
     }
   }
 
-  private static class TSpanEventStandardScheme extends StandardScheme<TSpanEvent> {
+  private static class TSpanEventStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSpanEvent> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSpanEvent struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1584,7 +1534,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.annotations = new ArrayList<TAnnotation>(_list0.size);
+                struct.annotations = new java.util.ArrayList<TAnnotation>(_list0.size);
                 TAnnotation _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
@@ -1774,18 +1724,18 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
 
   }
 
-  private static class TSpanEventTupleSchemeFactory implements SchemeFactory {
+  private static class TSpanEventTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSpanEventTupleScheme getScheme() {
       return new TSpanEventTupleScheme();
     }
   }
 
-  private static class TSpanEventTupleScheme extends TupleScheme<TSpanEvent> {
+  private static class TSpanEventTupleScheme extends org.apache.thrift.scheme.TupleScheme<TSpanEvent> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TSpanEvent struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSpanId()) {
         optionals.set(0);
       }
@@ -1893,8 +1843,8 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSpanEvent struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(16);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(16);
       if (incoming.get(0)) {
         struct.spanId = iprot.readI64();
         struct.setSpanIdIsSet(true);
@@ -1926,7 +1876,7 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
       if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.annotations = new ArrayList<TAnnotation>(_list5.size);
+          struct.annotations = new java.util.ArrayList<TAnnotation>(_list5.size);
           TAnnotation _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
           {
@@ -1973,5 +1923,8 @@ public class TSpanEvent implements org.apache.thrift.TBase<TSpanEvent, TSpanEven
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSqlMetaData.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSqlMetaData.java
index 3013ee6dc..965b1148c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSqlMetaData.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TSqlMetaData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlMetaData._Fields>, java.io.Serializable, Cloneable, Comparable<TSqlMetaData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSqlMetaData");
 
@@ -43,16 +16,13 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   private static final org.apache.thrift.protocol.TField SQL_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sqlId", org.apache.thrift.protocol.TType.I32, (short)4);
   private static final org.apache.thrift.protocol.TField SQL_FIELD_DESC = new org.apache.thrift.protocol.TField("sql", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TSqlMetaDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TSqlMetaDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TSqlMetaDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TSqlMetaDataTupleSchemeFactory();
 
-  private String agentId; // required
+  private java.lang.String agentId; // required
   private long agentStartTime; // required
   private int sqlId; // required
-  private String sql; // required
+  private java.lang.String sql; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     SQL_ID((short)4, "sqlId"),
     SQL((short)5, "sql");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +63,21 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +86,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -125,9 +95,9 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   private static final int __AGENTSTARTTIME_ISSET_ID = 0;
   private static final int __SQLID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.AGENT_START_TIME, new org.apache.thrift.meta_data.FieldMetaData("agentStartTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -136,7 +106,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.SQL, new org.apache.thrift.meta_data.FieldMetaData("sql", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TSqlMetaData.class, metaDataMap);
   }
 
@@ -144,10 +114,10 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   }
 
   public TSqlMetaData(
-    String agentId,
+    java.lang.String agentId,
     long agentStartTime,
     int sqlId,
-    String sql)
+    java.lang.String sql)
   {
     this();
     this.agentId = agentId;
@@ -187,11 +157,11 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     this.sql = null;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -220,16 +190,16 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   }
 
   public void unsetAgentStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   /** Returns true if field agentStartTime is set (has been assigned a value) and false otherwise */
   public boolean isSetAgentStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   public void setAgentStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
   }
 
   public int getSqlId() {
@@ -242,23 +212,23 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   }
 
   public void unsetSqlId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SQLID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SQLID_ISSET_ID);
   }
 
   /** Returns true if field sqlId is set (has been assigned a value) and false otherwise */
   public boolean isSetSqlId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SQLID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SQLID_ISSET_ID);
   }
 
   public void setSqlIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SQLID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SQLID_ISSET_ID, value);
   }
 
-  public String getSql() {
+  public java.lang.String getSql() {
     return this.sql;
   }
 
-  public void setSql(String sql) {
+  public void setSql(java.lang.String sql) {
     this.sql = sql;
   }
 
@@ -277,13 +247,13 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -291,7 +261,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
       if (value == null) {
         unsetAgentStartTime();
       } else {
-        setAgentStartTime((Long)value);
+        setAgentStartTime((java.lang.Long)value);
       }
       break;
 
@@ -299,7 +269,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
       if (value == null) {
         unsetSqlId();
       } else {
-        setSqlId((Integer)value);
+        setSqlId((java.lang.Integer)value);
       }
       break;
 
@@ -307,35 +277,35 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
       if (value == null) {
         unsetSql();
       } else {
-        setSql((String)value);
+        setSql((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
 
     case AGENT_START_TIME:
-      return Long.valueOf(getAgentStartTime());
+      return getAgentStartTime();
 
     case SQL_ID:
-      return Integer.valueOf(getSqlId());
+      return getSqlId();
 
     case SQL:
       return getSql();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -348,11 +318,11 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     case SQL:
       return isSetSql();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TSqlMetaData)
@@ -363,6 +333,8 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   public boolean equals(TSqlMetaData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -405,29 +377,21 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_agentStartTime = true;
-    list.add(present_agentStartTime);
-    if (present_agentStartTime)
-      list.add(agentStartTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(agentStartTime);
 
-    boolean present_sqlId = true;
-    list.add(present_sqlId);
-    if (present_sqlId)
-      list.add(sqlId);
+    hashCode = hashCode * 8191 + sqlId;
 
-    boolean present_sql = true && (isSetSql());
-    list.add(present_sql);
-    if (present_sql)
-      list.add(sql);
+    hashCode = hashCode * 8191 + ((isSetSql()) ? 131071 : 524287);
+    if (isSetSql())
+      hashCode = hashCode * 8191 + sql.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -438,7 +402,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +412,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -458,7 +422,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSqlId()).compareTo(other.isSetSqlId());
+    lastComparison = java.lang.Boolean.valueOf(isSetSqlId()).compareTo(other.isSetSqlId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -468,7 +432,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSql()).compareTo(other.isSetSql());
+    lastComparison = java.lang.Boolean.valueOf(isSetSql()).compareTo(other.isSetSql());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -486,16 +450,16 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TSqlMetaData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TSqlMetaData(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -538,7 +502,7 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -548,13 +512,13 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     }
   }
 
-  private static class TSqlMetaDataStandardSchemeFactory implements SchemeFactory {
+  private static class TSqlMetaDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSqlMetaDataStandardScheme getScheme() {
       return new TSqlMetaDataStandardScheme();
     }
   }
 
-  private static class TSqlMetaDataStandardScheme extends StandardScheme<TSqlMetaData> {
+  private static class TSqlMetaDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSqlMetaData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSqlMetaData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -633,18 +597,18 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
 
   }
 
-  private static class TSqlMetaDataTupleSchemeFactory implements SchemeFactory {
+  private static class TSqlMetaDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TSqlMetaDataTupleScheme getScheme() {
       return new TSqlMetaDataTupleScheme();
     }
   }
 
-  private static class TSqlMetaDataTupleScheme extends TupleScheme<TSqlMetaData> {
+  private static class TSqlMetaDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<TSqlMetaData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TSqlMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -674,8 +638,8 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSqlMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -695,5 +659,8 @@ public class TSqlMetaData implements org.apache.thrift.TBase<TSqlMetaData, TSqlM
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TStringMetaData.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TStringMetaData.java
index 596b96b3a..a8c53da4c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TStringMetaData.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TStringMetaData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData, TStringMetaData._Fields>, java.io.Serializable, Cloneable, Comparable<TStringMetaData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStringMetaData");
 
@@ -43,16 +16,13 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   private static final org.apache.thrift.protocol.TField STRING_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("stringId", org.apache.thrift.protocol.TType.I32, (short)4);
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TStringMetaDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TStringMetaDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TStringMetaDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TStringMetaDataTupleSchemeFactory();
 
-  private String agentId; // required
+  private java.lang.String agentId; // required
   private long agentStartTime; // required
   private int stringId; // required
-  private String stringValue; // required
+  private java.lang.String stringValue; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     STRING_ID((short)4, "stringId"),
     STRING_VALUE((short)5, "stringValue");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +63,21 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +86,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -125,9 +95,9 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   private static final int __AGENTSTARTTIME_ISSET_ID = 0;
   private static final int __STRINGID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.AGENT_START_TIME, new org.apache.thrift.meta_data.FieldMetaData("agentStartTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -136,7 +106,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TStringMetaData.class, metaDataMap);
   }
 
@@ -144,10 +114,10 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   }
 
   public TStringMetaData(
-    String agentId,
+    java.lang.String agentId,
     long agentStartTime,
     int stringId,
-    String stringValue)
+    java.lang.String stringValue)
   {
     this();
     this.agentId = agentId;
@@ -187,11 +157,11 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     this.stringValue = null;
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -220,16 +190,16 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   }
 
   public void unsetAgentStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   /** Returns true if field agentStartTime is set (has been assigned a value) and false otherwise */
   public boolean isSetAgentStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID);
   }
 
   public void setAgentStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGENTSTARTTIME_ISSET_ID, value);
   }
 
   public int getStringId() {
@@ -242,23 +212,23 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   }
 
   public void unsetStringId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STRINGID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STRINGID_ISSET_ID);
   }
 
   /** Returns true if field stringId is set (has been assigned a value) and false otherwise */
   public boolean isSetStringId() {
-    return EncodingUtils.testBit(__isset_bitfield, __STRINGID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STRINGID_ISSET_ID);
   }
 
   public void setStringIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STRINGID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STRINGID_ISSET_ID, value);
   }
 
-  public String getStringValue() {
+  public java.lang.String getStringValue() {
     return this.stringValue;
   }
 
-  public void setStringValue(String stringValue) {
+  public void setStringValue(java.lang.String stringValue) {
     this.stringValue = stringValue;
   }
 
@@ -277,13 +247,13 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AGENT_ID:
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -291,7 +261,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
       if (value == null) {
         unsetAgentStartTime();
       } else {
-        setAgentStartTime((Long)value);
+        setAgentStartTime((java.lang.Long)value);
       }
       break;
 
@@ -299,7 +269,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
       if (value == null) {
         unsetStringId();
       } else {
-        setStringId((Integer)value);
+        setStringId((java.lang.Integer)value);
       }
       break;
 
@@ -307,35 +277,35 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
       if (value == null) {
         unsetStringValue();
       } else {
-        setStringValue((String)value);
+        setStringValue((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AGENT_ID:
       return getAgentId();
 
     case AGENT_START_TIME:
-      return Long.valueOf(getAgentStartTime());
+      return getAgentStartTime();
 
     case STRING_ID:
-      return Integer.valueOf(getStringId());
+      return getStringId();
 
     case STRING_VALUE:
       return getStringValue();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -348,11 +318,11 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     case STRING_VALUE:
       return isSetStringValue();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TStringMetaData)
@@ -363,6 +333,8 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   public boolean equals(TStringMetaData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_agentId = true && this.isSetAgentId();
     boolean that_present_agentId = true && that.isSetAgentId();
@@ -405,29 +377,21 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_agentStartTime = true;
-    list.add(present_agentStartTime);
-    if (present_agentStartTime)
-      list.add(agentStartTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(agentStartTime);
 
-    boolean present_stringId = true;
-    list.add(present_stringId);
-    if (present_stringId)
-      list.add(stringId);
+    hashCode = hashCode * 8191 + stringId;
 
-    boolean present_stringValue = true && (isSetStringValue());
-    list.add(present_stringValue);
-    if (present_stringValue)
-      list.add(stringValue);
+    hashCode = hashCode * 8191 + ((isSetStringValue()) ? 131071 : 524287);
+    if (isSetStringValue())
+      hashCode = hashCode * 8191 + stringValue.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -438,7 +402,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +412,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentStartTime()).compareTo(other.isSetAgentStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -458,7 +422,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStringId()).compareTo(other.isSetStringId());
+    lastComparison = java.lang.Boolean.valueOf(isSetStringId()).compareTo(other.isSetStringId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -468,7 +432,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStringValue()).compareTo(other.isSetStringValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetStringValue()).compareTo(other.isSetStringValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -486,16 +450,16 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TStringMetaData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TStringMetaData(");
     boolean first = true;
 
     sb.append("agentId:");
@@ -538,7 +502,7 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -548,13 +512,13 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     }
   }
 
-  private static class TStringMetaDataStandardSchemeFactory implements SchemeFactory {
+  private static class TStringMetaDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TStringMetaDataStandardScheme getScheme() {
       return new TStringMetaDataStandardScheme();
     }
   }
 
-  private static class TStringMetaDataStandardScheme extends StandardScheme<TStringMetaData> {
+  private static class TStringMetaDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<TStringMetaData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TStringMetaData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -633,18 +597,18 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
 
   }
 
-  private static class TStringMetaDataTupleSchemeFactory implements SchemeFactory {
+  private static class TStringMetaDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TStringMetaDataTupleScheme getScheme() {
       return new TStringMetaDataTupleScheme();
     }
   }
 
-  private static class TStringMetaDataTupleScheme extends TupleScheme<TStringMetaData> {
+  private static class TStringMetaDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<TStringMetaData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TStringMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAgentId()) {
         optionals.set(0);
       }
@@ -674,8 +638,8 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStringMetaData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.agentId = iprot.readString();
         struct.setAgentIdIsSet(true);
@@ -695,5 +659,8 @@ public class TStringMetaData implements org.apache.thrift.TBase<TStringMetaData,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java
index 0ca3744eb..1fb6361b8 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-29")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTransaction._Fields>, java.io.Serializable, Cloneable, Comparable<TTransaction> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransaction");
 
@@ -43,11 +16,8 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   private static final org.apache.thrift.protocol.TField UNSAMPLED_NEW_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("unsampledNewCount", org.apache.thrift.protocol.TType.I64, (short)4);
   private static final org.apache.thrift.protocol.TField UNSAMPLED_CONTINUATION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("unsampledContinuationCount", org.apache.thrift.protocol.TType.I64, (short)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TTransactionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TTransactionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TTransactionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TTransactionTupleSchemeFactory();
 
   private long sampledNewCount; // optional
   private long sampledContinuationCount; // optional
@@ -61,10 +31,10 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
     UNSAMPLED_NEW_COUNT((short)4, "unsampledNewCount"),
     UNSAMPLED_CONTINUATION_COUNT((short)5, "unsampledContinuationCount");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +63,21 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +86,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -128,9 +98,9 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   private static final int __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.SAMPLED_NEW_COUNT,_Fields.SAMPLED_CONTINUATION_COUNT,_Fields.UNSAMPLED_NEW_COUNT,_Fields.UNSAMPLED_CONTINUATION_COUNT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SAMPLED_NEW_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sampledNewCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.SAMPLED_CONTINUATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sampledContinuationCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -139,7 +109,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.UNSAMPLED_CONTINUATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("unsampledContinuationCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTransaction.class, metaDataMap);
   }
 
@@ -183,16 +153,16 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   }
 
   public void unsetSampledNewCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID);
   }
 
   /** Returns true if field sampledNewCount is set (has been assigned a value) and false otherwise */
   public boolean isSetSampledNewCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID);
   }
 
   public void setSampledNewCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLEDNEWCOUNT_ISSET_ID, value);
   }
 
   public long getSampledContinuationCount() {
@@ -205,16 +175,16 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   }
 
   public void unsetSampledContinuationCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID);
   }
 
   /** Returns true if field sampledContinuationCount is set (has been assigned a value) and false otherwise */
   public boolean isSetSampledContinuationCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID);
   }
 
   public void setSampledContinuationCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLEDCONTINUATIONCOUNT_ISSET_ID, value);
   }
 
   public long getUnsampledNewCount() {
@@ -227,16 +197,16 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   }
 
   public void unsetUnsampledNewCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID);
   }
 
   /** Returns true if field unsampledNewCount is set (has been assigned a value) and false otherwise */
   public boolean isSetUnsampledNewCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID);
   }
 
   public void setUnsampledNewCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UNSAMPLEDNEWCOUNT_ISSET_ID, value);
   }
 
   public long getUnsampledContinuationCount() {
@@ -249,25 +219,25 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   }
 
   public void unsetUnsampledContinuationCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID);
   }
 
   /** Returns true if field unsampledContinuationCount is set (has been assigned a value) and false otherwise */
   public boolean isSetUnsampledContinuationCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID);
   }
 
   public void setUnsampledContinuationCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UNSAMPLEDCONTINUATIONCOUNT_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SAMPLED_NEW_COUNT:
       if (value == null) {
         unsetSampledNewCount();
       } else {
-        setSampledNewCount((Long)value);
+        setSampledNewCount((java.lang.Long)value);
       }
       break;
 
@@ -275,7 +245,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
       if (value == null) {
         unsetSampledContinuationCount();
       } else {
-        setSampledContinuationCount((Long)value);
+        setSampledContinuationCount((java.lang.Long)value);
       }
       break;
 
@@ -283,7 +253,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
       if (value == null) {
         unsetUnsampledNewCount();
       } else {
-        setUnsampledNewCount((Long)value);
+        setUnsampledNewCount((java.lang.Long)value);
       }
       break;
 
@@ -291,35 +261,35 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
       if (value == null) {
         unsetUnsampledContinuationCount();
       } else {
-        setUnsampledContinuationCount((Long)value);
+        setUnsampledContinuationCount((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SAMPLED_NEW_COUNT:
-      return Long.valueOf(getSampledNewCount());
+      return getSampledNewCount();
 
     case SAMPLED_CONTINUATION_COUNT:
-      return Long.valueOf(getSampledContinuationCount());
+      return getSampledContinuationCount();
 
     case UNSAMPLED_NEW_COUNT:
-      return Long.valueOf(getUnsampledNewCount());
+      return getUnsampledNewCount();
 
     case UNSAMPLED_CONTINUATION_COUNT:
-      return Long.valueOf(getUnsampledContinuationCount());
+      return getUnsampledContinuationCount();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -332,11 +302,11 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
     case UNSAMPLED_CONTINUATION_COUNT:
       return isSetUnsampledContinuationCount();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TTransaction)
@@ -347,6 +317,8 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   public boolean equals(TTransaction that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_sampledNewCount = true && this.isSetSampledNewCount();
     boolean that_present_sampledNewCount = true && that.isSetSampledNewCount();
@@ -389,29 +361,25 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_sampledNewCount = true && (isSetSampledNewCount());
-    list.add(present_sampledNewCount);
-    if (present_sampledNewCount)
-      list.add(sampledNewCount);
+    hashCode = hashCode * 8191 + ((isSetSampledNewCount()) ? 131071 : 524287);
+    if (isSetSampledNewCount())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(sampledNewCount);
 
-    boolean present_sampledContinuationCount = true && (isSetSampledContinuationCount());
-    list.add(present_sampledContinuationCount);
-    if (present_sampledContinuationCount)
-      list.add(sampledContinuationCount);
+    hashCode = hashCode * 8191 + ((isSetSampledContinuationCount()) ? 131071 : 524287);
+    if (isSetSampledContinuationCount())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(sampledContinuationCount);
 
-    boolean present_unsampledNewCount = true && (isSetUnsampledNewCount());
-    list.add(present_unsampledNewCount);
-    if (present_unsampledNewCount)
-      list.add(unsampledNewCount);
+    hashCode = hashCode * 8191 + ((isSetUnsampledNewCount()) ? 131071 : 524287);
+    if (isSetUnsampledNewCount())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(unsampledNewCount);
 
-    boolean present_unsampledContinuationCount = true && (isSetUnsampledContinuationCount());
-    list.add(present_unsampledContinuationCount);
-    if (present_unsampledContinuationCount)
-      list.add(unsampledContinuationCount);
+    hashCode = hashCode * 8191 + ((isSetUnsampledContinuationCount()) ? 131071 : 524287);
+    if (isSetUnsampledContinuationCount())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(unsampledContinuationCount);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -422,7 +390,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSampledNewCount()).compareTo(other.isSetSampledNewCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetSampledNewCount()).compareTo(other.isSetSampledNewCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -432,7 +400,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSampledContinuationCount()).compareTo(other.isSetSampledContinuationCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetSampledContinuationCount()).compareTo(other.isSetSampledContinuationCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -442,7 +410,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnsampledNewCount()).compareTo(other.isSetUnsampledNewCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetUnsampledNewCount()).compareTo(other.isSetUnsampledNewCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,7 +420,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnsampledContinuationCount()).compareTo(other.isSetUnsampledContinuationCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetUnsampledContinuationCount()).compareTo(other.isSetUnsampledContinuationCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -470,16 +438,16 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TTransaction(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TTransaction(");
     boolean first = true;
 
     if (isSetSampledNewCount()) {
@@ -522,7 +490,7 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -532,13 +500,13 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
     }
   }
 
-  private static class TTransactionStandardSchemeFactory implements SchemeFactory {
+  private static class TTransactionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TTransactionStandardScheme getScheme() {
       return new TTransactionStandardScheme();
     }
   }
 
-  private static class TTransactionStandardScheme extends StandardScheme<TTransaction> {
+  private static class TTransactionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TTransaction> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TTransaction struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -621,18 +589,18 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
 
   }
 
-  private static class TTransactionTupleSchemeFactory implements SchemeFactory {
+  private static class TTransactionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TTransactionTupleScheme getScheme() {
       return new TTransactionTupleScheme();
     }
   }
 
-  private static class TTransactionTupleScheme extends TupleScheme<TTransaction> {
+  private static class TTransactionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TTransaction> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TTransaction struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSampledNewCount()) {
         optionals.set(0);
       }
@@ -662,8 +630,8 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TTransaction struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.sampledNewCount = iprot.readI64();
         struct.setSampledNewCountIsSet(true);
@@ -683,5 +651,8 @@ public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTran
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadDump.java
index 223498068..b55d1bf7a 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadDump.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadDump, TActiveThreadDump._Fields>, java.io.Serializable, Cloneable, Comparable<TActiveThreadDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TActiveThreadDump");
 
@@ -35,18 +18,15 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   private static final org.apache.thrift.protocol.TField TRANSACTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("transactionId", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField ENTRY_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("entryPoint", org.apache.thrift.protocol.TType.STRING, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TActiveThreadDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TActiveThreadDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TActiveThreadDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TActiveThreadDumpTupleSchemeFactory();
 
   private long startTime; // required
   private long localTraceId; // required
   private TThreadDump threadDump; // required
   private boolean sampled; // required
-  private String transactionId; // optional
-  private String entryPoint; // optional
+  private java.lang.String transactionId; // optional
+  private java.lang.String entryPoint; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -57,10 +37,10 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     TRANSACTION_ID((short)5, "transactionId"),
     ENTRY_POINT((short)6, "entryPoint");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +73,21 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +96,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -127,9 +107,9 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   private static final int __SAMPLED_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TRANSACTION_ID,_Fields.ENTRY_POINT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.START_TIME, new org.apache.thrift.meta_data.FieldMetaData("startTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.LOCAL_TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("localTraceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -142,7 +122,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ENTRY_POINT, new org.apache.thrift.meta_data.FieldMetaData("entryPoint", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TActiveThreadDump.class, metaDataMap);
   }
 
@@ -213,16 +193,16 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public long getLocalTraceId() {
@@ -235,16 +215,16 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   }
 
   public void unsetLocalTraceId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
   }
 
   /** Returns true if field localTraceId is set (has been assigned a value) and false otherwise */
   public boolean isSetLocalTraceId() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
   }
 
   public void setLocalTraceIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID, value);
   }
 
   public TThreadDump getThreadDump() {
@@ -280,23 +260,23 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   }
 
   public void unsetSampled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAMPLED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLED_ISSET_ID);
   }
 
   /** Returns true if field sampled is set (has been assigned a value) and false otherwise */
   public boolean isSetSampled() {
-    return EncodingUtils.testBit(__isset_bitfield, __SAMPLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLED_ISSET_ID);
   }
 
   public void setSampledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAMPLED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLED_ISSET_ID, value);
   }
 
-  public String getTransactionId() {
+  public java.lang.String getTransactionId() {
     return this.transactionId;
   }
 
-  public void setTransactionId(String transactionId) {
+  public void setTransactionId(java.lang.String transactionId) {
     this.transactionId = transactionId;
   }
 
@@ -315,11 +295,11 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     }
   }
 
-  public String getEntryPoint() {
+  public java.lang.String getEntryPoint() {
     return this.entryPoint;
   }
 
-  public void setEntryPoint(String entryPoint) {
+  public void setEntryPoint(java.lang.String entryPoint) {
     this.entryPoint = entryPoint;
   }
 
@@ -338,13 +318,13 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case START_TIME:
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -352,7 +332,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       if (value == null) {
         unsetLocalTraceId();
       } else {
-        setLocalTraceId((Long)value);
+        setLocalTraceId((java.lang.Long)value);
       }
       break;
 
@@ -368,7 +348,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       if (value == null) {
         unsetSampled();
       } else {
-        setSampled((Boolean)value);
+        setSampled((java.lang.Boolean)value);
       }
       break;
 
@@ -376,7 +356,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       if (value == null) {
         unsetTransactionId();
       } else {
-        setTransactionId((String)value);
+        setTransactionId((java.lang.String)value);
       }
       break;
 
@@ -384,26 +364,26 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       if (value == null) {
         unsetEntryPoint();
       } else {
-        setEntryPoint((String)value);
+        setEntryPoint((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case LOCAL_TRACE_ID:
-      return Long.valueOf(getLocalTraceId());
+      return getLocalTraceId();
 
     case THREAD_DUMP:
       return getThreadDump();
 
     case SAMPLED:
-      return Boolean.valueOf(isSampled());
+      return isSampled();
 
     case TRANSACTION_ID:
       return getTransactionId();
@@ -412,13 +392,13 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
       return getEntryPoint();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -435,11 +415,11 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     case ENTRY_POINT:
       return isSetEntryPoint();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TActiveThreadDump)
@@ -450,6 +430,8 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   public boolean equals(TActiveThreadDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_startTime = true;
     boolean that_present_startTime = true;
@@ -510,39 +492,27 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
 
-    boolean present_localTraceId = true;
-    list.add(present_localTraceId);
-    if (present_localTraceId)
-      list.add(localTraceId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(localTraceId);
 
-    boolean present_threadDump = true && (isSetThreadDump());
-    list.add(present_threadDump);
-    if (present_threadDump)
-      list.add(threadDump);
+    hashCode = hashCode * 8191 + ((isSetThreadDump()) ? 131071 : 524287);
+    if (isSetThreadDump())
+      hashCode = hashCode * 8191 + threadDump.hashCode();
 
-    boolean present_sampled = true;
-    list.add(present_sampled);
-    if (present_sampled)
-      list.add(sampled);
+    hashCode = hashCode * 8191 + ((sampled) ? 131071 : 524287);
 
-    boolean present_transactionId = true && (isSetTransactionId());
-    list.add(present_transactionId);
-    if (present_transactionId)
-      list.add(transactionId);
+    hashCode = hashCode * 8191 + ((isSetTransactionId()) ? 131071 : 524287);
+    if (isSetTransactionId())
+      hashCode = hashCode * 8191 + transactionId.hashCode();
 
-    boolean present_entryPoint = true && (isSetEntryPoint());
-    list.add(present_entryPoint);
-    if (present_entryPoint)
-      list.add(entryPoint);
+    hashCode = hashCode * 8191 + ((isSetEntryPoint()) ? 131071 : 524287);
+    if (isSetEntryPoint())
+      hashCode = hashCode * 8191 + entryPoint.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -553,7 +523,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -563,7 +533,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocalTraceId()).compareTo(other.isSetLocalTraceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetLocalTraceId()).compareTo(other.isSetLocalTraceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -573,7 +543,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadDump()).compareTo(other.isSetThreadDump());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadDump()).compareTo(other.isSetThreadDump());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -583,7 +553,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSampled()).compareTo(other.isSetSampled());
+    lastComparison = java.lang.Boolean.valueOf(isSetSampled()).compareTo(other.isSetSampled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -593,7 +563,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
+    lastComparison = java.lang.Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -603,7 +573,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEntryPoint()).compareTo(other.isSetEntryPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetEntryPoint()).compareTo(other.isSetEntryPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -621,16 +591,16 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TActiveThreadDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TActiveThreadDump(");
     boolean first = true;
 
     sb.append("startTime:");
@@ -692,7 +662,7 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -702,13 +672,13 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     }
   }
 
-  private static class TActiveThreadDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TActiveThreadDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveThreadDumpStandardScheme getScheme() {
       return new TActiveThreadDumpStandardScheme();
     }
   }
 
-  private static class TActiveThreadDumpStandardScheme extends StandardScheme<TActiveThreadDump> {
+  private static class TActiveThreadDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TActiveThreadDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TActiveThreadDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -816,18 +786,18 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
 
   }
 
-  private static class TActiveThreadDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TActiveThreadDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveThreadDumpTupleScheme getScheme() {
       return new TActiveThreadDumpTupleScheme();
     }
   }
 
-  private static class TActiveThreadDumpTupleScheme extends TupleScheme<TActiveThreadDump> {
+  private static class TActiveThreadDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TActiveThreadDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TActiveThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetStartTime()) {
         optionals.set(0);
       }
@@ -869,8 +839,8 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TActiveThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.startTime = iprot.readI64();
         struct.setStartTimeIsSet(true);
@@ -899,5 +869,8 @@ public class TActiveThreadDump implements org.apache.thrift.TBase<TActiveThreadD
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadLightDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadLightDump.java
index 4275646e8..c1b433e2c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadLightDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TActiveThreadLightDump.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveThreadLightDump, TActiveThreadLightDump._Fields>, java.io.Serializable, Cloneable, Comparable<TActiveThreadLightDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TActiveThreadLightDump");
 
@@ -35,18 +18,15 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   private static final org.apache.thrift.protocol.TField TRANSACTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("transactionId", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField ENTRY_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("entryPoint", org.apache.thrift.protocol.TType.STRING, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TActiveThreadLightDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TActiveThreadLightDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TActiveThreadLightDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TActiveThreadLightDumpTupleSchemeFactory();
 
   private long startTime; // required
   private long localTraceId; // required
   private TThreadLightDump threadDump; // required
   private boolean sampled; // required
-  private String transactionId; // optional
-  private String entryPoint; // optional
+  private java.lang.String transactionId; // optional
+  private java.lang.String entryPoint; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -57,10 +37,10 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     TRANSACTION_ID((short)5, "transactionId"),
     ENTRY_POINT((short)6, "entryPoint");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +73,21 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +96,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -127,9 +107,9 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   private static final int __SAMPLED_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TRANSACTION_ID,_Fields.ENTRY_POINT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.START_TIME, new org.apache.thrift.meta_data.FieldMetaData("startTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.LOCAL_TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("localTraceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -142,7 +122,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ENTRY_POINT, new org.apache.thrift.meta_data.FieldMetaData("entryPoint", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TActiveThreadLightDump.class, metaDataMap);
   }
 
@@ -213,16 +193,16 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public long getLocalTraceId() {
@@ -235,16 +215,16 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   }
 
   public void unsetLocalTraceId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
   }
 
   /** Returns true if field localTraceId is set (has been assigned a value) and false otherwise */
   public boolean isSetLocalTraceId() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID);
   }
 
   public void setLocalTraceIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCALTRACEID_ISSET_ID, value);
   }
 
   public TThreadLightDump getThreadDump() {
@@ -280,23 +260,23 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   }
 
   public void unsetSampled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAMPLED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLED_ISSET_ID);
   }
 
   /** Returns true if field sampled is set (has been assigned a value) and false otherwise */
   public boolean isSetSampled() {
-    return EncodingUtils.testBit(__isset_bitfield, __SAMPLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLED_ISSET_ID);
   }
 
   public void setSampledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAMPLED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLED_ISSET_ID, value);
   }
 
-  public String getTransactionId() {
+  public java.lang.String getTransactionId() {
     return this.transactionId;
   }
 
-  public void setTransactionId(String transactionId) {
+  public void setTransactionId(java.lang.String transactionId) {
     this.transactionId = transactionId;
   }
 
@@ -315,11 +295,11 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     }
   }
 
-  public String getEntryPoint() {
+  public java.lang.String getEntryPoint() {
     return this.entryPoint;
   }
 
-  public void setEntryPoint(String entryPoint) {
+  public void setEntryPoint(java.lang.String entryPoint) {
     this.entryPoint = entryPoint;
   }
 
@@ -338,13 +318,13 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case START_TIME:
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -352,7 +332,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       if (value == null) {
         unsetLocalTraceId();
       } else {
-        setLocalTraceId((Long)value);
+        setLocalTraceId((java.lang.Long)value);
       }
       break;
 
@@ -368,7 +348,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       if (value == null) {
         unsetSampled();
       } else {
-        setSampled((Boolean)value);
+        setSampled((java.lang.Boolean)value);
       }
       break;
 
@@ -376,7 +356,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       if (value == null) {
         unsetTransactionId();
       } else {
-        setTransactionId((String)value);
+        setTransactionId((java.lang.String)value);
       }
       break;
 
@@ -384,26 +364,26 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       if (value == null) {
         unsetEntryPoint();
       } else {
-        setEntryPoint((String)value);
+        setEntryPoint((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case LOCAL_TRACE_ID:
-      return Long.valueOf(getLocalTraceId());
+      return getLocalTraceId();
 
     case THREAD_DUMP:
       return getThreadDump();
 
     case SAMPLED:
-      return Boolean.valueOf(isSampled());
+      return isSampled();
 
     case TRANSACTION_ID:
       return getTransactionId();
@@ -412,13 +392,13 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
       return getEntryPoint();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -435,11 +415,11 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     case ENTRY_POINT:
       return isSetEntryPoint();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TActiveThreadLightDump)
@@ -450,6 +430,8 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   public boolean equals(TActiveThreadLightDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_startTime = true;
     boolean that_present_startTime = true;
@@ -510,39 +492,27 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
 
-    boolean present_localTraceId = true;
-    list.add(present_localTraceId);
-    if (present_localTraceId)
-      list.add(localTraceId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(localTraceId);
 
-    boolean present_threadDump = true && (isSetThreadDump());
-    list.add(present_threadDump);
-    if (present_threadDump)
-      list.add(threadDump);
+    hashCode = hashCode * 8191 + ((isSetThreadDump()) ? 131071 : 524287);
+    if (isSetThreadDump())
+      hashCode = hashCode * 8191 + threadDump.hashCode();
 
-    boolean present_sampled = true;
-    list.add(present_sampled);
-    if (present_sampled)
-      list.add(sampled);
+    hashCode = hashCode * 8191 + ((sampled) ? 131071 : 524287);
 
-    boolean present_transactionId = true && (isSetTransactionId());
-    list.add(present_transactionId);
-    if (present_transactionId)
-      list.add(transactionId);
+    hashCode = hashCode * 8191 + ((isSetTransactionId()) ? 131071 : 524287);
+    if (isSetTransactionId())
+      hashCode = hashCode * 8191 + transactionId.hashCode();
 
-    boolean present_entryPoint = true && (isSetEntryPoint());
-    list.add(present_entryPoint);
-    if (present_entryPoint)
-      list.add(entryPoint);
+    hashCode = hashCode * 8191 + ((isSetEntryPoint()) ? 131071 : 524287);
+    if (isSetEntryPoint())
+      hashCode = hashCode * 8191 + entryPoint.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -553,7 +523,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -563,7 +533,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocalTraceId()).compareTo(other.isSetLocalTraceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetLocalTraceId()).compareTo(other.isSetLocalTraceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -573,7 +543,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadDump()).compareTo(other.isSetThreadDump());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadDump()).compareTo(other.isSetThreadDump());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -583,7 +553,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSampled()).compareTo(other.isSetSampled());
+    lastComparison = java.lang.Boolean.valueOf(isSetSampled()).compareTo(other.isSetSampled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -593,7 +563,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
+    lastComparison = java.lang.Boolean.valueOf(isSetTransactionId()).compareTo(other.isSetTransactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -603,7 +573,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEntryPoint()).compareTo(other.isSetEntryPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetEntryPoint()).compareTo(other.isSetEntryPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -621,16 +591,16 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TActiveThreadLightDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TActiveThreadLightDump(");
     boolean first = true;
 
     sb.append("startTime:");
@@ -692,7 +662,7 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -702,13 +672,13 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     }
   }
 
-  private static class TActiveThreadLightDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TActiveThreadLightDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveThreadLightDumpStandardScheme getScheme() {
       return new TActiveThreadLightDumpStandardScheme();
     }
   }
 
-  private static class TActiveThreadLightDumpStandardScheme extends StandardScheme<TActiveThreadLightDump> {
+  private static class TActiveThreadLightDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TActiveThreadLightDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TActiveThreadLightDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -816,18 +786,18 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
 
   }
 
-  private static class TActiveThreadLightDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TActiveThreadLightDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TActiveThreadLightDumpTupleScheme getScheme() {
       return new TActiveThreadLightDumpTupleScheme();
     }
   }
 
-  private static class TActiveThreadLightDumpTupleScheme extends TupleScheme<TActiveThreadLightDump> {
+  private static class TActiveThreadLightDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TActiveThreadLightDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TActiveThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetStartTime()) {
         optionals.set(0);
       }
@@ -869,8 +839,8 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TActiveThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.startTime = iprot.readI64();
         struct.setStartTimeIsSet(true);
@@ -899,5 +869,8 @@ public class TActiveThreadLightDump implements org.apache.thrift.TBase<TActiveTh
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCount.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCount.java
index 43d2bdaaa..b70623f79 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCount.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCount.java
@@ -1,59 +1,29 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActiveThreadCount, TCmdActiveThreadCount._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadCount> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadCount");
 
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadCountStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadCountTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadCountStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadCountTupleSchemeFactory();
 
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -74,21 +44,21 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -97,14 +67,14 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadCount.class, metaDataMap);
   }
 
@@ -125,30 +95,30 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
   public void clear() {
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadCount)
@@ -159,15 +129,17 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
   public boolean equals(TCmdActiveThreadCount that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     return true;
   }
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -186,16 +158,16 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadCount(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadCount(");
     boolean first = true;
 
     sb.append(")");
@@ -215,7 +187,7 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -223,13 +195,13 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
     }
   }
 
-  private static class TCmdActiveThreadCountStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadCountStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadCountStandardScheme getScheme() {
       return new TCmdActiveThreadCountStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadCountStandardScheme extends StandardScheme<TCmdActiveThreadCount> {
+  private static class TCmdActiveThreadCountStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadCount> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadCount struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -260,24 +232,27 @@ public class TCmdActiveThreadCount implements org.apache.thrift.TBase<TCmdActive
 
   }
 
-  private static class TCmdActiveThreadCountTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadCountTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadCountTupleScheme getScheme() {
       return new TCmdActiveThreadCountTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadCountTupleScheme extends TupleScheme<TCmdActiveThreadCount> {
+  private static class TCmdActiveThreadCountTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadCount> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadCount struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadCount struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCountRes.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCountRes.java
index 133be8f53..4118678a7 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCountRes.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadCountRes.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-10")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdActiveThreadCountRes, TCmdActiveThreadCountRes._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadCountRes> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadCountRes");
 
@@ -42,14 +15,11 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   private static final org.apache.thrift.protocol.TField ACTIVE_THREAD_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("activeThreadCount", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timeStamp", org.apache.thrift.protocol.TType.I64, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadCountResStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadCountResTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadCountResStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadCountResTupleSchemeFactory();
 
   private int histogramSchemaType; // required
-  private List<Integer> activeThreadCount; // required
+  private java.util.List<java.lang.Integer> activeThreadCount; // required
   private long timeStamp; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -58,10 +28,10 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     ACTIVE_THREAD_COUNT((short)2, "activeThreadCount"),
     TIME_STAMP((short)3, "timeStamp");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -88,21 +58,21 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +81,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -121,9 +91,9 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   private static final int __TIMESTAMP_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TIME_STAMP};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.HISTOGRAM_SCHEMA_TYPE, new org.apache.thrift.meta_data.FieldMetaData("histogramSchemaType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.ACTIVE_THREAD_COUNT, new org.apache.thrift.meta_data.FieldMetaData("activeThreadCount", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -131,7 +101,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
     tmpMap.put(_Fields.TIME_STAMP, new org.apache.thrift.meta_data.FieldMetaData("timeStamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadCountRes.class, metaDataMap);
   }
 
@@ -140,7 +110,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
 
   public TCmdActiveThreadCountRes(
     int histogramSchemaType,
-    List<Integer> activeThreadCount)
+    java.util.List<java.lang.Integer> activeThreadCount)
   {
     this();
     this.histogramSchemaType = histogramSchemaType;
@@ -155,7 +125,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     __isset_bitfield = other.__isset_bitfield;
     this.histogramSchemaType = other.histogramSchemaType;
     if (other.isSetActiveThreadCount()) {
-      List<Integer> __this__activeThreadCount = new ArrayList<Integer>(other.activeThreadCount);
+      java.util.List<java.lang.Integer> __this__activeThreadCount = new java.util.ArrayList<java.lang.Integer>(other.activeThreadCount);
       this.activeThreadCount = __this__activeThreadCount;
     }
     this.timeStamp = other.timeStamp;
@@ -184,38 +154,38 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   }
 
   public void unsetHistogramSchemaType() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
   }
 
   /** Returns true if field histogramSchemaType is set (has been assigned a value) and false otherwise */
   public boolean isSetHistogramSchemaType() {
-    return EncodingUtils.testBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID);
   }
 
   public void setHistogramSchemaTypeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HISTOGRAMSCHEMATYPE_ISSET_ID, value);
   }
 
   public int getActiveThreadCountSize() {
     return (this.activeThreadCount == null) ? 0 : this.activeThreadCount.size();
   }
 
-  public java.util.Iterator<Integer> getActiveThreadCountIterator() {
+  public java.util.Iterator<java.lang.Integer> getActiveThreadCountIterator() {
     return (this.activeThreadCount == null) ? null : this.activeThreadCount.iterator();
   }
 
   public void addToActiveThreadCount(int elem) {
     if (this.activeThreadCount == null) {
-      this.activeThreadCount = new ArrayList<Integer>();
+      this.activeThreadCount = new java.util.ArrayList<java.lang.Integer>();
     }
     this.activeThreadCount.add(elem);
   }
 
-  public List<Integer> getActiveThreadCount() {
+  public java.util.List<java.lang.Integer> getActiveThreadCount() {
     return this.activeThreadCount;
   }
 
-  public void setActiveThreadCount(List<Integer> activeThreadCount) {
+  public void setActiveThreadCount(java.util.List<java.lang.Integer> activeThreadCount) {
     this.activeThreadCount = activeThreadCount;
   }
 
@@ -244,25 +214,25 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   }
 
   public void unsetTimeStamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field timeStamp is set (has been assigned a value) and false otherwise */
   public boolean isSetTimeStamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   public void setTimeStampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case HISTOGRAM_SCHEMA_TYPE:
       if (value == null) {
         unsetHistogramSchemaType();
       } else {
-        setHistogramSchemaType((Integer)value);
+        setHistogramSchemaType((java.lang.Integer)value);
       }
       break;
 
@@ -270,7 +240,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
       if (value == null) {
         unsetActiveThreadCount();
       } else {
-        setActiveThreadCount((List<Integer>)value);
+        setActiveThreadCount((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -278,32 +248,32 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
       if (value == null) {
         unsetTimeStamp();
       } else {
-        setTimeStamp((Long)value);
+        setTimeStamp((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case HISTOGRAM_SCHEMA_TYPE:
-      return Integer.valueOf(getHistogramSchemaType());
+      return getHistogramSchemaType();
 
     case ACTIVE_THREAD_COUNT:
       return getActiveThreadCount();
 
     case TIME_STAMP:
-      return Long.valueOf(getTimeStamp());
+      return getTimeStamp();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -314,11 +284,11 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     case TIME_STAMP:
       return isSetTimeStamp();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadCountRes)
@@ -329,6 +299,8 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   public boolean equals(TCmdActiveThreadCountRes that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_histogramSchemaType = true;
     boolean that_present_histogramSchemaType = true;
@@ -362,24 +334,19 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_histogramSchemaType = true;
-    list.add(present_histogramSchemaType);
-    if (present_histogramSchemaType)
-      list.add(histogramSchemaType);
+    hashCode = hashCode * 8191 + histogramSchemaType;
 
-    boolean present_activeThreadCount = true && (isSetActiveThreadCount());
-    list.add(present_activeThreadCount);
-    if (present_activeThreadCount)
-      list.add(activeThreadCount);
+    hashCode = hashCode * 8191 + ((isSetActiveThreadCount()) ? 131071 : 524287);
+    if (isSetActiveThreadCount())
+      hashCode = hashCode * 8191 + activeThreadCount.hashCode();
 
-    boolean present_timeStamp = true && (isSetTimeStamp());
-    list.add(present_timeStamp);
-    if (present_timeStamp)
-      list.add(timeStamp);
+    hashCode = hashCode * 8191 + ((isSetTimeStamp()) ? 131071 : 524287);
+    if (isSetTimeStamp())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timeStamp);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -390,7 +357,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetHistogramSchemaType()).compareTo(other.isSetHistogramSchemaType());
+    lastComparison = java.lang.Boolean.valueOf(isSetHistogramSchemaType()).compareTo(other.isSetHistogramSchemaType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -400,7 +367,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetActiveThreadCount()).compareTo(other.isSetActiveThreadCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetActiveThreadCount()).compareTo(other.isSetActiveThreadCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -410,7 +377,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimeStamp()).compareTo(other.isSetTimeStamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetTimeStamp()).compareTo(other.isSetTimeStamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -428,16 +395,16 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadCountRes(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadCountRes(");
     boolean first = true;
 
     sb.append("histogramSchemaType:");
@@ -474,7 +441,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -484,13 +451,13 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     }
   }
 
-  private static class TCmdActiveThreadCountResStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadCountResStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadCountResStandardScheme getScheme() {
       return new TCmdActiveThreadCountResStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadCountResStandardScheme extends StandardScheme<TCmdActiveThreadCountRes> {
+  private static class TCmdActiveThreadCountResStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadCountRes> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadCountRes struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -514,7 +481,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
-                struct.activeThreadCount = new ArrayList<Integer>(_list32.size);
+                struct.activeThreadCount = new java.util.ArrayList<java.lang.Integer>(_list32.size);
                 int _elem33;
                 for (int _i34 = 0; _i34 < _list32.size; ++_i34)
                 {
@@ -575,18 +542,18 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
 
   }
 
-  private static class TCmdActiveThreadCountResTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadCountResTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadCountResTupleScheme getScheme() {
       return new TCmdActiveThreadCountResTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadCountResTupleScheme extends TupleScheme<TCmdActiveThreadCountRes> {
+  private static class TCmdActiveThreadCountResTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadCountRes> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadCountRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetHistogramSchemaType()) {
         optionals.set(0);
       }
@@ -616,8 +583,8 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadCountRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.histogramSchemaType = iprot.readI32();
         struct.setHistogramSchemaTypeIsSet(true);
@@ -625,7 +592,7 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.activeThreadCount = new ArrayList<Integer>(_list37.size);
+          struct.activeThreadCount = new java.util.ArrayList<java.lang.Integer>(_list37.size);
           int _elem38;
           for (int _i39 = 0; _i39 < _list37.size; ++_i39)
           {
@@ -642,5 +609,8 @@ public class TCmdActiveThreadCountRes implements org.apache.thrift.TBase<TCmdAct
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDump.java
index 8288dbca7..6c46948d4 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDump.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveThreadDump, TCmdActiveThreadDump._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadDump");
 
@@ -32,15 +15,12 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
   private static final org.apache.thrift.protocol.TField THREAD_NAME_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("threadNameList", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField LOCAL_TRACE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("localTraceIdList", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadDumpTupleSchemeFactory();
 
   private int limit; // optional
-  private List<String> threadNameList; // optional
-  private List<Long> localTraceIdList; // optional
+  private java.util.List<java.lang.String> threadNameList; // optional
+  private java.util.List<java.lang.Long> localTraceIdList; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -48,10 +28,10 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     THREAD_NAME_LIST((short)2, "threadNameList"),
     LOCAL_TRACE_ID_LIST((short)3, "localTraceIdList");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,21 +58,21 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,7 +81,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -110,9 +90,9 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
   private static final int __LIMIT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.LIMIT,_Fields.THREAD_NAME_LIST,_Fields.LOCAL_TRACE_ID_LIST};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.THREAD_NAME_LIST, new org.apache.thrift.meta_data.FieldMetaData("threadNameList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -121,7 +101,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     tmpMap.put(_Fields.LOCAL_TRACE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("localTraceIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadDump.class, metaDataMap);
   }
 
@@ -135,11 +115,11 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     __isset_bitfield = other.__isset_bitfield;
     this.limit = other.limit;
     if (other.isSetThreadNameList()) {
-      List<String> __this__threadNameList = new ArrayList<String>(other.threadNameList);
+      java.util.List<java.lang.String> __this__threadNameList = new java.util.ArrayList<java.lang.String>(other.threadNameList);
       this.threadNameList = __this__threadNameList;
     }
     if (other.isSetLocalTraceIdList()) {
-      List<Long> __this__localTraceIdList = new ArrayList<Long>(other.localTraceIdList);
+      java.util.List<java.lang.Long> __this__localTraceIdList = new java.util.ArrayList<java.lang.Long>(other.localTraceIdList);
       this.localTraceIdList = __this__localTraceIdList;
     }
   }
@@ -166,38 +146,38 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
   }
 
   public void unsetLimit() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMIT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMIT_ISSET_ID);
   }
 
   /** Returns true if field limit is set (has been assigned a value) and false otherwise */
   public boolean isSetLimit() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMIT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMIT_ISSET_ID);
   }
 
   public void setLimitIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMIT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMIT_ISSET_ID, value);
   }
 
   public int getThreadNameListSize() {
     return (this.threadNameList == null) ? 0 : this.threadNameList.size();
   }
 
-  public java.util.Iterator<String> getThreadNameListIterator() {
+  public java.util.Iterator<java.lang.String> getThreadNameListIterator() {
     return (this.threadNameList == null) ? null : this.threadNameList.iterator();
   }
 
-  public void addToThreadNameList(String elem) {
+  public void addToThreadNameList(java.lang.String elem) {
     if (this.threadNameList == null) {
-      this.threadNameList = new ArrayList<String>();
+      this.threadNameList = new java.util.ArrayList<java.lang.String>();
     }
     this.threadNameList.add(elem);
   }
 
-  public List<String> getThreadNameList() {
+  public java.util.List<java.lang.String> getThreadNameList() {
     return this.threadNameList;
   }
 
-  public void setThreadNameList(List<String> threadNameList) {
+  public void setThreadNameList(java.util.List<java.lang.String> threadNameList) {
     this.threadNameList = threadNameList;
   }
 
@@ -220,22 +200,22 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     return (this.localTraceIdList == null) ? 0 : this.localTraceIdList.size();
   }
 
-  public java.util.Iterator<Long> getLocalTraceIdListIterator() {
+  public java.util.Iterator<java.lang.Long> getLocalTraceIdListIterator() {
     return (this.localTraceIdList == null) ? null : this.localTraceIdList.iterator();
   }
 
   public void addToLocalTraceIdList(long elem) {
     if (this.localTraceIdList == null) {
-      this.localTraceIdList = new ArrayList<Long>();
+      this.localTraceIdList = new java.util.ArrayList<java.lang.Long>();
     }
     this.localTraceIdList.add(elem);
   }
 
-  public List<Long> getLocalTraceIdList() {
+  public java.util.List<java.lang.Long> getLocalTraceIdList() {
     return this.localTraceIdList;
   }
 
-  public void setLocalTraceIdList(List<Long> localTraceIdList) {
+  public void setLocalTraceIdList(java.util.List<java.lang.Long> localTraceIdList) {
     this.localTraceIdList = localTraceIdList;
   }
 
@@ -254,13 +234,13 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case LIMIT:
       if (value == null) {
         unsetLimit();
       } else {
-        setLimit((Integer)value);
+        setLimit((java.lang.Integer)value);
       }
       break;
 
@@ -268,7 +248,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       if (value == null) {
         unsetThreadNameList();
       } else {
-        setThreadNameList((List<String>)value);
+        setThreadNameList((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -276,17 +256,17 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       if (value == null) {
         unsetLocalTraceIdList();
       } else {
-        setLocalTraceIdList((List<Long>)value);
+        setLocalTraceIdList((java.util.List<java.lang.Long>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LIMIT:
-      return Integer.valueOf(getLimit());
+      return getLimit();
 
     case THREAD_NAME_LIST:
       return getThreadNameList();
@@ -295,13 +275,13 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       return getLocalTraceIdList();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -312,11 +292,11 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     case LOCAL_TRACE_ID_LIST:
       return isSetLocalTraceIdList();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadDump)
@@ -327,6 +307,8 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
   public boolean equals(TCmdActiveThreadDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_limit = true && this.isSetLimit();
     boolean that_present_limit = true && that.isSetLimit();
@@ -360,24 +342,21 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_limit = true && (isSetLimit());
-    list.add(present_limit);
-    if (present_limit)
-      list.add(limit);
+    hashCode = hashCode * 8191 + ((isSetLimit()) ? 131071 : 524287);
+    if (isSetLimit())
+      hashCode = hashCode * 8191 + limit;
 
-    boolean present_threadNameList = true && (isSetThreadNameList());
-    list.add(present_threadNameList);
-    if (present_threadNameList)
-      list.add(threadNameList);
+    hashCode = hashCode * 8191 + ((isSetThreadNameList()) ? 131071 : 524287);
+    if (isSetThreadNameList())
+      hashCode = hashCode * 8191 + threadNameList.hashCode();
 
-    boolean present_localTraceIdList = true && (isSetLocalTraceIdList());
-    list.add(present_localTraceIdList);
-    if (present_localTraceIdList)
-      list.add(localTraceIdList);
+    hashCode = hashCode * 8191 + ((isSetLocalTraceIdList()) ? 131071 : 524287);
+    if (isSetLocalTraceIdList())
+      hashCode = hashCode * 8191 + localTraceIdList.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -388,7 +367,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit());
+    lastComparison = java.lang.Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +377,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadNameList()).compareTo(other.isSetThreadNameList());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadNameList()).compareTo(other.isSetThreadNameList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -408,7 +387,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocalTraceIdList()).compareTo(other.isSetLocalTraceIdList());
+    lastComparison = java.lang.Boolean.valueOf(isSetLocalTraceIdList()).compareTo(other.isSetLocalTraceIdList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -426,16 +405,16 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadDump(");
     boolean first = true;
 
     if (isSetLimit()) {
@@ -480,7 +459,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -490,13 +469,13 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     }
   }
 
-  private static class TCmdActiveThreadDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadDumpStandardScheme getScheme() {
       return new TCmdActiveThreadDumpStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadDumpStandardScheme extends StandardScheme<TCmdActiveThreadDump> {
+  private static class TCmdActiveThreadDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -520,8 +499,8 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list40 = iprot.readListBegin();
-                struct.threadNameList = new ArrayList<String>(_list40.size);
-                String _elem41;
+                struct.threadNameList = new java.util.ArrayList<java.lang.String>(_list40.size);
+                java.lang.String _elem41;
                 for (int _i42 = 0; _i42 < _list40.size; ++_i42)
                 {
                   _elem41 = iprot.readString();
@@ -538,7 +517,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list43 = iprot.readListBegin();
-                struct.localTraceIdList = new ArrayList<Long>(_list43.size);
+                struct.localTraceIdList = new java.util.ArrayList<java.lang.Long>(_list43.size);
                 long _elem44;
                 for (int _i45 = 0; _i45 < _list43.size; ++_i45)
                 {
@@ -575,7 +554,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
           oprot.writeFieldBegin(THREAD_NAME_LIST_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.threadNameList.size()));
-            for (String _iter46 : struct.threadNameList)
+            for (java.lang.String _iter46 : struct.threadNameList)
             {
               oprot.writeString(_iter46);
             }
@@ -604,18 +583,18 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
 
   }
 
-  private static class TCmdActiveThreadDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadDumpTupleScheme getScheme() {
       return new TCmdActiveThreadDumpTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadDumpTupleScheme extends TupleScheme<TCmdActiveThreadDump> {
+  private static class TCmdActiveThreadDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLimit()) {
         optionals.set(0);
       }
@@ -632,7 +611,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       if (struct.isSetThreadNameList()) {
         {
           oprot.writeI32(struct.threadNameList.size());
-          for (String _iter48 : struct.threadNameList)
+          for (java.lang.String _iter48 : struct.threadNameList)
           {
             oprot.writeString(_iter48);
           }
@@ -651,8 +630,8 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.limit = iprot.readI32();
         struct.setLimitIsSet(true);
@@ -660,8 +639,8 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list50 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.threadNameList = new ArrayList<String>(_list50.size);
-          String _elem51;
+          struct.threadNameList = new java.util.ArrayList<java.lang.String>(_list50.size);
+          java.lang.String _elem51;
           for (int _i52 = 0; _i52 < _list50.size; ++_i52)
           {
             _elem51 = iprot.readString();
@@ -673,7 +652,7 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-          struct.localTraceIdList = new ArrayList<Long>(_list53.size);
+          struct.localTraceIdList = new java.util.ArrayList<java.lang.Long>(_list53.size);
           long _elem54;
           for (int _i55 = 0; _i55 < _list53.size; ++_i55)
           {
@@ -686,5 +665,8 @@ public class TCmdActiveThreadDump implements org.apache.thrift.TBase<TCmdActiveT
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDumpRes.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDumpRes.java
index 005dd71ba..c10f8e5ec 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDumpRes.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadDumpRes.java
@@ -1,29 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-12-29")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActiveThreadDumpRes, TCmdActiveThreadDumpRes._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadDumpRes> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadDumpRes");
 
@@ -32,16 +16,13 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
   private static final org.apache.thrift.protocol.TField SUB_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("subType", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadDumpResStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadDumpResTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadDumpResStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadDumpResTupleSchemeFactory();
 
-  private List<TActiveThreadDump> threadDumps; // required
-  private String type; // optional
-  private String subType; // optional
-  private String version; // optional
+  private java.util.List<TActiveThreadDump> threadDumps; // required
+  private java.lang.String type; // optional
+  private java.lang.String subType; // optional
+  private java.lang.String version; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -50,10 +31,10 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     SUB_TYPE((short)3, "subType"),
     VERSION((short)4, "version");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -82,21 +63,21 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -105,16 +86,16 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.TYPE,_Fields.SUB_TYPE,_Fields.VERSION};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.THREAD_DUMPS, new org.apache.thrift.meta_data.FieldMetaData("threadDumps", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TActiveThreadDump.class))));
@@ -124,7 +105,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadDumpRes.class, metaDataMap);
   }
 
@@ -132,7 +113,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
   }
 
   public TCmdActiveThreadDumpRes(
-    List<TActiveThreadDump> threadDumps)
+    java.util.List<TActiveThreadDump> threadDumps)
   {
     this();
     this.threadDumps = threadDumps;
@@ -143,7 +124,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
    */
   public TCmdActiveThreadDumpRes(TCmdActiveThreadDumpRes other) {
     if (other.isSetThreadDumps()) {
-      List<TActiveThreadDump> __this__threadDumps = new ArrayList<TActiveThreadDump>(other.threadDumps.size());
+      java.util.List<TActiveThreadDump> __this__threadDumps = new java.util.ArrayList<TActiveThreadDump>(other.threadDumps.size());
       for (TActiveThreadDump other_element : other.threadDumps) {
         __this__threadDumps.add(new TActiveThreadDump(other_element));
       }
@@ -182,16 +163,16 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
 
   public void addToThreadDumps(TActiveThreadDump elem) {
     if (this.threadDumps == null) {
-      this.threadDumps = new ArrayList<TActiveThreadDump>();
+      this.threadDumps = new java.util.ArrayList<TActiveThreadDump>();
     }
     this.threadDumps.add(elem);
   }
 
-  public List<TActiveThreadDump> getThreadDumps() {
+  public java.util.List<TActiveThreadDump> getThreadDumps() {
     return this.threadDumps;
   }
 
-  public void setThreadDumps(List<TActiveThreadDump> threadDumps) {
+  public void setThreadDumps(java.util.List<TActiveThreadDump> threadDumps) {
     this.threadDumps = threadDumps;
   }
 
@@ -210,11 +191,11 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  public String getType() {
+  public java.lang.String getType() {
     return this.type;
   }
 
-  public void setType(String type) {
+  public void setType(java.lang.String type) {
     this.type = type;
   }
 
@@ -233,11 +214,11 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  public String getSubType() {
+  public java.lang.String getSubType() {
     return this.subType;
   }
 
-  public void setSubType(String subType) {
+  public void setSubType(java.lang.String subType) {
     this.subType = subType;
   }
 
@@ -256,11 +237,11 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  public String getVersion() {
+  public java.lang.String getVersion() {
     return this.version;
   }
 
-  public void setVersion(String version) {
+  public void setVersion(java.lang.String version) {
     this.version = version;
   }
 
@@ -279,13 +260,13 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case THREAD_DUMPS:
       if (value == null) {
         unsetThreadDumps();
       } else {
-        setThreadDumps((List<TActiveThreadDump>)value);
+        setThreadDumps((java.util.List<TActiveThreadDump>)value);
       }
       break;
 
@@ -293,7 +274,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
       if (value == null) {
         unsetType();
       } else {
-        setType((String)value);
+        setType((java.lang.String)value);
       }
       break;
 
@@ -301,7 +282,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
       if (value == null) {
         unsetSubType();
       } else {
-        setSubType((String)value);
+        setSubType((java.lang.String)value);
       }
       break;
 
@@ -309,14 +290,14 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
       if (value == null) {
         unsetVersion();
       } else {
-        setVersion((String)value);
+        setVersion((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case THREAD_DUMPS:
       return getThreadDumps();
@@ -331,13 +312,13 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
       return getVersion();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -350,11 +331,11 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     case VERSION:
       return isSetVersion();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadDumpRes)
@@ -365,6 +346,8 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
   public boolean equals(TCmdActiveThreadDumpRes that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_threadDumps = true && this.isSetThreadDumps();
     boolean that_present_threadDumps = true && that.isSetThreadDumps();
@@ -407,29 +390,25 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_threadDumps = true && (isSetThreadDumps());
-    list.add(present_threadDumps);
-    if (present_threadDumps)
-      list.add(threadDumps);
+    hashCode = hashCode * 8191 + ((isSetThreadDumps()) ? 131071 : 524287);
+    if (isSetThreadDumps())
+      hashCode = hashCode * 8191 + threadDumps.hashCode();
 
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type);
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.hashCode();
 
-    boolean present_subType = true && (isSetSubType());
-    list.add(present_subType);
-    if (present_subType)
-      list.add(subType);
+    hashCode = hashCode * 8191 + ((isSetSubType()) ? 131071 : 524287);
+    if (isSetSubType())
+      hashCode = hashCode * 8191 + subType.hashCode();
 
-    boolean present_version = true && (isSetVersion());
-    list.add(present_version);
-    if (present_version)
-      list.add(version);
+    hashCode = hashCode * 8191 + ((isSetVersion()) ? 131071 : 524287);
+    if (isSetVersion())
+      hashCode = hashCode * 8191 + version.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -440,7 +419,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -450,7 +429,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -460,7 +439,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSubType()).compareTo(other.isSetSubType());
+    lastComparison = java.lang.Boolean.valueOf(isSetSubType()).compareTo(other.isSetSubType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -470,7 +449,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -488,16 +467,16 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadDumpRes(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadDumpRes(");
     boolean first = true;
 
     sb.append("threadDumps:");
@@ -554,7 +533,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -562,13 +541,13 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
-  private static class TCmdActiveThreadDumpResStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadDumpResStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadDumpResStandardScheme getScheme() {
       return new TCmdActiveThreadDumpResStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadDumpResStandardScheme extends StandardScheme<TCmdActiveThreadDumpRes> {
+  private static class TCmdActiveThreadDumpResStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadDumpRes> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadDumpRes struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -584,7 +563,7 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list72 = iprot.readListBegin();
-                struct.threadDumps = new ArrayList<TActiveThreadDump>(_list72.size);
+                struct.threadDumps = new java.util.ArrayList<TActiveThreadDump>(_list72.size);
                 TActiveThreadDump _elem73;
                 for (int _i74 = 0; _i74 < _list72.size; ++_i74)
                 {
@@ -675,18 +654,18 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
 
   }
 
-  private static class TCmdActiveThreadDumpResTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadDumpResTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadDumpResTupleScheme getScheme() {
       return new TCmdActiveThreadDumpResTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadDumpResTupleScheme extends TupleScheme<TCmdActiveThreadDumpRes> {
+  private static class TCmdActiveThreadDumpResTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadDumpRes> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadDumpRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetThreadDumps()) {
         optionals.set(0);
       }
@@ -722,12 +701,12 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadDumpRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list77 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.threadDumps = new ArrayList<TActiveThreadDump>(_list77.size);
+          struct.threadDumps = new java.util.ArrayList<TActiveThreadDump>(_list77.size);
           TActiveThreadDump _elem78;
           for (int _i79 = 0; _i79 < _list77.size; ++_i79)
           {
@@ -753,5 +732,8 @@ public class TCmdActiveThreadDumpRes implements org.apache.thrift.TBase<TCmdActi
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDump.java
index 834ad9d9e..d07611a73 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDump.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-1-2")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdActiveThreadLightDump, TCmdActiveThreadLightDump._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadLightDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadLightDump");
 
@@ -32,15 +15,12 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
   private static final org.apache.thrift.protocol.TField THREAD_NAME_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("threadNameList", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField LOCAL_TRACE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("localTraceIdList", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadLightDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadLightDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadLightDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadLightDumpTupleSchemeFactory();
 
   private int limit; // optional
-  private List<String> threadNameList; // optional
-  private List<Long> localTraceIdList; // optional
+  private java.util.List<java.lang.String> threadNameList; // optional
+  private java.util.List<java.lang.Long> localTraceIdList; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -48,10 +28,10 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     THREAD_NAME_LIST((short)2, "threadNameList"),
     LOCAL_TRACE_ID_LIST((short)3, "localTraceIdList");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,21 +58,21 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,7 +81,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -110,9 +90,9 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
   private static final int __LIMIT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.LIMIT,_Fields.THREAD_NAME_LIST,_Fields.LOCAL_TRACE_ID_LIST};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.THREAD_NAME_LIST, new org.apache.thrift.meta_data.FieldMetaData("threadNameList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -121,7 +101,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     tmpMap.put(_Fields.LOCAL_TRACE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("localTraceIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadLightDump.class, metaDataMap);
   }
 
@@ -135,11 +115,11 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     __isset_bitfield = other.__isset_bitfield;
     this.limit = other.limit;
     if (other.isSetThreadNameList()) {
-      List<String> __this__threadNameList = new ArrayList<String>(other.threadNameList);
+      java.util.List<java.lang.String> __this__threadNameList = new java.util.ArrayList<java.lang.String>(other.threadNameList);
       this.threadNameList = __this__threadNameList;
     }
     if (other.isSetLocalTraceIdList()) {
-      List<Long> __this__localTraceIdList = new ArrayList<Long>(other.localTraceIdList);
+      java.util.List<java.lang.Long> __this__localTraceIdList = new java.util.ArrayList<java.lang.Long>(other.localTraceIdList);
       this.localTraceIdList = __this__localTraceIdList;
     }
   }
@@ -166,38 +146,38 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
   }
 
   public void unsetLimit() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMIT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMIT_ISSET_ID);
   }
 
   /** Returns true if field limit is set (has been assigned a value) and false otherwise */
   public boolean isSetLimit() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMIT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMIT_ISSET_ID);
   }
 
   public void setLimitIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMIT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMIT_ISSET_ID, value);
   }
 
   public int getThreadNameListSize() {
     return (this.threadNameList == null) ? 0 : this.threadNameList.size();
   }
 
-  public java.util.Iterator<String> getThreadNameListIterator() {
+  public java.util.Iterator<java.lang.String> getThreadNameListIterator() {
     return (this.threadNameList == null) ? null : this.threadNameList.iterator();
   }
 
-  public void addToThreadNameList(String elem) {
+  public void addToThreadNameList(java.lang.String elem) {
     if (this.threadNameList == null) {
-      this.threadNameList = new ArrayList<String>();
+      this.threadNameList = new java.util.ArrayList<java.lang.String>();
     }
     this.threadNameList.add(elem);
   }
 
-  public List<String> getThreadNameList() {
+  public java.util.List<java.lang.String> getThreadNameList() {
     return this.threadNameList;
   }
 
-  public void setThreadNameList(List<String> threadNameList) {
+  public void setThreadNameList(java.util.List<java.lang.String> threadNameList) {
     this.threadNameList = threadNameList;
   }
 
@@ -220,22 +200,22 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     return (this.localTraceIdList == null) ? 0 : this.localTraceIdList.size();
   }
 
-  public java.util.Iterator<Long> getLocalTraceIdListIterator() {
+  public java.util.Iterator<java.lang.Long> getLocalTraceIdListIterator() {
     return (this.localTraceIdList == null) ? null : this.localTraceIdList.iterator();
   }
 
   public void addToLocalTraceIdList(long elem) {
     if (this.localTraceIdList == null) {
-      this.localTraceIdList = new ArrayList<Long>();
+      this.localTraceIdList = new java.util.ArrayList<java.lang.Long>();
     }
     this.localTraceIdList.add(elem);
   }
 
-  public List<Long> getLocalTraceIdList() {
+  public java.util.List<java.lang.Long> getLocalTraceIdList() {
     return this.localTraceIdList;
   }
 
-  public void setLocalTraceIdList(List<Long> localTraceIdList) {
+  public void setLocalTraceIdList(java.util.List<java.lang.Long> localTraceIdList) {
     this.localTraceIdList = localTraceIdList;
   }
 
@@ -254,13 +234,13 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case LIMIT:
       if (value == null) {
         unsetLimit();
       } else {
-        setLimit((Integer)value);
+        setLimit((java.lang.Integer)value);
       }
       break;
 
@@ -268,7 +248,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       if (value == null) {
         unsetThreadNameList();
       } else {
-        setThreadNameList((List<String>)value);
+        setThreadNameList((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -276,17 +256,17 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       if (value == null) {
         unsetLocalTraceIdList();
       } else {
-        setLocalTraceIdList((List<Long>)value);
+        setLocalTraceIdList((java.util.List<java.lang.Long>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LIMIT:
-      return Integer.valueOf(getLimit());
+      return getLimit();
 
     case THREAD_NAME_LIST:
       return getThreadNameList();
@@ -295,13 +275,13 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       return getLocalTraceIdList();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -312,11 +292,11 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     case LOCAL_TRACE_ID_LIST:
       return isSetLocalTraceIdList();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadLightDump)
@@ -327,6 +307,8 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
   public boolean equals(TCmdActiveThreadLightDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_limit = true && this.isSetLimit();
     boolean that_present_limit = true && that.isSetLimit();
@@ -360,24 +342,21 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_limit = true && (isSetLimit());
-    list.add(present_limit);
-    if (present_limit)
-      list.add(limit);
+    hashCode = hashCode * 8191 + ((isSetLimit()) ? 131071 : 524287);
+    if (isSetLimit())
+      hashCode = hashCode * 8191 + limit;
 
-    boolean present_threadNameList = true && (isSetThreadNameList());
-    list.add(present_threadNameList);
-    if (present_threadNameList)
-      list.add(threadNameList);
+    hashCode = hashCode * 8191 + ((isSetThreadNameList()) ? 131071 : 524287);
+    if (isSetThreadNameList())
+      hashCode = hashCode * 8191 + threadNameList.hashCode();
 
-    boolean present_localTraceIdList = true && (isSetLocalTraceIdList());
-    list.add(present_localTraceIdList);
-    if (present_localTraceIdList)
-      list.add(localTraceIdList);
+    hashCode = hashCode * 8191 + ((isSetLocalTraceIdList()) ? 131071 : 524287);
+    if (isSetLocalTraceIdList())
+      hashCode = hashCode * 8191 + localTraceIdList.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -388,7 +367,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit());
+    lastComparison = java.lang.Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +377,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadNameList()).compareTo(other.isSetThreadNameList());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadNameList()).compareTo(other.isSetThreadNameList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -408,7 +387,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocalTraceIdList()).compareTo(other.isSetLocalTraceIdList());
+    lastComparison = java.lang.Boolean.valueOf(isSetLocalTraceIdList()).compareTo(other.isSetLocalTraceIdList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -426,16 +405,16 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadLightDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadLightDump(");
     boolean first = true;
 
     if (isSetLimit()) {
@@ -480,7 +459,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -490,13 +469,13 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     }
   }
 
-  private static class TCmdActiveThreadLightDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadLightDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadLightDumpStandardScheme getScheme() {
       return new TCmdActiveThreadLightDumpStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadLightDumpStandardScheme extends StandardScheme<TCmdActiveThreadLightDump> {
+  private static class TCmdActiveThreadLightDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadLightDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadLightDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -520,8 +499,8 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
-                struct.threadNameList = new ArrayList<String>(_list56.size);
-                String _elem57;
+                struct.threadNameList = new java.util.ArrayList<java.lang.String>(_list56.size);
+                java.lang.String _elem57;
                 for (int _i58 = 0; _i58 < _list56.size; ++_i58)
                 {
                   _elem57 = iprot.readString();
@@ -538,7 +517,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list59 = iprot.readListBegin();
-                struct.localTraceIdList = new ArrayList<Long>(_list59.size);
+                struct.localTraceIdList = new java.util.ArrayList<java.lang.Long>(_list59.size);
                 long _elem60;
                 for (int _i61 = 0; _i61 < _list59.size; ++_i61)
                 {
@@ -575,7 +554,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
           oprot.writeFieldBegin(THREAD_NAME_LIST_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.threadNameList.size()));
-            for (String _iter62 : struct.threadNameList)
+            for (java.lang.String _iter62 : struct.threadNameList)
             {
               oprot.writeString(_iter62);
             }
@@ -604,18 +583,18 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
 
   }
 
-  private static class TCmdActiveThreadLightDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadLightDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadLightDumpTupleScheme getScheme() {
       return new TCmdActiveThreadLightDumpTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadLightDumpTupleScheme extends TupleScheme<TCmdActiveThreadLightDump> {
+  private static class TCmdActiveThreadLightDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadLightDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLimit()) {
         optionals.set(0);
       }
@@ -632,7 +611,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       if (struct.isSetThreadNameList()) {
         {
           oprot.writeI32(struct.threadNameList.size());
-          for (String _iter64 : struct.threadNameList)
+          for (java.lang.String _iter64 : struct.threadNameList)
           {
             oprot.writeString(_iter64);
           }
@@ -651,8 +630,8 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.limit = iprot.readI32();
         struct.setLimitIsSet(true);
@@ -660,8 +639,8 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list66 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.threadNameList = new ArrayList<String>(_list66.size);
-          String _elem67;
+          struct.threadNameList = new java.util.ArrayList<java.lang.String>(_list66.size);
+          java.lang.String _elem67;
           for (int _i68 = 0; _i68 < _list66.size; ++_i68)
           {
             _elem67 = iprot.readString();
@@ -673,7 +652,7 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list69 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-          struct.localTraceIdList = new ArrayList<Long>(_list69.size);
+          struct.localTraceIdList = new java.util.ArrayList<java.lang.Long>(_list69.size);
           long _elem70;
           for (int _i71 = 0; _i71 < _list69.size; ++_i71)
           {
@@ -686,5 +665,8 @@ public class TCmdActiveThreadLightDump implements org.apache.thrift.TBase<TCmdAc
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDumpRes.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDumpRes.java
index cf1a0368d..c2bceaa72 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDumpRes.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCmdActiveThreadLightDumpRes.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-12-29")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCmdActiveThreadLightDumpRes, TCmdActiveThreadLightDumpRes._Fields>, java.io.Serializable, Cloneable, Comparable<TCmdActiveThreadLightDumpRes> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCmdActiveThreadLightDumpRes");
 
@@ -43,16 +16,13 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
   private static final org.apache.thrift.protocol.TField SUB_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("subType", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCmdActiveThreadLightDumpResStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCmdActiveThreadLightDumpResTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCmdActiveThreadLightDumpResStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCmdActiveThreadLightDumpResTupleSchemeFactory();
 
-  private List<TActiveThreadLightDump> threadDumps; // required
-  private String type; // optional
-  private String subType; // optional
-  private String version; // optional
+  private java.util.List<TActiveThreadLightDump> threadDumps; // required
+  private java.lang.String type; // optional
+  private java.lang.String subType; // optional
+  private java.lang.String version; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     SUB_TYPE((short)3, "subType"),
     VERSION((short)4, "version");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +63,21 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,16 +86,16 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.TYPE,_Fields.SUB_TYPE,_Fields.VERSION};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.THREAD_DUMPS, new org.apache.thrift.meta_data.FieldMetaData("threadDumps", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TActiveThreadLightDump.class))));
@@ -135,7 +105,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCmdActiveThreadLightDumpRes.class, metaDataMap);
   }
 
@@ -143,7 +113,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
   }
 
   public TCmdActiveThreadLightDumpRes(
-    List<TActiveThreadLightDump> threadDumps)
+    java.util.List<TActiveThreadLightDump> threadDumps)
   {
     this();
     this.threadDumps = threadDumps;
@@ -154,7 +124,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
    */
   public TCmdActiveThreadLightDumpRes(TCmdActiveThreadLightDumpRes other) {
     if (other.isSetThreadDumps()) {
-      List<TActiveThreadLightDump> __this__threadDumps = new ArrayList<TActiveThreadLightDump>(other.threadDumps.size());
+      java.util.List<TActiveThreadLightDump> __this__threadDumps = new java.util.ArrayList<TActiveThreadLightDump>(other.threadDumps.size());
       for (TActiveThreadLightDump other_element : other.threadDumps) {
         __this__threadDumps.add(new TActiveThreadLightDump(other_element));
       }
@@ -193,16 +163,16 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
 
   public void addToThreadDumps(TActiveThreadLightDump elem) {
     if (this.threadDumps == null) {
-      this.threadDumps = new ArrayList<TActiveThreadLightDump>();
+      this.threadDumps = new java.util.ArrayList<TActiveThreadLightDump>();
     }
     this.threadDumps.add(elem);
   }
 
-  public List<TActiveThreadLightDump> getThreadDumps() {
+  public java.util.List<TActiveThreadLightDump> getThreadDumps() {
     return this.threadDumps;
   }
 
-  public void setThreadDumps(List<TActiveThreadLightDump> threadDumps) {
+  public void setThreadDumps(java.util.List<TActiveThreadLightDump> threadDumps) {
     this.threadDumps = threadDumps;
   }
 
@@ -221,11 +191,11 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  public String getType() {
+  public java.lang.String getType() {
     return this.type;
   }
 
-  public void setType(String type) {
+  public void setType(java.lang.String type) {
     this.type = type;
   }
 
@@ -244,11 +214,11 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  public String getSubType() {
+  public java.lang.String getSubType() {
     return this.subType;
   }
 
-  public void setSubType(String subType) {
+  public void setSubType(java.lang.String subType) {
     this.subType = subType;
   }
 
@@ -267,11 +237,11 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  public String getVersion() {
+  public java.lang.String getVersion() {
     return this.version;
   }
 
-  public void setVersion(String version) {
+  public void setVersion(java.lang.String version) {
     this.version = version;
   }
 
@@ -290,13 +260,13 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case THREAD_DUMPS:
       if (value == null) {
         unsetThreadDumps();
       } else {
-        setThreadDumps((List<TActiveThreadLightDump>)value);
+        setThreadDumps((java.util.List<TActiveThreadLightDump>)value);
       }
       break;
 
@@ -304,7 +274,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
       if (value == null) {
         unsetType();
       } else {
-        setType((String)value);
+        setType((java.lang.String)value);
       }
       break;
 
@@ -312,7 +282,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
       if (value == null) {
         unsetSubType();
       } else {
-        setSubType((String)value);
+        setSubType((java.lang.String)value);
       }
       break;
 
@@ -320,14 +290,14 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
       if (value == null) {
         unsetVersion();
       } else {
-        setVersion((String)value);
+        setVersion((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case THREAD_DUMPS:
       return getThreadDumps();
@@ -342,13 +312,13 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
       return getVersion();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -361,11 +331,11 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     case VERSION:
       return isSetVersion();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCmdActiveThreadLightDumpRes)
@@ -376,6 +346,8 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
   public boolean equals(TCmdActiveThreadLightDumpRes that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_threadDumps = true && this.isSetThreadDumps();
     boolean that_present_threadDumps = true && that.isSetThreadDumps();
@@ -418,29 +390,25 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_threadDumps = true && (isSetThreadDumps());
-    list.add(present_threadDumps);
-    if (present_threadDumps)
-      list.add(threadDumps);
+    hashCode = hashCode * 8191 + ((isSetThreadDumps()) ? 131071 : 524287);
+    if (isSetThreadDumps())
+      hashCode = hashCode * 8191 + threadDumps.hashCode();
 
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type);
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.hashCode();
 
-    boolean present_subType = true && (isSetSubType());
-    list.add(present_subType);
-    if (present_subType)
-      list.add(subType);
+    hashCode = hashCode * 8191 + ((isSetSubType()) ? 131071 : 524287);
+    if (isSetSubType())
+      hashCode = hashCode * 8191 + subType.hashCode();
 
-    boolean present_version = true && (isSetVersion());
-    list.add(present_version);
-    if (present_version)
-      list.add(version);
+    hashCode = hashCode * 8191 + ((isSetVersion()) ? 131071 : 524287);
+    if (isSetVersion())
+      hashCode = hashCode * 8191 + version.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -451,7 +419,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -461,7 +429,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -471,7 +439,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSubType()).compareTo(other.isSetSubType());
+    lastComparison = java.lang.Boolean.valueOf(isSetSubType()).compareTo(other.isSetSubType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -481,7 +449,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
+    lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -499,16 +467,16 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCmdActiveThreadLightDumpRes(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCmdActiveThreadLightDumpRes(");
     boolean first = true;
 
     sb.append("threadDumps:");
@@ -565,7 +533,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -573,13 +541,13 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
-  private static class TCmdActiveThreadLightDumpResStandardSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadLightDumpResStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadLightDumpResStandardScheme getScheme() {
       return new TCmdActiveThreadLightDumpResStandardScheme();
     }
   }
 
-  private static class TCmdActiveThreadLightDumpResStandardScheme extends StandardScheme<TCmdActiveThreadLightDumpRes> {
+  private static class TCmdActiveThreadLightDumpResStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCmdActiveThreadLightDumpRes> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCmdActiveThreadLightDumpRes struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -595,7 +563,7 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
-                struct.threadDumps = new ArrayList<TActiveThreadLightDump>(_list80.size);
+                struct.threadDumps = new java.util.ArrayList<TActiveThreadLightDump>(_list80.size);
                 TActiveThreadLightDump _elem81;
                 for (int _i82 = 0; _i82 < _list80.size; ++_i82)
                 {
@@ -686,18 +654,18 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
 
   }
 
-  private static class TCmdActiveThreadLightDumpResTupleSchemeFactory implements SchemeFactory {
+  private static class TCmdActiveThreadLightDumpResTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCmdActiveThreadLightDumpResTupleScheme getScheme() {
       return new TCmdActiveThreadLightDumpResTupleScheme();
     }
   }
 
-  private static class TCmdActiveThreadLightDumpResTupleScheme extends TupleScheme<TCmdActiveThreadLightDumpRes> {
+  private static class TCmdActiveThreadLightDumpResTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCmdActiveThreadLightDumpRes> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadLightDumpRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetThreadDumps()) {
         optionals.set(0);
       }
@@ -733,12 +701,12 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCmdActiveThreadLightDumpRes struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list85 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.threadDumps = new ArrayList<TActiveThreadLightDump>(_list85.size);
+          struct.threadDumps = new java.util.ArrayList<TActiveThreadLightDump>(_list85.size);
           TActiveThreadLightDump _elem86;
           for (int _i87 = 0; _i87 < _list85.size; ++_i87)
           {
@@ -764,5 +732,8 @@ public class TCmdActiveThreadLightDumpRes implements org.apache.thrift.TBase<TCm
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandEcho.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandEcho.java
index 9bfd260bd..7f31a3e70 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandEcho.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandEcho.java
@@ -1,61 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TCommandEcho._Fields>, java.io.Serializable, Cloneable, Comparable<TCommandEcho> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCommandEcho");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCommandEchoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCommandEchoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCommandEchoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCommandEchoTupleSchemeFactory();
 
-  private String message; // required
+  private java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     MESSAGE((short)1, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,21 +48,21 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,18 +71,18 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCommandEcho.class, metaDataMap);
   }
 
@@ -120,7 +90,7 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
   }
 
   public TCommandEcho(
-    String message)
+    java.lang.String message)
   {
     this();
     this.message = message;
@@ -144,11 +114,11 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
     this.message = null;
   }
 
-  public String getMessage() {
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(java.lang.String message) {
     this.message = message;
   }
 
@@ -167,43 +137,43 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case MESSAGE:
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCommandEcho)
@@ -214,6 +184,8 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
   public boolean equals(TCommandEcho that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_message = true && this.isSetMessage();
     boolean that_present_message = true && that.isSetMessage();
@@ -229,14 +201,13 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -247,7 +218,7 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -265,16 +236,16 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCommandEcho(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCommandEcho(");
     boolean first = true;
 
     sb.append("message:");
@@ -301,7 +272,7 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -309,13 +280,13 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
     }
   }
 
-  private static class TCommandEchoStandardSchemeFactory implements SchemeFactory {
+  private static class TCommandEchoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandEchoStandardScheme getScheme() {
       return new TCommandEchoStandardScheme();
     }
   }
 
-  private static class TCommandEchoStandardScheme extends StandardScheme<TCommandEcho> {
+  private static class TCommandEchoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCommandEcho> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCommandEcho struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -359,18 +330,18 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
 
   }
 
-  private static class TCommandEchoTupleSchemeFactory implements SchemeFactory {
+  private static class TCommandEchoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandEchoTupleScheme getScheme() {
       return new TCommandEchoTupleScheme();
     }
   }
 
-  private static class TCommandEchoTupleScheme extends TupleScheme<TCommandEcho> {
+  private static class TCommandEchoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCommandEcho> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCommandEcho struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetMessage()) {
         optionals.set(0);
       }
@@ -382,8 +353,8 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCommandEcho struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.message = iprot.readString();
         struct.setMessageIsSet(true);
@@ -391,5 +362,8 @@ public class TCommandEcho implements org.apache.thrift.TBase<TCommandEcho, TComm
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDump.java
index 325fe57be..d3f64646c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDump.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThreadDump, TCommandThreadDump._Fields>, java.io.Serializable, Cloneable, Comparable<TCommandThreadDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCommandThreadDump");
 
@@ -42,14 +15,11 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
   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)2);
   private static final org.apache.thrift.protocol.TField PENDING_TIME_MILLIS_FIELD_DESC = new org.apache.thrift.protocol.TField("pendingTimeMillis", org.apache.thrift.protocol.TType.I64, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCommandThreadDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCommandThreadDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCommandThreadDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCommandThreadDumpTupleSchemeFactory();
 
   private TThreadDumpType type; // required
-  private String name; // optional
+  private java.lang.String name; // optional
   private long pendingTimeMillis; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -62,10 +32,10 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     NAME((short)2, "name"),
     PENDING_TIME_MILLIS((short)3, "pendingTimeMillis");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -92,21 +62,21 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -115,7 +85,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -124,16 +94,16 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
   private static final int __PENDINGTIMEMILLIS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NAME,_Fields.PENDING_TIME_MILLIS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TThreadDumpType.class)));
     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PENDING_TIME_MILLIS, new org.apache.thrift.meta_data.FieldMetaData("pendingTimeMillis", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCommandThreadDump.class, metaDataMap);
   }
 
@@ -207,11 +177,11 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     }
   }
 
-  public String getName() {
+  public java.lang.String getName() {
     return this.name;
   }
 
-  public void setName(String name) {
+  public void setName(java.lang.String name) {
     this.name = name;
   }
 
@@ -240,19 +210,19 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
   }
 
   public void unsetPendingTimeMillis() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID);
   }
 
   /** Returns true if field pendingTimeMillis is set (has been assigned a value) and false otherwise */
   public boolean isSetPendingTimeMillis() {
-    return EncodingUtils.testBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID);
   }
 
   public void setPendingTimeMillisIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PENDINGTIMEMILLIS_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case TYPE:
       if (value == null) {
@@ -266,7 +236,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
       if (value == null) {
         unsetName();
       } else {
-        setName((String)value);
+        setName((java.lang.String)value);
       }
       break;
 
@@ -274,14 +244,14 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
       if (value == null) {
         unsetPendingTimeMillis();
       } else {
-        setPendingTimeMillis((Long)value);
+        setPendingTimeMillis((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
       return getType();
@@ -290,16 +260,16 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
       return getName();
 
     case PENDING_TIME_MILLIS:
-      return Long.valueOf(getPendingTimeMillis());
+      return getPendingTimeMillis();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -310,11 +280,11 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     case PENDING_TIME_MILLIS:
       return isSetPendingTimeMillis();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCommandThreadDump)
@@ -325,6 +295,8 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
   public boolean equals(TCommandThreadDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_type = true && this.isSetType();
     boolean that_present_type = true && that.isSetType();
@@ -358,24 +330,21 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type.getValue());
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.getValue();
 
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
 
-    boolean present_pendingTimeMillis = true && (isSetPendingTimeMillis());
-    list.add(present_pendingTimeMillis);
-    if (present_pendingTimeMillis)
-      list.add(pendingTimeMillis);
+    hashCode = hashCode * 8191 + ((isSetPendingTimeMillis()) ? 131071 : 524287);
+    if (isSetPendingTimeMillis())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(pendingTimeMillis);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -386,7 +355,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -396,7 +365,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -406,7 +375,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPendingTimeMillis()).compareTo(other.isSetPendingTimeMillis());
+    lastComparison = java.lang.Boolean.valueOf(isSetPendingTimeMillis()).compareTo(other.isSetPendingTimeMillis());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -424,16 +393,16 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCommandThreadDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCommandThreadDump(");
     boolean first = true;
 
     sb.append("type:");
@@ -476,7 +445,7 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -486,13 +455,13 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     }
   }
 
-  private static class TCommandThreadDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TCommandThreadDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandThreadDumpStandardScheme getScheme() {
       return new TCommandThreadDumpStandardScheme();
     }
   }
 
-  private static class TCommandThreadDumpStandardScheme extends StandardScheme<TCommandThreadDump> {
+  private static class TCommandThreadDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCommandThreadDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCommandThreadDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -564,18 +533,18 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
 
   }
 
-  private static class TCommandThreadDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TCommandThreadDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandThreadDumpTupleScheme getScheme() {
       return new TCommandThreadDumpTupleScheme();
     }
   }
 
-  private static class TCommandThreadDumpTupleScheme extends TupleScheme<TCommandThreadDump> {
+  private static class TCommandThreadDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCommandThreadDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCommandThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetType()) {
         optionals.set(0);
       }
@@ -599,8 +568,8 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCommandThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.type = com.navercorp.pinpoint.thrift.dto.command.TThreadDumpType.findByValue(iprot.readI32());
         struct.setTypeIsSet(true);
@@ -616,5 +585,8 @@ public class TCommandThreadDump implements org.apache.thrift.TBase<TCommandThrea
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDumpResponse.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDumpResponse.java
index 1a8876af2..6d94db2cb 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDumpResponse.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandThreadDumpResponse.java
@@ -1,61 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TCommandThreadDumpResponse, TCommandThreadDumpResponse._Fields>, java.io.Serializable, Cloneable, Comparable<TCommandThreadDumpResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCommandThreadDumpResponse");
 
   private static final org.apache.thrift.protocol.TField THREAD_DUMPS_FIELD_DESC = new org.apache.thrift.protocol.TField("threadDumps", org.apache.thrift.protocol.TType.LIST, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCommandThreadDumpResponseStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCommandThreadDumpResponseTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCommandThreadDumpResponseStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCommandThreadDumpResponseTupleSchemeFactory();
 
-  private List<TThreadDump> threadDumps; // required
+  private java.util.List<TThreadDump> threadDumps; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     THREAD_DUMPS((short)1, "threadDumps");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,21 +48,21 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,19 +71,19 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.THREAD_DUMPS, new org.apache.thrift.meta_data.FieldMetaData("threadDumps", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TThreadDump.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCommandThreadDumpResponse.class, metaDataMap);
   }
 
@@ -121,7 +91,7 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
   }
 
   public TCommandThreadDumpResponse(
-    List<TThreadDump> threadDumps)
+    java.util.List<TThreadDump> threadDumps)
   {
     this();
     this.threadDumps = threadDumps;
@@ -132,7 +102,7 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
    */
   public TCommandThreadDumpResponse(TCommandThreadDumpResponse other) {
     if (other.isSetThreadDumps()) {
-      List<TThreadDump> __this__threadDumps = new ArrayList<TThreadDump>(other.threadDumps.size());
+      java.util.List<TThreadDump> __this__threadDumps = new java.util.ArrayList<TThreadDump>(other.threadDumps.size());
       for (TThreadDump other_element : other.threadDumps) {
         __this__threadDumps.add(new TThreadDump(other_element));
       }
@@ -159,16 +129,16 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
 
   public void addToThreadDumps(TThreadDump elem) {
     if (this.threadDumps == null) {
-      this.threadDumps = new ArrayList<TThreadDump>();
+      this.threadDumps = new java.util.ArrayList<TThreadDump>();
     }
     this.threadDumps.add(elem);
   }
 
-  public List<TThreadDump> getThreadDumps() {
+  public java.util.List<TThreadDump> getThreadDumps() {
     return this.threadDumps;
   }
 
-  public void setThreadDumps(List<TThreadDump> threadDumps) {
+  public void setThreadDumps(java.util.List<TThreadDump> threadDumps) {
     this.threadDumps = threadDumps;
   }
 
@@ -187,43 +157,43 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case THREAD_DUMPS:
       if (value == null) {
         unsetThreadDumps();
       } else {
-        setThreadDumps((List<TThreadDump>)value);
+        setThreadDumps((java.util.List<TThreadDump>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case THREAD_DUMPS:
       return getThreadDumps();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case THREAD_DUMPS:
       return isSetThreadDumps();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCommandThreadDumpResponse)
@@ -234,6 +204,8 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
   public boolean equals(TCommandThreadDumpResponse that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_threadDumps = true && this.isSetThreadDumps();
     boolean that_present_threadDumps = true && that.isSetThreadDumps();
@@ -249,14 +221,13 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_threadDumps = true && (isSetThreadDumps());
-    list.add(present_threadDumps);
-    if (present_threadDumps)
-      list.add(threadDumps);
+    hashCode = hashCode * 8191 + ((isSetThreadDumps()) ? 131071 : 524287);
+    if (isSetThreadDumps())
+      hashCode = hashCode * 8191 + threadDumps.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -267,7 +238,7 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadDumps()).compareTo(other.isSetThreadDumps());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -285,16 +256,16 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCommandThreadDumpResponse(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCommandThreadDumpResponse(");
     boolean first = true;
 
     sb.append("threadDumps:");
@@ -321,7 +292,7 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -329,13 +300,13 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
     }
   }
 
-  private static class TCommandThreadDumpResponseStandardSchemeFactory implements SchemeFactory {
+  private static class TCommandThreadDumpResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandThreadDumpResponseStandardScheme getScheme() {
       return new TCommandThreadDumpResponseStandardScheme();
     }
   }
 
-  private static class TCommandThreadDumpResponseStandardScheme extends StandardScheme<TCommandThreadDumpResponse> {
+  private static class TCommandThreadDumpResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCommandThreadDumpResponse> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCommandThreadDumpResponse struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -351,7 +322,7 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
-                struct.threadDumps = new ArrayList<TThreadDump>(_list24.size);
+                struct.threadDumps = new java.util.ArrayList<TThreadDump>(_list24.size);
                 TThreadDump _elem25;
                 for (int _i26 = 0; _i26 < _list24.size; ++_i26)
                 {
@@ -397,18 +368,18 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
 
   }
 
-  private static class TCommandThreadDumpResponseTupleSchemeFactory implements SchemeFactory {
+  private static class TCommandThreadDumpResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandThreadDumpResponseTupleScheme getScheme() {
       return new TCommandThreadDumpResponseTupleScheme();
     }
   }
 
-  private static class TCommandThreadDumpResponseTupleScheme extends TupleScheme<TCommandThreadDumpResponse> {
+  private static class TCommandThreadDumpResponseTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCommandThreadDumpResponse> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCommandThreadDumpResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetThreadDumps()) {
         optionals.set(0);
       }
@@ -426,12 +397,12 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCommandThreadDumpResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.threadDumps = new ArrayList<TThreadDump>(_list29.size);
+          struct.threadDumps = new java.util.ArrayList<TThreadDump>(_list29.size);
           TThreadDump _elem30;
           for (int _i31 = 0; _i31 < _list29.size; ++_i31)
           {
@@ -445,5 +416,8 @@ public class TCommandThreadDumpResponse implements org.apache.thrift.TBase<TComm
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransfer.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransfer.java
index 25d2dcb9a..228073ce5 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransfer.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransfer.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfer, TCommandTransfer._Fields>, java.io.Serializable, Cloneable, Comparable<TCommandTransfer> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCommandTransfer");
 
@@ -43,16 +16,13 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   private static final org.apache.thrift.protocol.TField START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("startTime", org.apache.thrift.protocol.TType.I64, (short)3);
   private static final org.apache.thrift.protocol.TField PAYLOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("payload", org.apache.thrift.protocol.TType.STRING, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCommandTransferStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCommandTransferTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCommandTransferStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCommandTransferTupleSchemeFactory();
 
-  private String applicationName; // required
-  private String agentId; // required
+  private java.lang.String applicationName; // required
+  private java.lang.String agentId; // required
   private long startTime; // optional
-  private ByteBuffer payload; // required
+  private java.nio.ByteBuffer payload; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     START_TIME((short)3, "startTime"),
     PAYLOAD((short)4, "payload");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -93,21 +63,21 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +86,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -125,9 +95,9 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   private static final int __STARTTIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.START_TIME};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.APPLICATION_NAME, new org.apache.thrift.meta_data.FieldMetaData("applicationName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.AGENT_ID, new org.apache.thrift.meta_data.FieldMetaData("agentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -136,7 +106,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.PAYLOAD, new org.apache.thrift.meta_data.FieldMetaData("payload", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCommandTransfer.class, metaDataMap);
   }
 
@@ -144,9 +114,9 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   }
 
   public TCommandTransfer(
-    String applicationName,
-    String agentId,
-    ByteBuffer payload)
+    java.lang.String applicationName,
+    java.lang.String agentId,
+    java.nio.ByteBuffer payload)
   {
     this();
     this.applicationName = applicationName;
@@ -184,11 +154,11 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     this.payload = null;
   }
 
-  public String getApplicationName() {
+  public java.lang.String getApplicationName() {
     return this.applicationName;
   }
 
-  public void setApplicationName(String applicationName) {
+  public void setApplicationName(java.lang.String applicationName) {
     this.applicationName = applicationName;
   }
 
@@ -207,11 +177,11 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     }
   }
 
-  public String getAgentId() {
+  public java.lang.String getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(java.lang.String agentId) {
     this.agentId = agentId;
   }
 
@@ -240,16 +210,16 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public byte[] getPayload() {
@@ -257,15 +227,15 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     return payload == null ? null : payload.array();
   }
 
-  public ByteBuffer bufferForPayload() {
+  public java.nio.ByteBuffer bufferForPayload() {
     return org.apache.thrift.TBaseHelper.copyBinary(payload);
   }
 
   public void setPayload(byte[] payload) {
-    this.payload = payload == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(payload, payload.length));
+    this.payload = payload == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(payload.clone());
   }
 
-  public void setPayload(ByteBuffer payload) {
+  public void setPayload(java.nio.ByteBuffer payload) {
     this.payload = org.apache.thrift.TBaseHelper.copyBinary(payload);
   }
 
@@ -284,13 +254,13 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case APPLICATION_NAME:
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -298,7 +268,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
       if (value == null) {
         unsetAgentId();
       } else {
-        setAgentId((String)value);
+        setAgentId((java.lang.String)value);
       }
       break;
 
@@ -306,7 +276,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -314,14 +284,18 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
       if (value == null) {
         unsetPayload();
       } else {
-        setPayload((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setPayload((byte[])value);
+        } else {
+          setPayload((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case APPLICATION_NAME:
       return getApplicationName();
@@ -330,19 +304,19 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
       return getAgentId();
 
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case PAYLOAD:
       return getPayload();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -355,11 +329,11 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     case PAYLOAD:
       return isSetPayload();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCommandTransfer)
@@ -370,6 +344,8 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   public boolean equals(TCommandTransfer that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_applicationName = true && this.isSetApplicationName();
     boolean that_present_applicationName = true && that.isSetApplicationName();
@@ -412,29 +388,25 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_applicationName = true && (isSetApplicationName());
-    list.add(present_applicationName);
-    if (present_applicationName)
-      list.add(applicationName);
+    hashCode = hashCode * 8191 + ((isSetApplicationName()) ? 131071 : 524287);
+    if (isSetApplicationName())
+      hashCode = hashCode * 8191 + applicationName.hashCode();
 
-    boolean present_agentId = true && (isSetAgentId());
-    list.add(present_agentId);
-    if (present_agentId)
-      list.add(agentId);
+    hashCode = hashCode * 8191 + ((isSetAgentId()) ? 131071 : 524287);
+    if (isSetAgentId())
+      hashCode = hashCode * 8191 + agentId.hashCode();
 
-    boolean present_startTime = true && (isSetStartTime());
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
+    hashCode = hashCode * 8191 + ((isSetStartTime()) ? 131071 : 524287);
+    if (isSetStartTime())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
 
-    boolean present_payload = true && (isSetPayload());
-    list.add(present_payload);
-    if (present_payload)
-      list.add(payload);
+    hashCode = hashCode * 8191 + ((isSetPayload()) ? 131071 : 524287);
+    if (isSetPayload())
+      hashCode = hashCode * 8191 + payload.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -445,7 +417,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -455,7 +427,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
+    lastComparison = java.lang.Boolean.valueOf(isSetAgentId()).compareTo(other.isSetAgentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -465,7 +437,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -475,7 +447,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPayload()).compareTo(other.isSetPayload());
+    lastComparison = java.lang.Boolean.valueOf(isSetPayload()).compareTo(other.isSetPayload());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -493,16 +465,16 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCommandTransfer(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCommandTransfer(");
     boolean first = true;
 
     sb.append("applicationName:");
@@ -551,7 +523,7 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -561,13 +533,13 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     }
   }
 
-  private static class TCommandTransferStandardSchemeFactory implements SchemeFactory {
+  private static class TCommandTransferStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandTransferStandardScheme getScheme() {
       return new TCommandTransferStandardScheme();
     }
   }
 
-  private static class TCommandTransferStandardScheme extends StandardScheme<TCommandTransfer> {
+  private static class TCommandTransferStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCommandTransfer> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCommandTransfer struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -650,18 +622,18 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
 
   }
 
-  private static class TCommandTransferTupleSchemeFactory implements SchemeFactory {
+  private static class TCommandTransferTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandTransferTupleScheme getScheme() {
       return new TCommandTransferTupleScheme();
     }
   }
 
-  private static class TCommandTransferTupleScheme extends TupleScheme<TCommandTransfer> {
+  private static class TCommandTransferTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCommandTransfer> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCommandTransfer struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetApplicationName()) {
         optionals.set(0);
       }
@@ -691,8 +663,8 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCommandTransfer struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.applicationName = iprot.readString();
         struct.setApplicationNameIsSet(true);
@@ -712,5 +684,8 @@ public class TCommandTransfer implements org.apache.thrift.TBase<TCommandTransfe
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransferResponse.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransferResponse.java
index c4d12c325..334d2d5c4 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransferResponse.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TCommandTransferResponse.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-18")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TCommandTransferResponse implements org.apache.thrift.TBase<TCommandTransferResponse, TCommandTransferResponse._Fields>, java.io.Serializable, Cloneable, Comparable<TCommandTransferResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCommandTransferResponse");
 
@@ -42,15 +15,12 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
   private static final org.apache.thrift.protocol.TField PAYLOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("payload", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TCommandTransferResponseStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TCommandTransferResponseTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCommandTransferResponseStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCommandTransferResponseTupleSchemeFactory();
 
   private TRouteResult routeResult; // required
-  private ByteBuffer payload; // required
-  private String message; // optional
+  private java.nio.ByteBuffer payload; // required
+  private java.lang.String message; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -62,10 +32,10 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     PAYLOAD((short)2, "payload"),
     MESSAGE((short)3, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -92,21 +62,21 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -115,23 +85,23 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.MESSAGE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.ROUTE_RESULT, new org.apache.thrift.meta_data.FieldMetaData("routeResult", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TRouteResult.class)));
     tmpMap.put(_Fields.PAYLOAD, new org.apache.thrift.meta_data.FieldMetaData("payload", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCommandTransferResponse.class, metaDataMap);
   }
 
@@ -140,7 +110,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
 
   public TCommandTransferResponse(
     TRouteResult routeResult,
-    ByteBuffer payload)
+    java.nio.ByteBuffer payload)
   {
     this();
     this.routeResult = routeResult;
@@ -209,15 +179,15 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     return payload == null ? null : payload.array();
   }
 
-  public ByteBuffer bufferForPayload() {
+  public java.nio.ByteBuffer bufferForPayload() {
     return org.apache.thrift.TBaseHelper.copyBinary(payload);
   }
 
   public void setPayload(byte[] payload) {
-    this.payload = payload == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(payload, payload.length));
+    this.payload = payload == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(payload.clone());
   }
 
-  public void setPayload(ByteBuffer payload) {
+  public void setPayload(java.nio.ByteBuffer payload) {
     this.payload = org.apache.thrift.TBaseHelper.copyBinary(payload);
   }
 
@@ -236,11 +206,11 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     }
   }
 
-  public String getMessage() {
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(java.lang.String message) {
     this.message = message;
   }
 
@@ -259,7 +229,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case ROUTE_RESULT:
       if (value == null) {
@@ -273,7 +243,11 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
       if (value == null) {
         unsetPayload();
       } else {
-        setPayload((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setPayload((byte[])value);
+        } else {
+          setPayload((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -281,14 +255,14 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ROUTE_RESULT:
       return getRouteResult();
@@ -300,13 +274,13 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -317,11 +291,11 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TCommandTransferResponse)
@@ -332,6 +306,8 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
   public boolean equals(TCommandTransferResponse that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_routeResult = true && this.isSetRouteResult();
     boolean that_present_routeResult = true && that.isSetRouteResult();
@@ -365,24 +341,21 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_routeResult = true && (isSetRouteResult());
-    list.add(present_routeResult);
-    if (present_routeResult)
-      list.add(routeResult.getValue());
+    hashCode = hashCode * 8191 + ((isSetRouteResult()) ? 131071 : 524287);
+    if (isSetRouteResult())
+      hashCode = hashCode * 8191 + routeResult.getValue();
 
-    boolean present_payload = true && (isSetPayload());
-    list.add(present_payload);
-    if (present_payload)
-      list.add(payload);
+    hashCode = hashCode * 8191 + ((isSetPayload()) ? 131071 : 524287);
+    if (isSetPayload())
+      hashCode = hashCode * 8191 + payload.hashCode();
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -393,7 +366,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetRouteResult()).compareTo(other.isSetRouteResult());
+    lastComparison = java.lang.Boolean.valueOf(isSetRouteResult()).compareTo(other.isSetRouteResult());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -403,7 +376,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPayload()).compareTo(other.isSetPayload());
+    lastComparison = java.lang.Boolean.valueOf(isSetPayload()).compareTo(other.isSetPayload());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -413,7 +386,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -431,16 +404,16 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TCommandTransferResponse(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TCommandTransferResponse(");
     boolean first = true;
 
     sb.append("routeResult:");
@@ -485,7 +458,7 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -493,13 +466,13 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     }
   }
 
-  private static class TCommandTransferResponseStandardSchemeFactory implements SchemeFactory {
+  private static class TCommandTransferResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandTransferResponseStandardScheme getScheme() {
       return new TCommandTransferResponseStandardScheme();
     }
   }
 
-  private static class TCommandTransferResponseStandardScheme extends StandardScheme<TCommandTransferResponse> {
+  private static class TCommandTransferResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCommandTransferResponse> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCommandTransferResponse struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -571,18 +544,18 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
 
   }
 
-  private static class TCommandTransferResponseTupleSchemeFactory implements SchemeFactory {
+  private static class TCommandTransferResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TCommandTransferResponseTupleScheme getScheme() {
       return new TCommandTransferResponseTupleScheme();
     }
   }
 
-  private static class TCommandTransferResponseTupleScheme extends TupleScheme<TCommandTransferResponse> {
+  private static class TCommandTransferResponseTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCommandTransferResponse> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TCommandTransferResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetRouteResult()) {
         optionals.set(0);
       }
@@ -606,8 +579,8 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCommandTransferResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.routeResult = com.navercorp.pinpoint.thrift.dto.command.TRouteResult.findByValue(iprot.readI32());
         struct.setRouteResultIsSet(true);
@@ -623,5 +596,8 @@ public class TCommandTransferResponse implements org.apache.thrift.TBase<TComman
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TMonitorInfo.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TMonitorInfo.java
index d44053a6d..e40cbab55 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TMonitorInfo.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TMonitorInfo.java
@@ -1,64 +1,34 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TMonitorInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TMonitorInfo");
 
   private static final org.apache.thrift.protocol.TField STACK_DEPTH_FIELD_DESC = new org.apache.thrift.protocol.TField("stackDepth", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField STACK_FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("stackFrame", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TMonitorInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TMonitorInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TMonitorInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TMonitorInfoTupleSchemeFactory();
 
   private int stackDepth; // required
-  private String stackFrame; // required
+  private java.lang.String stackFrame; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     STACK_DEPTH((short)1, "stackDepth"),
     STACK_FRAME((short)2, "stackFrame");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -83,21 +53,21 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +76,7 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -114,14 +84,14 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
   // isset id assignments
   private static final int __STACKDEPTH_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STACK_DEPTH, new org.apache.thrift.meta_data.FieldMetaData("stackDepth", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.STACK_FRAME, new org.apache.thrift.meta_data.FieldMetaData("stackFrame", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TMonitorInfo.class, metaDataMap);
   }
 
@@ -130,7 +100,7 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
 
   public TMonitorInfo(
     int stackDepth,
-    String stackFrame)
+    java.lang.String stackFrame)
   {
     this();
     this.stackDepth = stackDepth;
@@ -170,23 +140,23 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
   }
 
   public void unsetStackDepth() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STACKDEPTH_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STACKDEPTH_ISSET_ID);
   }
 
   /** Returns true if field stackDepth is set (has been assigned a value) and false otherwise */
   public boolean isSetStackDepth() {
-    return EncodingUtils.testBit(__isset_bitfield, __STACKDEPTH_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STACKDEPTH_ISSET_ID);
   }
 
   public void setStackDepthIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STACKDEPTH_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STACKDEPTH_ISSET_ID, value);
   }
 
-  public String getStackFrame() {
+  public java.lang.String getStackFrame() {
     return this.stackFrame;
   }
 
-  public void setStackFrame(String stackFrame) {
+  public void setStackFrame(java.lang.String stackFrame) {
     this.stackFrame = stackFrame;
   }
 
@@ -205,13 +175,13 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case STACK_DEPTH:
       if (value == null) {
         unsetStackDepth();
       } else {
-        setStackDepth((Integer)value);
+        setStackDepth((java.lang.Integer)value);
       }
       break;
 
@@ -219,29 +189,29 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
       if (value == null) {
         unsetStackFrame();
       } else {
-        setStackFrame((String)value);
+        setStackFrame((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STACK_DEPTH:
-      return Integer.valueOf(getStackDepth());
+      return getStackDepth();
 
     case STACK_FRAME:
       return getStackFrame();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -250,11 +220,11 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
     case STACK_FRAME:
       return isSetStackFrame();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TMonitorInfo)
@@ -265,6 +235,8 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
   public boolean equals(TMonitorInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_stackDepth = true;
     boolean that_present_stackDepth = true;
@@ -289,19 +261,15 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_stackDepth = true;
-    list.add(present_stackDepth);
-    if (present_stackDepth)
-      list.add(stackDepth);
+    hashCode = hashCode * 8191 + stackDepth;
 
-    boolean present_stackFrame = true && (isSetStackFrame());
-    list.add(present_stackFrame);
-    if (present_stackFrame)
-      list.add(stackFrame);
+    hashCode = hashCode * 8191 + ((isSetStackFrame()) ? 131071 : 524287);
+    if (isSetStackFrame())
+      hashCode = hashCode * 8191 + stackFrame.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -312,7 +280,7 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetStackDepth()).compareTo(other.isSetStackDepth());
+    lastComparison = java.lang.Boolean.valueOf(isSetStackDepth()).compareTo(other.isSetStackDepth());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -322,7 +290,7 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStackFrame()).compareTo(other.isSetStackFrame());
+    lastComparison = java.lang.Boolean.valueOf(isSetStackFrame()).compareTo(other.isSetStackFrame());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -340,16 +308,16 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TMonitorInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TMonitorInfo(");
     boolean first = true;
 
     sb.append("stackDepth:");
@@ -380,7 +348,7 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -390,13 +358,13 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
     }
   }
 
-  private static class TMonitorInfoStandardSchemeFactory implements SchemeFactory {
+  private static class TMonitorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TMonitorInfoStandardScheme getScheme() {
       return new TMonitorInfoStandardScheme();
     }
   }
 
-  private static class TMonitorInfoStandardScheme extends StandardScheme<TMonitorInfo> {
+  private static class TMonitorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TMonitorInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TMonitorInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -451,18 +419,18 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
 
   }
 
-  private static class TMonitorInfoTupleSchemeFactory implements SchemeFactory {
+  private static class TMonitorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TMonitorInfoTupleScheme getScheme() {
       return new TMonitorInfoTupleScheme();
     }
   }
 
-  private static class TMonitorInfoTupleScheme extends TupleScheme<TMonitorInfo> {
+  private static class TMonitorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TMonitorInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TMonitorInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetStackDepth()) {
         optionals.set(0);
       }
@@ -480,8 +448,8 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TMonitorInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.stackDepth = iprot.readI32();
         struct.setStackDepthIsSet(true);
@@ -493,5 +461,8 @@ public class TMonitorInfo implements org.apache.thrift.TBase<TMonitorInfo, TMoni
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TRouteResult.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TRouteResult.java
index 116c7cd53..b55f5ab26 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TRouteResult.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TRouteResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -69,7 +69,7 @@ public enum TRouteResult implements org.apache.thrift.TEnum {
       case -1:
         return UNKNOWN;
       default:
-        return UNKNOWN;
+        return null;
     }
   }
 }
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDump.java
index 824c61f3e..e5bfac096 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDump.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-19")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThreadDump._Fields>, java.io.Serializable, Cloneable, Comparable<TThreadDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TThreadDump");
 
@@ -54,27 +27,24 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   private static final org.apache.thrift.protocol.TField LOCKED_MONITORS_FIELD_DESC = new org.apache.thrift.protocol.TField("lockedMonitors", org.apache.thrift.protocol.TType.LIST, (short)14);
   private static final org.apache.thrift.protocol.TField LOCKED_SYNCHRONIZERS_FIELD_DESC = new org.apache.thrift.protocol.TField("lockedSynchronizers", org.apache.thrift.protocol.TType.LIST, (short)15);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TThreadDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TThreadDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TThreadDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TThreadDumpTupleSchemeFactory();
 
-  private String threadName; // required
+  private java.lang.String threadName; // required
   private long threadId; // required
   private long blockedTime; // required
   private long blockedCount; // required
   private long waitedTime; // required
   private long waitedCount; // required
-  private String lockName; // required
+  private java.lang.String lockName; // required
   private long lockOwnerId; // required
-  private String lockOwnerName; // required
+  private java.lang.String lockOwnerName; // required
   private boolean inNative; // required
   private boolean suspended; // required
   private TThreadState threadState; // required
-  private List<String> stackTrace; // required
-  private List<TMonitorInfo> lockedMonitors; // required
-  private List<String> lockedSynchronizers; // required
+  private java.util.List<java.lang.String> stackTrace; // required
+  private java.util.List<TMonitorInfo> lockedMonitors; // required
+  private java.util.List<java.lang.String> lockedSynchronizers; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -98,10 +68,10 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     LOCKED_MONITORS((short)14, "lockedMonitors"),
     LOCKED_SYNCHRONIZERS((short)15, "lockedSynchronizers");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -152,21 +122,21 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -175,7 +145,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -190,9 +160,9 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   private static final int __INNATIVE_ISSET_ID = 6;
   private static final int __SUSPENDED_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.THREAD_NAME, new org.apache.thrift.meta_data.FieldMetaData("threadName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.THREAD_ID, new org.apache.thrift.meta_data.FieldMetaData("threadId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -226,7 +196,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     tmpMap.put(_Fields.LOCKED_SYNCHRONIZERS, new org.apache.thrift.meta_data.FieldMetaData("lockedSynchronizers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TThreadDump.class, metaDataMap);
   }
 
@@ -234,21 +204,21 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public TThreadDump(
-    String threadName,
+    java.lang.String threadName,
     long threadId,
     long blockedTime,
     long blockedCount,
     long waitedTime,
     long waitedCount,
-    String lockName,
+    java.lang.String lockName,
     long lockOwnerId,
-    String lockOwnerName,
+    java.lang.String lockOwnerName,
     boolean inNative,
     boolean suspended,
     TThreadState threadState,
-    List<String> stackTrace,
-    List<TMonitorInfo> lockedMonitors,
-    List<String> lockedSynchronizers)
+    java.util.List<java.lang.String> stackTrace,
+    java.util.List<TMonitorInfo> lockedMonitors,
+    java.util.List<java.lang.String> lockedSynchronizers)
   {
     this();
     this.threadName = threadName;
@@ -302,18 +272,18 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       this.threadState = other.threadState;
     }
     if (other.isSetStackTrace()) {
-      List<String> __this__stackTrace = new ArrayList<String>(other.stackTrace);
+      java.util.List<java.lang.String> __this__stackTrace = new java.util.ArrayList<java.lang.String>(other.stackTrace);
       this.stackTrace = __this__stackTrace;
     }
     if (other.isSetLockedMonitors()) {
-      List<TMonitorInfo> __this__lockedMonitors = new ArrayList<TMonitorInfo>(other.lockedMonitors.size());
+      java.util.List<TMonitorInfo> __this__lockedMonitors = new java.util.ArrayList<TMonitorInfo>(other.lockedMonitors.size());
       for (TMonitorInfo other_element : other.lockedMonitors) {
         __this__lockedMonitors.add(new TMonitorInfo(other_element));
       }
       this.lockedMonitors = __this__lockedMonitors;
     }
     if (other.isSetLockedSynchronizers()) {
-      List<String> __this__lockedSynchronizers = new ArrayList<String>(other.lockedSynchronizers);
+      java.util.List<java.lang.String> __this__lockedSynchronizers = new java.util.ArrayList<java.lang.String>(other.lockedSynchronizers);
       this.lockedSynchronizers = __this__lockedSynchronizers;
     }
   }
@@ -349,11 +319,11 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     this.lockedSynchronizers = null;
   }
 
-  public String getThreadName() {
+  public java.lang.String getThreadName() {
     return this.threadName;
   }
 
-  public void setThreadName(String threadName) {
+  public void setThreadName(java.lang.String threadName) {
     this.threadName = threadName;
   }
 
@@ -382,16 +352,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetThreadId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __THREADID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __THREADID_ISSET_ID);
   }
 
   /** Returns true if field threadId is set (has been assigned a value) and false otherwise */
   public boolean isSetThreadId() {
-    return EncodingUtils.testBit(__isset_bitfield, __THREADID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __THREADID_ISSET_ID);
   }
 
   public void setThreadIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THREADID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THREADID_ISSET_ID, value);
   }
 
   public long getBlockedTime() {
@@ -404,16 +374,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetBlockedTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID);
   }
 
   /** Returns true if field blockedTime is set (has been assigned a value) and false otherwise */
   public boolean isSetBlockedTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID);
   }
 
   public void setBlockedTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BLOCKEDTIME_ISSET_ID, value);
   }
 
   public long getBlockedCount() {
@@ -426,16 +396,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetBlockedCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID);
   }
 
   /** Returns true if field blockedCount is set (has been assigned a value) and false otherwise */
   public boolean isSetBlockedCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID);
   }
 
   public void setBlockedCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BLOCKEDCOUNT_ISSET_ID, value);
   }
 
   public long getWaitedTime() {
@@ -448,16 +418,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetWaitedTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAITEDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAITEDTIME_ISSET_ID);
   }
 
   /** Returns true if field waitedTime is set (has been assigned a value) and false otherwise */
   public boolean isSetWaitedTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __WAITEDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WAITEDTIME_ISSET_ID);
   }
 
   public void setWaitedTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAITEDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WAITEDTIME_ISSET_ID, value);
   }
 
   public long getWaitedCount() {
@@ -470,23 +440,23 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetWaitedCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID);
   }
 
   /** Returns true if field waitedCount is set (has been assigned a value) and false otherwise */
   public boolean isSetWaitedCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID);
   }
 
   public void setWaitedCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WAITEDCOUNT_ISSET_ID, value);
   }
 
-  public String getLockName() {
+  public java.lang.String getLockName() {
     return this.lockName;
   }
 
-  public void setLockName(String lockName) {
+  public void setLockName(java.lang.String lockName) {
     this.lockName = lockName;
   }
 
@@ -515,23 +485,23 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetLockOwnerId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID);
   }
 
   /** Returns true if field lockOwnerId is set (has been assigned a value) and false otherwise */
   public boolean isSetLockOwnerId() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID);
   }
 
   public void setLockOwnerIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCKOWNERID_ISSET_ID, value);
   }
 
-  public String getLockOwnerName() {
+  public java.lang.String getLockOwnerName() {
     return this.lockOwnerName;
   }
 
-  public void setLockOwnerName(String lockOwnerName) {
+  public void setLockOwnerName(java.lang.String lockOwnerName) {
     this.lockOwnerName = lockOwnerName;
   }
 
@@ -560,16 +530,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetInNative() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INNATIVE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INNATIVE_ISSET_ID);
   }
 
   /** Returns true if field inNative is set (has been assigned a value) and false otherwise */
   public boolean isSetInNative() {
-    return EncodingUtils.testBit(__isset_bitfield, __INNATIVE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INNATIVE_ISSET_ID);
   }
 
   public void setInNativeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INNATIVE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INNATIVE_ISSET_ID, value);
   }
 
   public boolean isSuspended() {
@@ -582,16 +552,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void unsetSuspended() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUSPENDED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUSPENDED_ISSET_ID);
   }
 
   /** Returns true if field suspended is set (has been assigned a value) and false otherwise */
   public boolean isSetSuspended() {
-    return EncodingUtils.testBit(__isset_bitfield, __SUSPENDED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUSPENDED_ISSET_ID);
   }
 
   public void setSuspendedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUSPENDED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUSPENDED_ISSET_ID, value);
   }
 
   /**
@@ -629,22 +599,22 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     return (this.stackTrace == null) ? 0 : this.stackTrace.size();
   }
 
-  public java.util.Iterator<String> getStackTraceIterator() {
+  public java.util.Iterator<java.lang.String> getStackTraceIterator() {
     return (this.stackTrace == null) ? null : this.stackTrace.iterator();
   }
 
-  public void addToStackTrace(String elem) {
+  public void addToStackTrace(java.lang.String elem) {
     if (this.stackTrace == null) {
-      this.stackTrace = new ArrayList<String>();
+      this.stackTrace = new java.util.ArrayList<java.lang.String>();
     }
     this.stackTrace.add(elem);
   }
 
-  public List<String> getStackTrace() {
+  public java.util.List<java.lang.String> getStackTrace() {
     return this.stackTrace;
   }
 
-  public void setStackTrace(List<String> stackTrace) {
+  public void setStackTrace(java.util.List<java.lang.String> stackTrace) {
     this.stackTrace = stackTrace;
   }
 
@@ -673,16 +643,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
 
   public void addToLockedMonitors(TMonitorInfo elem) {
     if (this.lockedMonitors == null) {
-      this.lockedMonitors = new ArrayList<TMonitorInfo>();
+      this.lockedMonitors = new java.util.ArrayList<TMonitorInfo>();
     }
     this.lockedMonitors.add(elem);
   }
 
-  public List<TMonitorInfo> getLockedMonitors() {
+  public java.util.List<TMonitorInfo> getLockedMonitors() {
     return this.lockedMonitors;
   }
 
-  public void setLockedMonitors(List<TMonitorInfo> lockedMonitors) {
+  public void setLockedMonitors(java.util.List<TMonitorInfo> lockedMonitors) {
     this.lockedMonitors = lockedMonitors;
   }
 
@@ -705,22 +675,22 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     return (this.lockedSynchronizers == null) ? 0 : this.lockedSynchronizers.size();
   }
 
-  public java.util.Iterator<String> getLockedSynchronizersIterator() {
+  public java.util.Iterator<java.lang.String> getLockedSynchronizersIterator() {
     return (this.lockedSynchronizers == null) ? null : this.lockedSynchronizers.iterator();
   }
 
-  public void addToLockedSynchronizers(String elem) {
+  public void addToLockedSynchronizers(java.lang.String elem) {
     if (this.lockedSynchronizers == null) {
-      this.lockedSynchronizers = new ArrayList<String>();
+      this.lockedSynchronizers = new java.util.ArrayList<java.lang.String>();
     }
     this.lockedSynchronizers.add(elem);
   }
 
-  public List<String> getLockedSynchronizers() {
+  public java.util.List<java.lang.String> getLockedSynchronizers() {
     return this.lockedSynchronizers;
   }
 
-  public void setLockedSynchronizers(List<String> lockedSynchronizers) {
+  public void setLockedSynchronizers(java.util.List<java.lang.String> lockedSynchronizers) {
     this.lockedSynchronizers = lockedSynchronizers;
   }
 
@@ -739,13 +709,13 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case THREAD_NAME:
       if (value == null) {
         unsetThreadName();
       } else {
-        setThreadName((String)value);
+        setThreadName((java.lang.String)value);
       }
       break;
 
@@ -753,7 +723,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetThreadId();
       } else {
-        setThreadId((Long)value);
+        setThreadId((java.lang.Long)value);
       }
       break;
 
@@ -761,7 +731,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetBlockedTime();
       } else {
-        setBlockedTime((Long)value);
+        setBlockedTime((java.lang.Long)value);
       }
       break;
 
@@ -769,7 +739,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetBlockedCount();
       } else {
-        setBlockedCount((Long)value);
+        setBlockedCount((java.lang.Long)value);
       }
       break;
 
@@ -777,7 +747,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetWaitedTime();
       } else {
-        setWaitedTime((Long)value);
+        setWaitedTime((java.lang.Long)value);
       }
       break;
 
@@ -785,7 +755,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetWaitedCount();
       } else {
-        setWaitedCount((Long)value);
+        setWaitedCount((java.lang.Long)value);
       }
       break;
 
@@ -793,7 +763,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetLockName();
       } else {
-        setLockName((String)value);
+        setLockName((java.lang.String)value);
       }
       break;
 
@@ -801,7 +771,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetLockOwnerId();
       } else {
-        setLockOwnerId((Long)value);
+        setLockOwnerId((java.lang.Long)value);
       }
       break;
 
@@ -809,7 +779,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetLockOwnerName();
       } else {
-        setLockOwnerName((String)value);
+        setLockOwnerName((java.lang.String)value);
       }
       break;
 
@@ -817,7 +787,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetInNative();
       } else {
-        setInNative((Boolean)value);
+        setInNative((java.lang.Boolean)value);
       }
       break;
 
@@ -825,7 +795,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetSuspended();
       } else {
-        setSuspended((Boolean)value);
+        setSuspended((java.lang.Boolean)value);
       }
       break;
 
@@ -841,7 +811,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetStackTrace();
       } else {
-        setStackTrace((List<String>)value);
+        setStackTrace((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -849,7 +819,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetLockedMonitors();
       } else {
-        setLockedMonitors((List<TMonitorInfo>)value);
+        setLockedMonitors((java.util.List<TMonitorInfo>)value);
       }
       break;
 
@@ -857,47 +827,47 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (value == null) {
         unsetLockedSynchronizers();
       } else {
-        setLockedSynchronizers((List<String>)value);
+        setLockedSynchronizers((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case THREAD_NAME:
       return getThreadName();
 
     case THREAD_ID:
-      return Long.valueOf(getThreadId());
+      return getThreadId();
 
     case BLOCKED_TIME:
-      return Long.valueOf(getBlockedTime());
+      return getBlockedTime();
 
     case BLOCKED_COUNT:
-      return Long.valueOf(getBlockedCount());
+      return getBlockedCount();
 
     case WAITED_TIME:
-      return Long.valueOf(getWaitedTime());
+      return getWaitedTime();
 
     case WAITED_COUNT:
-      return Long.valueOf(getWaitedCount());
+      return getWaitedCount();
 
     case LOCK_NAME:
       return getLockName();
 
     case LOCK_OWNER_ID:
-      return Long.valueOf(getLockOwnerId());
+      return getLockOwnerId();
 
     case LOCK_OWNER_NAME:
       return getLockOwnerName();
 
     case IN_NATIVE:
-      return Boolean.valueOf(isInNative());
+      return isInNative();
 
     case SUSPENDED:
-      return Boolean.valueOf(isSuspended());
+      return isSuspended();
 
     case THREAD_STATE:
       return getThreadState();
@@ -912,13 +882,13 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       return getLockedSynchronizers();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -953,11 +923,11 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     case LOCKED_SYNCHRONIZERS:
       return isSetLockedSynchronizers();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TThreadDump)
@@ -968,6 +938,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   public boolean equals(TThreadDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_threadName = true && this.isSetThreadName();
     boolean that_present_threadName = true && that.isSetThreadName();
@@ -1109,84 +1081,53 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_threadName = true && (isSetThreadName());
-    list.add(present_threadName);
-    if (present_threadName)
-      list.add(threadName);
+    hashCode = hashCode * 8191 + ((isSetThreadName()) ? 131071 : 524287);
+    if (isSetThreadName())
+      hashCode = hashCode * 8191 + threadName.hashCode();
 
-    boolean present_threadId = true;
-    list.add(present_threadId);
-    if (present_threadId)
-      list.add(threadId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(threadId);
 
-    boolean present_blockedTime = true;
-    list.add(present_blockedTime);
-    if (present_blockedTime)
-      list.add(blockedTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(blockedTime);
 
-    boolean present_blockedCount = true;
-    list.add(present_blockedCount);
-    if (present_blockedCount)
-      list.add(blockedCount);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(blockedCount);
 
-    boolean present_waitedTime = true;
-    list.add(present_waitedTime);
-    if (present_waitedTime)
-      list.add(waitedTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(waitedTime);
 
-    boolean present_waitedCount = true;
-    list.add(present_waitedCount);
-    if (present_waitedCount)
-      list.add(waitedCount);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(waitedCount);
 
-    boolean present_lockName = true && (isSetLockName());
-    list.add(present_lockName);
-    if (present_lockName)
-      list.add(lockName);
+    hashCode = hashCode * 8191 + ((isSetLockName()) ? 131071 : 524287);
+    if (isSetLockName())
+      hashCode = hashCode * 8191 + lockName.hashCode();
 
-    boolean present_lockOwnerId = true;
-    list.add(present_lockOwnerId);
-    if (present_lockOwnerId)
-      list.add(lockOwnerId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lockOwnerId);
 
-    boolean present_lockOwnerName = true && (isSetLockOwnerName());
-    list.add(present_lockOwnerName);
-    if (present_lockOwnerName)
-      list.add(lockOwnerName);
+    hashCode = hashCode * 8191 + ((isSetLockOwnerName()) ? 131071 : 524287);
+    if (isSetLockOwnerName())
+      hashCode = hashCode * 8191 + lockOwnerName.hashCode();
 
-    boolean present_inNative = true;
-    list.add(present_inNative);
-    if (present_inNative)
-      list.add(inNative);
+    hashCode = hashCode * 8191 + ((inNative) ? 131071 : 524287);
 
-    boolean present_suspended = true;
-    list.add(present_suspended);
-    if (present_suspended)
-      list.add(suspended);
+    hashCode = hashCode * 8191 + ((suspended) ? 131071 : 524287);
 
-    boolean present_threadState = true && (isSetThreadState());
-    list.add(present_threadState);
-    if (present_threadState)
-      list.add(threadState.getValue());
+    hashCode = hashCode * 8191 + ((isSetThreadState()) ? 131071 : 524287);
+    if (isSetThreadState())
+      hashCode = hashCode * 8191 + threadState.getValue();
 
-    boolean present_stackTrace = true && (isSetStackTrace());
-    list.add(present_stackTrace);
-    if (present_stackTrace)
-      list.add(stackTrace);
+    hashCode = hashCode * 8191 + ((isSetStackTrace()) ? 131071 : 524287);
+    if (isSetStackTrace())
+      hashCode = hashCode * 8191 + stackTrace.hashCode();
 
-    boolean present_lockedMonitors = true && (isSetLockedMonitors());
-    list.add(present_lockedMonitors);
-    if (present_lockedMonitors)
-      list.add(lockedMonitors);
+    hashCode = hashCode * 8191 + ((isSetLockedMonitors()) ? 131071 : 524287);
+    if (isSetLockedMonitors())
+      hashCode = hashCode * 8191 + lockedMonitors.hashCode();
 
-    boolean present_lockedSynchronizers = true && (isSetLockedSynchronizers());
-    list.add(present_lockedSynchronizers);
-    if (present_lockedSynchronizers)
-      list.add(lockedSynchronizers);
+    hashCode = hashCode * 8191 + ((isSetLockedSynchronizers()) ? 131071 : 524287);
+    if (isSetLockedSynchronizers())
+      hashCode = hashCode * 8191 + lockedSynchronizers.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -1197,7 +1138,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetThreadName()).compareTo(other.isSetThreadName());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadName()).compareTo(other.isSetThreadName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1207,7 +1148,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadId()).compareTo(other.isSetThreadId());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadId()).compareTo(other.isSetThreadId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1217,7 +1158,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetBlockedTime()).compareTo(other.isSetBlockedTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetBlockedTime()).compareTo(other.isSetBlockedTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1227,7 +1168,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetBlockedCount()).compareTo(other.isSetBlockedCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetBlockedCount()).compareTo(other.isSetBlockedCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1237,7 +1178,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetWaitedTime()).compareTo(other.isSetWaitedTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetWaitedTime()).compareTo(other.isSetWaitedTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1247,7 +1188,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetWaitedCount()).compareTo(other.isSetWaitedCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetWaitedCount()).compareTo(other.isSetWaitedCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1257,7 +1198,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLockName()).compareTo(other.isSetLockName());
+    lastComparison = java.lang.Boolean.valueOf(isSetLockName()).compareTo(other.isSetLockName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1267,7 +1208,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLockOwnerId()).compareTo(other.isSetLockOwnerId());
+    lastComparison = java.lang.Boolean.valueOf(isSetLockOwnerId()).compareTo(other.isSetLockOwnerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1277,7 +1218,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLockOwnerName()).compareTo(other.isSetLockOwnerName());
+    lastComparison = java.lang.Boolean.valueOf(isSetLockOwnerName()).compareTo(other.isSetLockOwnerName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1287,7 +1228,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetInNative()).compareTo(other.isSetInNative());
+    lastComparison = java.lang.Boolean.valueOf(isSetInNative()).compareTo(other.isSetInNative());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1297,7 +1238,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSuspended()).compareTo(other.isSetSuspended());
+    lastComparison = java.lang.Boolean.valueOf(isSetSuspended()).compareTo(other.isSetSuspended());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1307,7 +1248,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadState()).compareTo(other.isSetThreadState());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadState()).compareTo(other.isSetThreadState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1317,7 +1258,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStackTrace()).compareTo(other.isSetStackTrace());
+    lastComparison = java.lang.Boolean.valueOf(isSetStackTrace()).compareTo(other.isSetStackTrace());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1327,7 +1268,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLockedMonitors()).compareTo(other.isSetLockedMonitors());
+    lastComparison = java.lang.Boolean.valueOf(isSetLockedMonitors()).compareTo(other.isSetLockedMonitors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1337,7 +1278,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLockedSynchronizers()).compareTo(other.isSetLockedSynchronizers());
+    lastComparison = java.lang.Boolean.valueOf(isSetLockedSynchronizers()).compareTo(other.isSetLockedSynchronizers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1355,16 +1296,16 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TThreadDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TThreadDump(");
     boolean first = true;
 
     sb.append("threadName:");
@@ -1471,7 +1412,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1481,13 +1422,13 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     }
   }
 
-  private static class TThreadDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TThreadDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TThreadDumpStandardScheme getScheme() {
       return new TThreadDumpStandardScheme();
     }
   }
 
-  private static class TThreadDumpStandardScheme extends StandardScheme<TThreadDump> {
+  private static class TThreadDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TThreadDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TThreadDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1599,8 +1540,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.stackTrace = new ArrayList<String>(_list0.size);
-                String _elem1;
+                struct.stackTrace = new java.util.ArrayList<java.lang.String>(_list0.size);
+                java.lang.String _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
                   _elem1 = iprot.readString();
@@ -1617,7 +1558,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
-                struct.lockedMonitors = new ArrayList<TMonitorInfo>(_list3.size);
+                struct.lockedMonitors = new java.util.ArrayList<TMonitorInfo>(_list3.size);
                 TMonitorInfo _elem4;
                 for (int _i5 = 0; _i5 < _list3.size; ++_i5)
                 {
@@ -1636,8 +1577,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
-                struct.lockedSynchronizers = new ArrayList<String>(_list6.size);
-                String _elem7;
+                struct.lockedSynchronizers = new java.util.ArrayList<java.lang.String>(_list6.size);
+                java.lang.String _elem7;
                 for (int _i8 = 0; _i8 < _list6.size; ++_i8)
                 {
                   _elem7 = iprot.readString();
@@ -1711,7 +1652,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         oprot.writeFieldBegin(STACK_TRACE_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.stackTrace.size()));
-          for (String _iter9 : struct.stackTrace)
+          for (java.lang.String _iter9 : struct.stackTrace)
           {
             oprot.writeString(_iter9);
           }
@@ -1735,7 +1676,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
         oprot.writeFieldBegin(LOCKED_SYNCHRONIZERS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.lockedSynchronizers.size()));
-          for (String _iter11 : struct.lockedSynchronizers)
+          for (java.lang.String _iter11 : struct.lockedSynchronizers)
           {
             oprot.writeString(_iter11);
           }
@@ -1749,18 +1690,18 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
 
   }
 
-  private static class TThreadDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TThreadDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TThreadDumpTupleScheme getScheme() {
       return new TThreadDumpTupleScheme();
     }
   }
 
-  private static class TThreadDumpTupleScheme extends TupleScheme<TThreadDump> {
+  private static class TThreadDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TThreadDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetThreadName()) {
         optionals.set(0);
       }
@@ -1846,7 +1787,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (struct.isSetStackTrace()) {
         {
           oprot.writeI32(struct.stackTrace.size());
-          for (String _iter12 : struct.stackTrace)
+          for (java.lang.String _iter12 : struct.stackTrace)
           {
             oprot.writeString(_iter12);
           }
@@ -1864,7 +1805,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (struct.isSetLockedSynchronizers()) {
         {
           oprot.writeI32(struct.lockedSynchronizers.size());
-          for (String _iter14 : struct.lockedSynchronizers)
+          for (java.lang.String _iter14 : struct.lockedSynchronizers)
           {
             oprot.writeString(_iter14);
           }
@@ -1874,8 +1815,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TThreadDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(15);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(15);
       if (incoming.get(0)) {
         struct.threadName = iprot.readString();
         struct.setThreadNameIsSet(true);
@@ -1927,8 +1868,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (incoming.get(12)) {
         {
           org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.stackTrace = new ArrayList<String>(_list15.size);
-          String _elem16;
+          struct.stackTrace = new java.util.ArrayList<java.lang.String>(_list15.size);
+          java.lang.String _elem16;
           for (int _i17 = 0; _i17 < _list15.size; ++_i17)
           {
             _elem16 = iprot.readString();
@@ -1940,7 +1881,7 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (incoming.get(13)) {
         {
           org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.lockedMonitors = new ArrayList<TMonitorInfo>(_list18.size);
+          struct.lockedMonitors = new java.util.ArrayList<TMonitorInfo>(_list18.size);
           TMonitorInfo _elem19;
           for (int _i20 = 0; _i20 < _list18.size; ++_i20)
           {
@@ -1954,8 +1895,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
       if (incoming.get(14)) {
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.lockedSynchronizers = new ArrayList<String>(_list21.size);
-          String _elem22;
+          struct.lockedSynchronizers = new java.util.ArrayList<java.lang.String>(_list21.size);
+          java.lang.String _elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
             _elem22 = iprot.readString();
@@ -1967,5 +1908,8 @@ public class TThreadDump implements org.apache.thrift.TBase<TThreadDump, TThread
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDumpType.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDumpType.java
index 8da975430..27895ae0c 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDumpType.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadDumpType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadLightDump.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadLightDump.java
index e78750de2..0e2371b88 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadLightDump.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadLightDump.java
@@ -1,30 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package com.navercorp.pinpoint.thrift.dto.command;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-import javax.annotation.Generated;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-12-15")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")
 public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDump, TThreadLightDump._Fields>, java.io.Serializable, Cloneable, Comparable<TThreadLightDump> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TThreadLightDump");
 
@@ -32,13 +15,10 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   private static final org.apache.thrift.protocol.TField THREAD_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("threadId", org.apache.thrift.protocol.TType.I64, (short)2);
   private static final org.apache.thrift.protocol.TField THREAD_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("threadState", org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TThreadLightDumpStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TThreadLightDumpTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TThreadLightDumpStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TThreadLightDumpTupleSchemeFactory();
 
-  private String threadName; // required
+  private java.lang.String threadName; // required
   private long threadId; // required
   private TThreadState threadState; // optional
 
@@ -52,10 +32,10 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
      */
     THREAD_STATE((short)3, "threadState");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -82,21 +62,21 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -105,7 +85,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -114,16 +94,16 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   private static final int __THREADID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.THREAD_STATE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.THREAD_NAME, new org.apache.thrift.meta_data.FieldMetaData("threadName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.THREAD_ID, new org.apache.thrift.meta_data.FieldMetaData("threadId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.THREAD_STATE, new org.apache.thrift.meta_data.FieldMetaData("threadState", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TThreadState.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TThreadLightDump.class, metaDataMap);
   }
 
@@ -131,7 +111,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   }
 
   public TThreadLightDump(
-    String threadName,
+    java.lang.String threadName,
     long threadId)
   {
     this();
@@ -166,11 +146,11 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     this.threadState = null;
   }
 
-  public String getThreadName() {
+  public java.lang.String getThreadName() {
     return this.threadName;
   }
 
-  public void setThreadName(String threadName) {
+  public void setThreadName(java.lang.String threadName) {
     this.threadName = threadName;
   }
 
@@ -199,16 +179,16 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   }
 
   public void unsetThreadId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __THREADID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __THREADID_ISSET_ID);
   }
 
   /** Returns true if field threadId is set (has been assigned a value) and false otherwise */
   public boolean isSetThreadId() {
-    return EncodingUtils.testBit(__isset_bitfield, __THREADID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __THREADID_ISSET_ID);
   }
 
   public void setThreadIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THREADID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THREADID_ISSET_ID, value);
   }
 
   /**
@@ -242,13 +222,13 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case THREAD_NAME:
       if (value == null) {
         unsetThreadName();
       } else {
-        setThreadName((String)value);
+        setThreadName((java.lang.String)value);
       }
       break;
 
@@ -256,7 +236,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
       if (value == null) {
         unsetThreadId();
       } else {
-        setThreadId((Long)value);
+        setThreadId((java.lang.Long)value);
       }
       break;
 
@@ -271,25 +251,25 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case THREAD_NAME:
       return getThreadName();
 
     case THREAD_ID:
-      return Long.valueOf(getThreadId());
+      return getThreadId();
 
     case THREAD_STATE:
       return getThreadState();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -300,11 +280,11 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     case THREAD_STATE:
       return isSetThreadState();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TThreadLightDump)
@@ -315,6 +295,8 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   public boolean equals(TThreadLightDump that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_threadName = true && this.isSetThreadName();
     boolean that_present_threadName = true && that.isSetThreadName();
@@ -348,24 +330,19 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_threadName = true && (isSetThreadName());
-    list.add(present_threadName);
-    if (present_threadName)
-      list.add(threadName);
+    hashCode = hashCode * 8191 + ((isSetThreadName()) ? 131071 : 524287);
+    if (isSetThreadName())
+      hashCode = hashCode * 8191 + threadName.hashCode();
 
-    boolean present_threadId = true;
-    list.add(present_threadId);
-    if (present_threadId)
-      list.add(threadId);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(threadId);
 
-    boolean present_threadState = true && (isSetThreadState());
-    list.add(present_threadState);
-    if (present_threadState)
-      list.add(threadState.getValue());
+    hashCode = hashCode * 8191 + ((isSetThreadState()) ? 131071 : 524287);
+    if (isSetThreadState())
+      hashCode = hashCode * 8191 + threadState.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -376,7 +353,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetThreadName()).compareTo(other.isSetThreadName());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadName()).compareTo(other.isSetThreadName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -386,7 +363,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadId()).compareTo(other.isSetThreadId());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadId()).compareTo(other.isSetThreadId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -396,7 +373,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreadState()).compareTo(other.isSetThreadState());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreadState()).compareTo(other.isSetThreadState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -414,16 +391,16 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TThreadLightDump(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TThreadLightDump(");
     boolean first = true;
 
     sb.append("threadName:");
@@ -464,7 +441,7 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -474,13 +451,13 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     }
   }
 
-  private static class TThreadLightDumpStandardSchemeFactory implements SchemeFactory {
+  private static class TThreadLightDumpStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TThreadLightDumpStandardScheme getScheme() {
       return new TThreadLightDumpStandardScheme();
     }
   }
 
-  private static class TThreadLightDumpStandardScheme extends StandardScheme<TThreadLightDump> {
+  private static class TThreadLightDumpStandardScheme extends org.apache.thrift.scheme.StandardScheme<TThreadLightDump> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TThreadLightDump struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -550,18 +527,18 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
 
   }
 
-  private static class TThreadLightDumpTupleSchemeFactory implements SchemeFactory {
+  private static class TThreadLightDumpTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TThreadLightDumpTupleScheme getScheme() {
       return new TThreadLightDumpTupleScheme();
     }
   }
 
-  private static class TThreadLightDumpTupleScheme extends TupleScheme<TThreadLightDump> {
+  private static class TThreadLightDumpTupleScheme extends org.apache.thrift.scheme.TupleScheme<TThreadLightDump> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetThreadName()) {
         optionals.set(0);
       }
@@ -585,8 +562,8 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TThreadLightDump struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.threadName = iprot.readString();
         struct.setThreadNameIsSet(true);
@@ -602,5 +579,8 @@ public class TThreadLightDump implements org.apache.thrift.TBase<TThreadLightDum
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadState.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadState.java
index 3217ae986..ebfc108ee 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadState.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/command/TThreadState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,6 +7,10 @@
 package com.navercorp.pinpoint.thrift.dto.command;
 
 
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
 public enum TThreadState implements org.apache.thrift.TEnum {
   NEW(0),
   RUNNABLE(1),
diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java
index 4a7a241d2..1d68d96ba 100644
--- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java
+++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java
@@ -16,7 +16,6 @@
 
 package com.navercorp.pinpoint.thrift.io;
 
-import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.TFieldIdEnum;
 import org.apache.thrift.protocol.TProtocol;
@@ -71,7 +70,7 @@ public class NetworkAvailabilityCheckPacket implements org.apache.thrift.TBase<N
     }
 
     @Override
-    public TBase deepCopy() {
+    public NetworkAvailabilityCheckPacket deepCopy() {
         return null;
     }
 
diff --git a/thrift/src/main/thrift/Command.thrift b/thrift/src/main/thrift/Command.thrift
index d7f560f3e..98a810b05 100644
--- a/thrift/src/main/thrift/Command.thrift
+++ b/thrift/src/main/thrift/Command.thrift
@@ -21,8 +21,8 @@ enum TThreadState {
 }
 
 struct TMonitorInfo {
-	1: i32 		stackDepth
-	2: string 	stackFrame
+    1: i32 		stackDepth
+    2: string 	stackFrame
 }
 
 struct TThreadDump {
@@ -109,38 +109,39 @@ struct TCmdActiveThreadLightDumpRes {
 }
 
 struct TCommandEcho {
-	1: string	message
+    1: string	message
 }
 
 enum TRouteResult {
-	OK = 0,
+    OK = 0,
 
-	BAD_REQUEST = 200,
-	EMPTY_REQUEST = 201,
-	NOT_SUPPORTED_REQUEST = 202,
+    BAD_REQUEST = 200,
+    EMPTY_REQUEST = 201,
+    NOT_SUPPORTED_REQUEST = 202,
 
-	BAD_RESPONSE = 210,
-	EMPTY_RESPONSE = 211,
-	NOT_SUPPORTED_RESPONSE = 212,
+    BAD_RESPONSE = 210,
+    EMPTY_RESPONSE = 211,
+    NOT_SUPPORTED_RESPONSE = 212,
 
-	TIMEOUT = 220,
+    TIMEOUT = 220,
 
-	NOT_FOUND = 230,
+    NOT_FOUND = 230,
 
-	NOT_ACCEPTABLE = 240,
-	NOT_SUPPORTED_SERVICE = 241,
+    NOT_ACCEPTABLE = 240,
+    NOT_SUPPORTED_SERVICE = 241,
 
-	UNKNOWN = -1
+    UNKNOWN = -1
 }
 
 struct TCommandTransfer {
-    1: string	applicationName
-    2: string 	agentId
-    3: optional i64		startTime
-    4: binary 	payload
+    1: string applicationName
+    2: string agentId
+    3: optional i64 startTime
+    4: binary payload
 }
+
 struct TCommandTransferResponse {
-	1: TRouteResult routeResult
-	2: binary payload
-	3: optional string message
+    1: TRouteResult routeResult
+    2: binary payload
+    3: optional string message
 }
\ No newline at end of file
diff --git a/thrift/src/main/thrift/Pinpoint.thrift b/thrift/src/main/thrift/Pinpoint.thrift
index b93a95d47..f27d8f857 100644
--- a/thrift/src/main/thrift/Pinpoint.thrift
+++ b/thrift/src/main/thrift/Pinpoint.thrift
@@ -26,24 +26,24 @@ struct TJvmInfo {
 }
 
 struct TAgentInfo {
-	1: string	hostname
-	2: string	ip
-	3: string	ports
-	4: string	agentId
-	5: string	applicationName
-	6: i16	    serviceType
-	7: i32      pid
-	8: string   agentVersion;
-	9: string   vmVersion;
+    1: string	hostname
+    2: string	ip
+    3: string	ports
+    4: string	agentId
+    5: string	applicationName
+    6: i16	    serviceType
+    7: i32      pid
+    8: string   agentVersion;
+    9: string   vmVersion;
 
-	10: i64	    startTimestamp
+    10: i64	    startTimestamp
 
-	11: optional i64     endTimestamp
-	12: optional i32     endStatus
-	
-	20: optional TServerMetaData   serverMetaData
+    11: optional i64     endTimestamp
+    12: optional i32     endStatus
 
-	30: optional TJvmInfo   jvmInfo
+    20: optional TServerMetaData   serverMetaData
+
+    30: optional TJvmInfo   jvmInfo
 }
 
 struct TJvmGc {
@@ -83,12 +83,12 @@ struct TTransaction {
 
 struct TActiveTraceHistogram {
     1:          i16         version = 0
-	2: optional i32         histogramSchemaType
-	3: optional list<i32>   activeTraceCount
+    2: optional i32         histogramSchemaType
+    3: optional list<i32>   activeTraceCount
 }
 
 struct TActiveTrace {
-	1: optional TActiveTraceHistogram   histogram
+    1: optional TActiveTraceHistogram   histogram
 }
 
 struct TAgentStat {
diff --git a/thrift/src/main/thrift/Trace.thrift b/thrift/src/main/thrift/Trace.thrift
index 7dc981ab6..dbdd72839 100644
--- a/thrift/src/main/thrift/Trace.thrift
+++ b/thrift/src/main/thrift/Trace.thrift
@@ -14,21 +14,21 @@ struct TIntStringStringValue {
 
 
 union TAnnotationValue {
-  1: string stringValue
-  2: bool boolValue;
-  3: i32 intValue;
-  4: i64 longValue;
-  5: i16 shortValue
-  6: double doubleValue;
-  7: binary binaryValue;
-  8: byte byteValue;
-  9: TIntStringValue intStringValue;
-  10: TIntStringStringValue intStringStringValue;
+    1: string stringValue
+    2: bool boolValue;
+    3: i32 intValue;
+    4: i64 longValue;
+    5: i16 shortValue
+    6: double doubleValue;
+    7: binary binaryValue;
+    8: i8 byteValue;
+    9: TIntStringValue intStringValue;
+    10: TIntStringStringValue intStringStringValue;
 }
 
 struct TAnnotation {
-  1: i32 key,
-  2: optional TAnnotationValue value
+    1: i32 key,
+    2: optional TAnnotationValue value
 }
 
 
@@ -36,94 +36,94 @@ struct TAnnotation {
 
 struct TSpanEvent {
 
-  7: optional i64 spanId
-  8: i16 sequence
+    7: optional i64 spanId
+    8: i16 sequence
 
-  9: i32 startElapsed
-  10: optional i32 endElapsed = 0
+    9: i32 startElapsed
+    10: optional i32 endElapsed = 0
 
-  11: optional string rpc
-  12: i16 serviceType
-  13: optional string endPoint
+    11: optional string rpc
+    12: i16 serviceType
+    13: optional string endPoint
 
-  14: optional list<TAnnotation> annotations
+    14: optional list<TAnnotation> annotations
 
-  15: optional i32 depth = -1
-  16: optional i64 nextSpanId = -1
+    15: optional i32 depth = -1
+    16: optional i64 nextSpanId = -1
 
-  20: optional string destinationId
+    20: optional string destinationId
 
-  25: optional i32 apiId;
-  26: optional TIntStringValue exceptionInfo;
-  
-  30: optional i32 asyncId;
-  31: optional i32 nextAsyncId;
-  32: optional i16 asyncSequence;
+    25: optional i32 apiId;
+    26: optional TIntStringValue exceptionInfo;
+
+    30: optional i32 asyncId;
+    31: optional i32 nextAsyncId;
+    32: optional i16 asyncSequence;
 }
 
 struct TSpan {
 
-  1: string agentId
-  2: string applicationName
-  3: i64 agentStartTime
+    1: string agentId
+    2: string applicationName
+    3: i64 agentStartTime
 
-  // identical to agentId if null
-  //4: optional string traceAgentId
-  //5: i64 traceAgentStartTime;
-  //6: i64 traceTransactionSequence;
-  4: binary  transactionId;
+    // identical to agentId if null
+    //4: optional string traceAgentId
+    //5: i64 traceAgentStartTime;
+    //6: i64 traceTransactionSequence;
+    4: binary  transactionId;
 
-  7: i64 spanId
-  8: optional i64 parentSpanId = -1
+    7: i64 spanId
+    8: optional i64 parentSpanId = -1
 
-  // span event's startTimestamp
-  9: i64 startTime
-  10: optional i32 elapsed = 0
+    // span event's startTimestamp
+    9: i64 startTime
+    10: optional i32 elapsed = 0
 
-  11: optional string rpc
+    11: optional string rpc
 
-  12: i16 serviceType
-  13: optional string endPoint
-  14: optional string remoteAddr
+    12: i16 serviceType
+    13: optional string endPoint
+    14: optional string remoteAddr
 
-  15: optional list<TAnnotation> annotations
-  16: optional i16 flag = 0
+    15: optional list<TAnnotation> annotations
+    16: optional i16 flag = 0
 
-  17: optional i32 err
+    17: optional i32 err
 
-  18: optional list<TSpanEvent> spanEventList
+    18: optional list<TSpanEvent> spanEventList
 
-  19: optional string parentApplicationName
-  20: optional i16 parentApplicationType
-  21: optional string acceptorHost
+    19: optional string parentApplicationName
+    20: optional i16 parentApplicationType
+    21: optional string acceptorHost
 
-  25: optional i32 apiId;
-  26: optional TIntStringValue exceptionInfo;
+    25: optional i32 apiId;
+    26: optional TIntStringValue exceptionInfo;
   
-  30: optional i16 applicationServiceType;
-  31: optional byte loggingTransactionInfo;
+    30: optional i16 applicationServiceType;
+    31: optional i8 loggingTransactionInfo;
 }
 
 struct TSpanChunk {
-  1: string agentId
-  2: string applicationName
-  3: i64 agentStartTime
+    1: string agentId
+    2: string applicationName
+    3: i64 agentStartTime
 
-  4: i16 serviceType
+    4: i16 serviceType
 
-  // identical to agentId if null
-//  5: optional string traceAgentId
-//  6: i64 traceAgentStartTime;
-//  7: i64 traceTransactionSequence;
+    // identical to agentId if null
+    //5: optional string traceAgentId
+    //6: i64 traceAgentStartTime;
+    //7: i64 traceTransactionSequence;
     5: binary  transactionId;
 
-  8: i64 spanId
+    8: i64 spanId
 
-  9: optional string endPoint
+    9: optional string endPoint
 
-  10: list<TSpanEvent> spanEventList
+    10: list<TSpanEvent> spanEventList
   
-  11: optional i16 applicationServiceType
+    11: optional i16 applicationServiceType
 }
 
 
@@ -147,17 +147,17 @@ struct TSqlMetaData {
 
 
 struct TApiMetaData {
-  1: string agentId
-  2: i64 agentStartTime
+    1: string agentId
+    2: i64 agentStartTime
 
-  4: i32 apiId,
-  5: string apiInfo,
-  6: optional i32 line,
+    4: i32 apiId,
+    5: string apiInfo,
+    6: optional i32 line,
   
-  10: optional i32 type;
+    10: optional i32 type;
 }
 
 struct TResult {
-  1: bool success
-  2: optional string message
+    1: bool success
+    2: optional string message
 }
\ No newline at end of file