From a57e2ab393a78aee7cdba523886ab5364848ff45 Mon Sep 17 00:00:00 2001
From: Chisu Yu <puseori9th@gmail.com>
Date: Tue, 4 Sep 2012 08:37:38 +0000
Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20thrif?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@572 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .classpath                                    |   1 +
 .../com/profiler/context/gen/Annotation.java  | 141 +----
 .../context/gen/BinaryAnnotation.java         | 210 ++-----
 .../com/profiler/context/gen/Endpoint.java    | 107 +---
 .../com/profiler/context/gen/Span.java        | 589 +++++++++++-------
 makethrift.sh                                 |   1 +
 .../java/com/profiler/context/EndPoint.java   |   4 +
 .../com/profiler/context/HippoAnnotation.java |  12 +
 .../context/HippoBinaryAnnotation.java        |  28 +-
 src/main/java/com/profiler/context/Span.java  |  27 +
 src/main/java/com/profiler/context/Trace.java |   5 +-
 .../profiler/util/DefaultTBaseLocator.java    |  50 +-
 thrift/Trace.thrift                           |  24 +-
 13 files changed, 565 insertions(+), 634 deletions(-)
 create mode 100755 makethrift.sh

diff --git a/.classpath b/.classpath
index adedb8f77..8f81dc199 100644
--- a/.classpath
+++ b/.classpath
@@ -20,6 +20,7 @@
   <classpathentry kind="var" path="M2_REPO/com/nhncorp/lucy/lucy-npc/1.5.10/lucy-npc-1.5.10.jar"/>
   <classpathentry kind="var" path="M2_REPO/external/org/apache/mina/mina-core/2.0.0.6-external/mina-core-2.0.0.6-external.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.14/mysql-connector-java-5.1.14.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.8/slf4j-jdk14-1.5.8.jar"/>
diff --git a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Annotation.java b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Annotation.java
index 9430fa830..317d367f3 100644
--- a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Annotation.java
+++ b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Annotation.java
@@ -32,8 +32,7 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
 
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField DURATION_FIELD_DESC = new org.apache.thrift.protocol.TField("duration", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.thrift.protocol.TField DURATION_FIELD_DESC = new org.apache.thrift.protocol.TField("duration", org.apache.thrift.protocol.TType.I64, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -43,15 +42,13 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
 
   private long timestamp; // required
   private String value; // required
-  private Endpoint host; // optional
-  private int duration; // optional
+  private long duration; // 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 {
     TIMESTAMP((short)1, "timestamp"),
     VALUE((short)2, "value"),
-    HOST((short)3, "host"),
-    DURATION((short)4, "duration");
+    DURATION((short)3, "duration");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -70,9 +67,7 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
           return TIMESTAMP;
         case 2: // VALUE
           return VALUE;
-        case 3: // HOST
-          return HOST;
-        case 4: // DURATION
+        case 3: // DURATION
           return DURATION;
         default:
           return null;
@@ -117,7 +112,7 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private static final int __DURATION_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
-  private _Fields optionals[] = {_Fields.HOST,_Fields.DURATION};
+  private _Fields optionals[] = {_Fields.DURATION};
   public static final 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);
@@ -125,10 +120,8 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Endpoint.class)));
     tmpMap.put(_Fields.DURATION, new org.apache.thrift.meta_data.FieldMetaData("duration", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Annotation.class, metaDataMap);
   }
@@ -156,9 +149,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
     if (other.isSetValue()) {
       this.value = other.value;
     }
-    if (other.isSetHost()) {
-      this.host = new Endpoint(other.host);
-    }
     this.duration = other.duration;
   }
 
@@ -171,7 +161,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
     setTimestampIsSet(false);
     this.timestamp = 0;
     this.value = null;
-    this.host = null;
     setDurationIsSet(false);
     this.duration = 0;
   }
@@ -221,34 +210,11 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
     }
   }
 
-  public Endpoint getHost() {
-    return this.host;
-  }
-
-  public void setHost(Endpoint host) {
-    this.host = host;
-  }
-
-  public void unsetHost() {
-    this.host = null;
-  }
-
-  /** Returns true if field host is set (has been assigned a value) and false otherwise */
-  public boolean isSetHost() {
-    return this.host != null;
-  }
-
-  public void setHostIsSet(boolean value) {
-    if (!value) {
-      this.host = null;
-    }
-  }
-
-  public int getDuration() {
+  public long getDuration() {
     return this.duration;
   }
 
-  public void setDuration(int duration) {
+  public void setDuration(long duration) {
     this.duration = duration;
     setDurationIsSet(true);
   }
@@ -284,19 +250,11 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
       }
       break;
 
-    case HOST:
-      if (value == null) {
-        unsetHost();
-      } else {
-        setHost((Endpoint)value);
-      }
-      break;
-
     case DURATION:
       if (value == null) {
         unsetDuration();
       } else {
-        setDuration((Integer)value);
+        setDuration((Long)value);
       }
       break;
 
@@ -311,11 +269,8 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
     case VALUE:
       return getValue();
 
-    case HOST:
-      return getHost();
-
     case DURATION:
-      return Integer.valueOf(getDuration());
+      return Long.valueOf(getDuration());
 
     }
     throw new IllegalStateException();
@@ -332,8 +287,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
       return isSetTimestamp();
     case VALUE:
       return isSetValue();
-    case HOST:
-      return isSetHost();
     case DURATION:
       return isSetDuration();
     }
@@ -371,15 +324,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
         return false;
     }
 
-    boolean this_present_host = true && this.isSetHost();
-    boolean that_present_host = true && that.isSetHost();
-    if (this_present_host || that_present_host) {
-      if (!(this_present_host && that_present_host))
-        return false;
-      if (!this.host.equals(that.host))
-        return false;
-    }
-
     boolean this_present_duration = true && this.isSetDuration();
     boolean that_present_duration = true && that.isSetDuration();
     if (this_present_duration || that_present_duration) {
@@ -425,16 +369,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHost()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetDuration()).compareTo(typedOther.isSetDuration());
     if (lastComparison != 0) {
       return lastComparison;
@@ -476,16 +410,6 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
       sb.append(this.value);
     }
     first = false;
-    if (isSetHost()) {
-      if (!first) sb.append(", ");
-      sb.append("host:");
-      if (this.host == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.host);
-      }
-      first = false;
-    }
     if (isSetDuration()) {
       if (!first) sb.append(", ");
       sb.append("duration:");
@@ -552,18 +476,9 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.host = new Endpoint();
-              struct.host.read(iprot);
-              struct.setHostIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DURATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.duration = iprot.readI32();
+          case 3: // DURATION
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.duration = iprot.readI64();
               struct.setDurationIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -590,16 +505,9 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
         oprot.writeString(struct.value);
         oprot.writeFieldEnd();
       }
-      if (struct.host != null) {
-        if (struct.isSetHost()) {
-          oprot.writeFieldBegin(HOST_FIELD_DESC);
-          struct.host.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
       if (struct.isSetDuration()) {
         oprot.writeFieldBegin(DURATION_FIELD_DESC);
-        oprot.writeI32(struct.duration);
+        oprot.writeI64(struct.duration);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -626,31 +534,25 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
       if (struct.isSetValue()) {
         optionals.set(1);
       }
-      if (struct.isSetHost()) {
+      if (struct.isSetDuration()) {
         optionals.set(2);
       }
-      if (struct.isSetDuration()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetTimestamp()) {
         oprot.writeI64(struct.timestamp);
       }
       if (struct.isSetValue()) {
         oprot.writeString(struct.value);
       }
-      if (struct.isSetHost()) {
-        struct.host.write(oprot);
-      }
       if (struct.isSetDuration()) {
-        oprot.writeI32(struct.duration);
+        oprot.writeI64(struct.duration);
       }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.timestamp = iprot.readI64();
         struct.setTimestampIsSet(true);
@@ -660,12 +562,7 @@ public class Annotation implements org.apache.thrift.TBase<Annotation, Annotatio
         struct.setValueIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.host = new Endpoint();
-        struct.host.read(iprot);
-        struct.setHostIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.duration = iprot.readI32();
+        struct.duration = iprot.readI64();
         struct.setDurationIsSet(true);
       }
     }
diff --git a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/BinaryAnnotation.java b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/BinaryAnnotation.java
index 1d77854ba..2276e716d 100644
--- a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/BinaryAnnotation.java
+++ b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/BinaryAnnotation.java
@@ -33,8 +33,7 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField ANNOTATION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("annotationType", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+  private static final org.apache.thrift.protocol.TField VALUE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("valueType", org.apache.thrift.protocol.TType.STRING, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -45,16 +44,14 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
   private long timestamp; // required
   private String key; // required
   private ByteBuffer value; // required
-  private String annotationType; // required
-  private Endpoint host; // optional
+  private String valueType; // 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 {
     TIMESTAMP((short)1, "timestamp"),
     KEY((short)2, "key"),
     VALUE((short)3, "value"),
-    ANNOTATION_TYPE((short)4, "annotationType"),
-    HOST((short)5, "host");
+    VALUE_TYPE((short)4, "valueType");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -75,10 +72,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
           return KEY;
         case 3: // VALUE
           return VALUE;
-        case 4: // ANNOTATION_TYPE
-          return ANNOTATION_TYPE;
-        case 5: // HOST
-          return HOST;
+        case 4: // VALUE_TYPE
+          return VALUE_TYPE;
         default:
           return null;
       }
@@ -121,7 +116,6 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
   // isset id assignments
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
-  private _Fields optionals[] = {_Fields.HOST};
   public static final 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);
@@ -131,10 +125,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.ANNOTATION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("annotationType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("valueType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Endpoint.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BinaryAnnotation.class, metaDataMap);
   }
@@ -146,14 +138,14 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
     long timestamp,
     String key,
     ByteBuffer value,
-    String annotationType)
+    String valueType)
   {
     this();
     this.timestamp = timestamp;
     setTimestampIsSet(true);
     this.key = key;
     this.value = value;
-    this.annotationType = annotationType;
+    this.valueType = valueType;
   }
 
   /**
@@ -170,11 +162,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
       this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value);
 ;
     }
-    if (other.isSetAnnotationType()) {
-      this.annotationType = other.annotationType;
-    }
-    if (other.isSetHost()) {
-      this.host = new Endpoint(other.host);
+    if (other.isSetValueType()) {
+      this.valueType = other.valueType;
     }
   }
 
@@ -188,8 +177,7 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
     this.timestamp = 0;
     this.key = null;
     this.value = null;
-    this.annotationType = null;
-    this.host = null;
+    this.valueType = null;
   }
 
   public long getTimestamp() {
@@ -269,49 +257,26 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
     }
   }
 
-  public String getAnnotationType() {
-    return this.annotationType;
+  public String getValueType() {
+    return this.valueType;
   }
 
-  public void setAnnotationType(String annotationType) {
-    this.annotationType = annotationType;
+  public void setValueType(String valueType) {
+    this.valueType = valueType;
   }
 
-  public void unsetAnnotationType() {
-    this.annotationType = null;
+  public void unsetValueType() {
+    this.valueType = null;
   }
 
-  /** Returns true if field annotationType is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnnotationType() {
-    return this.annotationType != null;
+  /** Returns true if field valueType is set (has been assigned a value) and false otherwise */
+  public boolean isSetValueType() {
+    return this.valueType != null;
   }
 
-  public void setAnnotationTypeIsSet(boolean value) {
+  public void setValueTypeIsSet(boolean value) {
     if (!value) {
-      this.annotationType = null;
-    }
-  }
-
-  public Endpoint getHost() {
-    return this.host;
-  }
-
-  public void setHost(Endpoint host) {
-    this.host = host;
-  }
-
-  public void unsetHost() {
-    this.host = null;
-  }
-
-  /** Returns true if field host is set (has been assigned a value) and false otherwise */
-  public boolean isSetHost() {
-    return this.host != null;
-  }
-
-  public void setHostIsSet(boolean value) {
-    if (!value) {
-      this.host = null;
+      this.valueType = null;
     }
   }
 
@@ -341,19 +306,11 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
       }
       break;
 
-    case ANNOTATION_TYPE:
+    case VALUE_TYPE:
       if (value == null) {
-        unsetAnnotationType();
+        unsetValueType();
       } else {
-        setAnnotationType((String)value);
-      }
-      break;
-
-    case HOST:
-      if (value == null) {
-        unsetHost();
-      } else {
-        setHost((Endpoint)value);
+        setValueType((String)value);
       }
       break;
 
@@ -371,11 +328,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
     case VALUE:
       return getValue();
 
-    case ANNOTATION_TYPE:
-      return getAnnotationType();
-
-    case HOST:
-      return getHost();
+    case VALUE_TYPE:
+      return getValueType();
 
     }
     throw new IllegalStateException();
@@ -394,10 +348,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
       return isSetKey();
     case VALUE:
       return isSetValue();
-    case ANNOTATION_TYPE:
-      return isSetAnnotationType();
-    case HOST:
-      return isSetHost();
+    case VALUE_TYPE:
+      return isSetValueType();
     }
     throw new IllegalStateException();
   }
@@ -442,21 +394,12 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
         return false;
     }
 
-    boolean this_present_annotationType = true && this.isSetAnnotationType();
-    boolean that_present_annotationType = true && that.isSetAnnotationType();
-    if (this_present_annotationType || that_present_annotationType) {
-      if (!(this_present_annotationType && that_present_annotationType))
+    boolean this_present_valueType = true && this.isSetValueType();
+    boolean that_present_valueType = true && that.isSetValueType();
+    if (this_present_valueType || that_present_valueType) {
+      if (!(this_present_valueType && that_present_valueType))
         return false;
-      if (!this.annotationType.equals(that.annotationType))
-        return false;
-    }
-
-    boolean this_present_host = true && this.isSetHost();
-    boolean that_present_host = true && that.isSetHost();
-    if (this_present_host || that_present_host) {
-      if (!(this_present_host && that_present_host))
-        return false;
-      if (!this.host.equals(that.host))
+      if (!this.valueType.equals(that.valueType))
         return false;
     }
 
@@ -506,22 +449,12 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAnnotationType()).compareTo(typedOther.isSetAnnotationType());
+    lastComparison = Boolean.valueOf(isSetValueType()).compareTo(typedOther.isSetValueType());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAnnotationType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.annotationType, typedOther.annotationType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHost()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+    if (isSetValueType()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.valueType, typedOther.valueType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -566,23 +499,13 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("annotationType:");
-    if (this.annotationType == null) {
+    sb.append("valueType:");
+    if (this.valueType == null) {
       sb.append("null");
     } else {
-      sb.append(this.annotationType);
+      sb.append(this.valueType);
     }
     first = false;
-    if (isSetHost()) {
-      if (!first) sb.append(", ");
-      sb.append("host:");
-      if (this.host == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.host);
-      }
-      first = false;
-    }
     sb.append(")");
     return sb.toString();
   }
@@ -651,19 +574,10 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // ANNOTATION_TYPE
+          case 4: // VALUE_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.annotationType = iprot.readString();
-              struct.setAnnotationTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.host = new Endpoint();
-              struct.host.read(iprot);
-              struct.setHostIsSet(true);
+              struct.valueType = iprot.readString();
+              struct.setValueTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -694,18 +608,11 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
         oprot.writeBinary(struct.value);
         oprot.writeFieldEnd();
       }
-      if (struct.annotationType != null) {
-        oprot.writeFieldBegin(ANNOTATION_TYPE_FIELD_DESC);
-        oprot.writeString(struct.annotationType);
+      if (struct.valueType != null) {
+        oprot.writeFieldBegin(VALUE_TYPE_FIELD_DESC);
+        oprot.writeString(struct.valueType);
         oprot.writeFieldEnd();
       }
-      if (struct.host != null) {
-        if (struct.isSetHost()) {
-          oprot.writeFieldBegin(HOST_FIELD_DESC);
-          struct.host.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -733,13 +640,10 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
       if (struct.isSetValue()) {
         optionals.set(2);
       }
-      if (struct.isSetAnnotationType()) {
+      if (struct.isSetValueType()) {
         optionals.set(3);
       }
-      if (struct.isSetHost()) {
-        optionals.set(4);
-      }
-      oprot.writeBitSet(optionals, 5);
+      oprot.writeBitSet(optionals, 4);
       if (struct.isSetTimestamp()) {
         oprot.writeI64(struct.timestamp);
       }
@@ -749,18 +653,15 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
       if (struct.isSetValue()) {
         oprot.writeBinary(struct.value);
       }
-      if (struct.isSetAnnotationType()) {
-        oprot.writeString(struct.annotationType);
-      }
-      if (struct.isSetHost()) {
-        struct.host.write(oprot);
+      if (struct.isSetValueType()) {
+        oprot.writeString(struct.valueType);
       }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, BinaryAnnotation struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(5);
+      BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.timestamp = iprot.readI64();
         struct.setTimestampIsSet(true);
@@ -774,13 +675,8 @@ public class BinaryAnnotation implements org.apache.thrift.TBase<BinaryAnnotatio
         struct.setValueIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.annotationType = iprot.readString();
-        struct.setAnnotationTypeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.host = new Endpoint();
-        struct.host.read(iprot);
-        struct.setHostIsSet(true);
+        struct.valueType = iprot.readString();
+        struct.setValueTypeIsSet(true);
       }
     }
   }
diff --git a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Endpoint.java b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Endpoint.java
index 4b4437072..e39307e14 100644
--- a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Endpoint.java
+++ b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Endpoint.java
@@ -32,7 +32,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
 
   private static final org.apache.thrift.protocol.TField IP_FIELD_DESC = new org.apache.thrift.protocol.TField("ip", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I16, (short)2);
-  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)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -42,13 +41,11 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
 
   private String ip; // required
   private short port; // required
-  private String name; // 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 {
     IP((short)1, "ip"),
-    PORT((short)2, "port"),
-    NAME((short)3, "name");
+    PORT((short)2, "port");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -67,8 +64,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
           return IP;
         case 2: // PORT
           return PORT;
-        case 3: // NAME
-          return NAME;
         default:
           return null;
       }
@@ -118,8 +113,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Endpoint.class, metaDataMap);
   }
@@ -129,14 +122,12 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
 
   public Endpoint(
     String ip,
-    short port,
-    String name)
+    short port)
   {
     this();
     this.ip = ip;
     this.port = port;
     setPortIsSet(true);
-    this.name = name;
   }
 
   /**
@@ -149,9 +140,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
       this.ip = other.ip;
     }
     this.port = other.port;
-    if (other.isSetName()) {
-      this.name = other.name;
-    }
   }
 
   public Endpoint deepCopy() {
@@ -163,7 +151,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
     this.ip = null;
     setPortIsSet(false);
     this.port = 0;
-    this.name = null;
   }
 
   public String getIp() {
@@ -211,29 +198,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
     __isset_bit_vector.set(__PORT_ISSET_ID, value);
   }
 
-  public String getName() {
-    return this.name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public void unsetName() {
-    this.name = null;
-  }
-
-  /** Returns true if field name is set (has been assigned a value) and false otherwise */
-  public boolean isSetName() {
-    return this.name != null;
-  }
-
-  public void setNameIsSet(boolean value) {
-    if (!value) {
-      this.name = null;
-    }
-  }
-
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case IP:
@@ -252,14 +216,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
       }
       break;
 
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((String)value);
-      }
-      break;
-
     }
   }
 
@@ -271,9 +227,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
     case PORT:
       return Short.valueOf(getPort());
 
-    case NAME:
-      return getName();
-
     }
     throw new IllegalStateException();
   }
@@ -289,8 +242,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
       return isSetIp();
     case PORT:
       return isSetPort();
-    case NAME:
-      return isSetName();
     }
     throw new IllegalStateException();
   }
@@ -326,15 +277,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
         return false;
     }
 
-    boolean this_present_name = true && this.isSetName();
-    boolean that_present_name = true && that.isSetName();
-    if (this_present_name || that_present_name) {
-      if (!(this_present_name && that_present_name))
-        return false;
-      if (!this.name.equals(that.name))
-        return false;
-    }
-
     return true;
   }
 
@@ -371,16 +313,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     return 0;
   }
 
@@ -412,14 +344,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
     sb.append("port:");
     sb.append(this.port);
     first = false;
-    if (!first) sb.append(", ");
-    sb.append("name:");
-    if (this.name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.name);
-    }
-    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -480,14 +404,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -509,11 +425,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
       oprot.writeFieldBegin(PORT_FIELD_DESC);
       oprot.writeI16(struct.port);
       oprot.writeFieldEnd();
-      if (struct.name != null) {
-        oprot.writeFieldBegin(NAME_FIELD_DESC);
-        oprot.writeString(struct.name);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -538,25 +449,19 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
       if (struct.isSetPort()) {
         optionals.set(1);
       }
-      if (struct.isSetName()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
+      oprot.writeBitSet(optionals, 2);
       if (struct.isSetIp()) {
         oprot.writeString(struct.ip);
       }
       if (struct.isSetPort()) {
         oprot.writeI16(struct.port);
       }
-      if (struct.isSetName()) {
-        oprot.writeString(struct.name);
-      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Endpoint struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.ip = iprot.readString();
         struct.setIpIsSet(true);
@@ -565,10 +470,6 @@ public class Endpoint implements org.apache.thrift.TBase<Endpoint, Endpoint._Fie
         struct.port = iprot.readI16();
         struct.setPortIsSet(true);
       }
-      if (incoming.get(2)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
     }
   }
 
diff --git a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Span.java b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Span.java
index fb7875ff2..b9c72ecf9 100644
--- a/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Span.java
+++ b/generated-sources/thrift/gen-javabean/com/profiler/context/gen/Span.java
@@ -30,13 +30,15 @@ import org.slf4j.LoggerFactory;
 public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Span");
 
-  private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  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 SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("spanID", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField PARENT_SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentSpanId", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("annotations", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField BINARY_ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryAnnotations", org.apache.thrift.protocol.TType.LIST, (short)6);
-  private static final org.apache.thrift.protocol.TField DEBUG_FIELD_DESC = new org.apache.thrift.protocol.TField("debug", org.apache.thrift.protocol.TType.BOOL, (short)7);
+  private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField MOST_TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("mostTraceID", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.thrift.protocol.TField LEAST_TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("leastTraceID", org.apache.thrift.protocol.TType.I64, (short)3);
+  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)4);
+  private static final org.apache.thrift.protocol.TField SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("spanID", org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField PARENT_SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentSpanId", org.apache.thrift.protocol.TType.I64, (short)6);
+  private static final org.apache.thrift.protocol.TField ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("annotations", org.apache.thrift.protocol.TType.LIST, (short)7);
+  private static final org.apache.thrift.protocol.TField BINARY_ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryAnnotations", org.apache.thrift.protocol.TType.LIST, (short)8);
+  private static final org.apache.thrift.protocol.TField FLAG_FIELD_DESC = new org.apache.thrift.protocol.TField("flag", org.apache.thrift.protocol.TType.I32, (short)9);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -44,23 +46,27 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     schemes.put(TupleScheme.class, new SpanTupleSchemeFactory());
   }
 
-  private String traceID; // required
+  private long timestamp; // required
+  private long mostTraceID; // required
+  private long leastTraceID; // required
   private String name; // required
-  private String spanID; // required
-  private String parentSpanId; // optional
+  private long spanID; // required
+  private long parentSpanId; // optional
   private List<Annotation> annotations; // required
   private List<BinaryAnnotation> binaryAnnotations; // required
-  private boolean debug; // optional
+  private int flag; // 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 {
-    TRACE_ID((short)1, "traceID"),
-    NAME((short)2, "name"),
-    SPAN_ID((short)3, "spanID"),
-    PARENT_SPAN_ID((short)4, "parentSpanId"),
-    ANNOTATIONS((short)5, "annotations"),
-    BINARY_ANNOTATIONS((short)6, "binaryAnnotations"),
-    DEBUG((short)7, "debug");
+    TIMESTAMP((short)1, "timestamp"),
+    MOST_TRACE_ID((short)2, "mostTraceID"),
+    LEAST_TRACE_ID((short)3, "leastTraceID"),
+    NAME((short)4, "name"),
+    SPAN_ID((short)5, "spanID"),
+    PARENT_SPAN_ID((short)6, "parentSpanId"),
+    ANNOTATIONS((short)7, "annotations"),
+    BINARY_ANNOTATIONS((short)8, "binaryAnnotations"),
+    FLAG((short)9, "flag");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -75,20 +81,24 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // TRACE_ID
-          return TRACE_ID;
-        case 2: // NAME
+        case 1: // TIMESTAMP
+          return TIMESTAMP;
+        case 2: // MOST_TRACE_ID
+          return MOST_TRACE_ID;
+        case 3: // LEAST_TRACE_ID
+          return LEAST_TRACE_ID;
+        case 4: // NAME
           return NAME;
-        case 3: // SPAN_ID
+        case 5: // SPAN_ID
           return SPAN_ID;
-        case 4: // PARENT_SPAN_ID
+        case 6: // PARENT_SPAN_ID
           return PARENT_SPAN_ID;
-        case 5: // ANNOTATIONS
+        case 7: // ANNOTATIONS
           return ANNOTATIONS;
-        case 6: // BINARY_ANNOTATIONS
+        case 8: // BINARY_ANNOTATIONS
           return BINARY_ANNOTATIONS;
-        case 7: // DEBUG
-          return DEBUG;
+        case 9: // FLAG
+          return FLAG;
         default:
           return null;
       }
@@ -129,48 +139,65 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
   }
 
   // isset id assignments
-  private static final int __DEBUG_ISSET_ID = 0;
-  private BitSet __isset_bit_vector = new BitSet(1);
-  private _Fields optionals[] = {_Fields.PARENT_SPAN_ID,_Fields.DEBUG};
+  private static final int __TIMESTAMP_ISSET_ID = 0;
+  private static final int __MOSTTRACEID_ISSET_ID = 1;
+  private static final int __LEASTTRACEID_ISSET_ID = 2;
+  private static final int __SPANID_ISSET_ID = 3;
+  private static final int __PARENTSPANID_ISSET_ID = 4;
+  private static final int __FLAG_ISSET_ID = 5;
+  private BitSet __isset_bit_vector = new BitSet(6);
+  private _Fields optionals[] = {_Fields.PARENT_SPAN_ID,_Fields.FLAG};
   public static final 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.TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("traceID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.MOST_TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("mostTraceID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.LEAST_TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("leastTraceID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SPAN_ID, new org.apache.thrift.meta_data.FieldMetaData("spanID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.PARENT_SPAN_ID, new org.apache.thrift.meta_data.FieldMetaData("parentSpanId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.ANNOTATIONS, new org.apache.thrift.meta_data.FieldMetaData("annotations", 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, Annotation.class))));
     tmpMap.put(_Fields.BINARY_ANNOTATIONS, new org.apache.thrift.meta_data.FieldMetaData("binaryAnnotations", 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, BinaryAnnotation.class))));
-    tmpMap.put(_Fields.DEBUG, new org.apache.thrift.meta_data.FieldMetaData("debug", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.FLAG, new org.apache.thrift.meta_data.FieldMetaData("flag", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Span.class, metaDataMap);
   }
 
   public Span() {
-    this.debug = false;
+    this.flag = 0;
 
   }
 
   public Span(
-    String traceID,
+    long timestamp,
+    long mostTraceID,
+    long leastTraceID,
     String name,
-    String spanID,
+    long spanID,
     List<Annotation> annotations,
     List<BinaryAnnotation> binaryAnnotations)
   {
     this();
-    this.traceID = traceID;
+    this.timestamp = timestamp;
+    setTimestampIsSet(true);
+    this.mostTraceID = mostTraceID;
+    setMostTraceIDIsSet(true);
+    this.leastTraceID = leastTraceID;
+    setLeastTraceIDIsSet(true);
     this.name = name;
     this.spanID = spanID;
+    setSpanIDIsSet(true);
     this.annotations = annotations;
     this.binaryAnnotations = binaryAnnotations;
   }
@@ -181,18 +208,14 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
   public Span(Span other) {
     __isset_bit_vector.clear();
     __isset_bit_vector.or(other.__isset_bit_vector);
-    if (other.isSetTraceID()) {
-      this.traceID = other.traceID;
-    }
+    this.timestamp = other.timestamp;
+    this.mostTraceID = other.mostTraceID;
+    this.leastTraceID = other.leastTraceID;
     if (other.isSetName()) {
       this.name = other.name;
     }
-    if (other.isSetSpanID()) {
-      this.spanID = other.spanID;
-    }
-    if (other.isSetParentSpanId()) {
-      this.parentSpanId = other.parentSpanId;
-    }
+    this.spanID = other.spanID;
+    this.parentSpanId = other.parentSpanId;
     if (other.isSetAnnotations()) {
       List<Annotation> __this__annotations = new ArrayList<Annotation>();
       for (Annotation other_element : other.annotations) {
@@ -207,7 +230,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       }
       this.binaryAnnotations = __this__binaryAnnotations;
     }
-    this.debug = other.debug;
+    this.flag = other.flag;
   }
 
   public Span deepCopy() {
@@ -216,37 +239,87 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
 
   @Override
   public void clear() {
-    this.traceID = null;
+    setTimestampIsSet(false);
+    this.timestamp = 0;
+    setMostTraceIDIsSet(false);
+    this.mostTraceID = 0;
+    setLeastTraceIDIsSet(false);
+    this.leastTraceID = 0;
     this.name = null;
-    this.spanID = null;
-    this.parentSpanId = null;
+    setSpanIDIsSet(false);
+    this.spanID = 0;
+    setParentSpanIdIsSet(false);
+    this.parentSpanId = 0;
     this.annotations = null;
     this.binaryAnnotations = null;
-    this.debug = false;
+    this.flag = 0;
 
   }
 
-  public String getTraceID() {
-    return this.traceID;
+  public long getTimestamp() {
+    return this.timestamp;
   }
 
-  public void setTraceID(String traceID) {
-    this.traceID = traceID;
+  public void setTimestamp(long timestamp) {
+    this.timestamp = timestamp;
+    setTimestampIsSet(true);
   }
 
-  public void unsetTraceID() {
-    this.traceID = null;
+  public void unsetTimestamp() {
+    __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID);
   }
 
-  /** Returns true if field traceID is set (has been assigned a value) and false otherwise */
-  public boolean isSetTraceID() {
-    return this.traceID != null;
+  /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
+  public boolean isSetTimestamp() {
+    return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID);
   }
 
-  public void setTraceIDIsSet(boolean value) {
-    if (!value) {
-      this.traceID = null;
-    }
+  public void setTimestampIsSet(boolean value) {
+    __isset_bit_vector.set(__TIMESTAMP_ISSET_ID, value);
+  }
+
+  public long getMostTraceID() {
+    return this.mostTraceID;
+  }
+
+  public void setMostTraceID(long mostTraceID) {
+    this.mostTraceID = mostTraceID;
+    setMostTraceIDIsSet(true);
+  }
+
+  public void unsetMostTraceID() {
+    __isset_bit_vector.clear(__MOSTTRACEID_ISSET_ID);
+  }
+
+  /** Returns true if field mostTraceID is set (has been assigned a value) and false otherwise */
+  public boolean isSetMostTraceID() {
+    return __isset_bit_vector.get(__MOSTTRACEID_ISSET_ID);
+  }
+
+  public void setMostTraceIDIsSet(boolean value) {
+    __isset_bit_vector.set(__MOSTTRACEID_ISSET_ID, value);
+  }
+
+  public long getLeastTraceID() {
+    return this.leastTraceID;
+  }
+
+  public void setLeastTraceID(long leastTraceID) {
+    this.leastTraceID = leastTraceID;
+    setLeastTraceIDIsSet(true);
+  }
+
+  public void unsetLeastTraceID() {
+    __isset_bit_vector.clear(__LEASTTRACEID_ISSET_ID);
+  }
+
+  /** Returns true if field leastTraceID is set (has been assigned a value) and false otherwise */
+  public boolean isSetLeastTraceID() {
+    return __isset_bit_vector.get(__LEASTTRACEID_ISSET_ID);
+  }
+
+  public void setLeastTraceIDIsSet(boolean value) {
+    __isset_bit_vector.set(__LEASTTRACEID_ISSET_ID, value);
   }
 
   public String getName() {
@@ -272,50 +345,48 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     }
   }
 
-  public String getSpanID() {
+  public long getSpanID() {
     return this.spanID;
   }
 
-  public void setSpanID(String spanID) {
+  public void setSpanID(long spanID) {
     this.spanID = spanID;
+    setSpanIDIsSet(true);
   }
 
   public void unsetSpanID() {
-    this.spanID = null;
+    __isset_bit_vector.clear(__SPANID_ISSET_ID);
   }
 
   /** Returns true if field spanID is set (has been assigned a value) and false otherwise */
   public boolean isSetSpanID() {
-    return this.spanID != null;
+    return __isset_bit_vector.get(__SPANID_ISSET_ID);
   }
 
   public void setSpanIDIsSet(boolean value) {
-    if (!value) {
-      this.spanID = null;
-    }
+    __isset_bit_vector.set(__SPANID_ISSET_ID, value);
   }
 
-  public String getParentSpanId() {
+  public long getParentSpanId() {
     return this.parentSpanId;
   }
 
-  public void setParentSpanId(String parentSpanId) {
+  public void setParentSpanId(long parentSpanId) {
     this.parentSpanId = parentSpanId;
+    setParentSpanIdIsSet(true);
   }
 
   public void unsetParentSpanId() {
-    this.parentSpanId = null;
+    __isset_bit_vector.clear(__PARENTSPANID_ISSET_ID);
   }
 
   /** Returns true if field parentSpanId is set (has been assigned a value) and false otherwise */
   public boolean isSetParentSpanId() {
-    return this.parentSpanId != null;
+    return __isset_bit_vector.get(__PARENTSPANID_ISSET_ID);
   }
 
   public void setParentSpanIdIsSet(boolean value) {
-    if (!value) {
-      this.parentSpanId = null;
-    }
+    __isset_bit_vector.set(__PARENTSPANID_ISSET_ID, value);
   }
 
   public int getAnnotationsSize() {
@@ -394,35 +465,51 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     }
   }
 
-  public boolean isDebug() {
-    return this.debug;
+  public int getFlag() {
+    return this.flag;
   }
 
-  public void setDebug(boolean debug) {
-    this.debug = debug;
-    setDebugIsSet(true);
+  public void setFlag(int flag) {
+    this.flag = flag;
+    setFlagIsSet(true);
   }
 
-  public void unsetDebug() {
-    __isset_bit_vector.clear(__DEBUG_ISSET_ID);
+  public void unsetFlag() {
+    __isset_bit_vector.clear(__FLAG_ISSET_ID);
   }
 
-  /** Returns true if field debug is set (has been assigned a value) and false otherwise */
-  public boolean isSetDebug() {
-    return __isset_bit_vector.get(__DEBUG_ISSET_ID);
+  /** Returns true if field flag is set (has been assigned a value) and false otherwise */
+  public boolean isSetFlag() {
+    return __isset_bit_vector.get(__FLAG_ISSET_ID);
   }
 
-  public void setDebugIsSet(boolean value) {
-    __isset_bit_vector.set(__DEBUG_ISSET_ID, value);
+  public void setFlagIsSet(boolean value) {
+    __isset_bit_vector.set(__FLAG_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case TRACE_ID:
+    case TIMESTAMP:
       if (value == null) {
-        unsetTraceID();
+        unsetTimestamp();
       } else {
-        setTraceID((String)value);
+        setTimestamp((Long)value);
+      }
+      break;
+
+    case MOST_TRACE_ID:
+      if (value == null) {
+        unsetMostTraceID();
+      } else {
+        setMostTraceID((Long)value);
+      }
+      break;
+
+    case LEAST_TRACE_ID:
+      if (value == null) {
+        unsetLeastTraceID();
+      } else {
+        setLeastTraceID((Long)value);
       }
       break;
 
@@ -438,7 +525,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       if (value == null) {
         unsetSpanID();
       } else {
-        setSpanID((String)value);
+        setSpanID((Long)value);
       }
       break;
 
@@ -446,7 +533,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       if (value == null) {
         unsetParentSpanId();
       } else {
-        setParentSpanId((String)value);
+        setParentSpanId((Long)value);
       }
       break;
 
@@ -466,11 +553,11 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       }
       break;
 
-    case DEBUG:
+    case FLAG:
       if (value == null) {
-        unsetDebug();
+        unsetFlag();
       } else {
-        setDebug((Boolean)value);
+        setFlag((Integer)value);
       }
       break;
 
@@ -479,17 +566,23 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case TRACE_ID:
-      return getTraceID();
+    case TIMESTAMP:
+      return Long.valueOf(getTimestamp());
+
+    case MOST_TRACE_ID:
+      return Long.valueOf(getMostTraceID());
+
+    case LEAST_TRACE_ID:
+      return Long.valueOf(getLeastTraceID());
 
     case NAME:
       return getName();
 
     case SPAN_ID:
-      return getSpanID();
+      return Long.valueOf(getSpanID());
 
     case PARENT_SPAN_ID:
-      return getParentSpanId();
+      return Long.valueOf(getParentSpanId());
 
     case ANNOTATIONS:
       return getAnnotations();
@@ -497,8 +590,8 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     case BINARY_ANNOTATIONS:
       return getBinaryAnnotations();
 
-    case DEBUG:
-      return Boolean.valueOf(isDebug());
+    case FLAG:
+      return Integer.valueOf(getFlag());
 
     }
     throw new IllegalStateException();
@@ -511,8 +604,12 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     }
 
     switch (field) {
-    case TRACE_ID:
-      return isSetTraceID();
+    case TIMESTAMP:
+      return isSetTimestamp();
+    case MOST_TRACE_ID:
+      return isSetMostTraceID();
+    case LEAST_TRACE_ID:
+      return isSetLeastTraceID();
     case NAME:
       return isSetName();
     case SPAN_ID:
@@ -523,8 +620,8 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       return isSetAnnotations();
     case BINARY_ANNOTATIONS:
       return isSetBinaryAnnotations();
-    case DEBUG:
-      return isSetDebug();
+    case FLAG:
+      return isSetFlag();
     }
     throw new IllegalStateException();
   }
@@ -542,12 +639,30 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     if (that == null)
       return false;
 
-    boolean this_present_traceID = true && this.isSetTraceID();
-    boolean that_present_traceID = true && that.isSetTraceID();
-    if (this_present_traceID || that_present_traceID) {
-      if (!(this_present_traceID && that_present_traceID))
+    boolean this_present_timestamp = true;
+    boolean that_present_timestamp = true;
+    if (this_present_timestamp || that_present_timestamp) {
+      if (!(this_present_timestamp && that_present_timestamp))
         return false;
-      if (!this.traceID.equals(that.traceID))
+      if (this.timestamp != that.timestamp)
+        return false;
+    }
+
+    boolean this_present_mostTraceID = true;
+    boolean that_present_mostTraceID = true;
+    if (this_present_mostTraceID || that_present_mostTraceID) {
+      if (!(this_present_mostTraceID && that_present_mostTraceID))
+        return false;
+      if (this.mostTraceID != that.mostTraceID)
+        return false;
+    }
+
+    boolean this_present_leastTraceID = true;
+    boolean that_present_leastTraceID = true;
+    if (this_present_leastTraceID || that_present_leastTraceID) {
+      if (!(this_present_leastTraceID && that_present_leastTraceID))
+        return false;
+      if (this.leastTraceID != that.leastTraceID)
         return false;
     }
 
@@ -560,12 +675,12 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         return false;
     }
 
-    boolean this_present_spanID = true && this.isSetSpanID();
-    boolean that_present_spanID = true && that.isSetSpanID();
+    boolean this_present_spanID = true;
+    boolean that_present_spanID = true;
     if (this_present_spanID || that_present_spanID) {
       if (!(this_present_spanID && that_present_spanID))
         return false;
-      if (!this.spanID.equals(that.spanID))
+      if (this.spanID != that.spanID)
         return false;
     }
 
@@ -574,7 +689,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     if (this_present_parentSpanId || that_present_parentSpanId) {
       if (!(this_present_parentSpanId && that_present_parentSpanId))
         return false;
-      if (!this.parentSpanId.equals(that.parentSpanId))
+      if (this.parentSpanId != that.parentSpanId)
         return false;
     }
 
@@ -596,12 +711,12 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         return false;
     }
 
-    boolean this_present_debug = true && this.isSetDebug();
-    boolean that_present_debug = true && that.isSetDebug();
-    if (this_present_debug || that_present_debug) {
-      if (!(this_present_debug && that_present_debug))
+    boolean this_present_flag = true && this.isSetFlag();
+    boolean that_present_flag = true && that.isSetFlag();
+    if (this_present_flag || that_present_flag) {
+      if (!(this_present_flag && that_present_flag))
         return false;
-      if (this.debug != that.debug)
+      if (this.flag != that.flag)
         return false;
     }
 
@@ -621,12 +736,32 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     int lastComparison = 0;
     Span typedOther = (Span)other;
 
-    lastComparison = Boolean.valueOf(isSetTraceID()).compareTo(typedOther.isSetTraceID());
+    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetTraceID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceID, typedOther.traceID);
+    if (isSetTimestamp()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetMostTraceID()).compareTo(typedOther.isSetMostTraceID());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMostTraceID()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mostTraceID, typedOther.mostTraceID);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLeastTraceID()).compareTo(typedOther.isSetLeastTraceID());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLeastTraceID()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.leastTraceID, typedOther.leastTraceID);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -681,12 +816,12 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDebug()).compareTo(typedOther.isSetDebug());
+    lastComparison = Boolean.valueOf(isSetFlag()).compareTo(typedOther.isSetFlag());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetDebug()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.debug, typedOther.debug);
+    if (isSetFlag()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flag, typedOther.flag);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -711,12 +846,16 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     StringBuilder sb = new StringBuilder("Span(");
     boolean first = true;
 
-    sb.append("traceID:");
-    if (this.traceID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.traceID);
-    }
+    sb.append("timestamp:");
+    sb.append(this.timestamp);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("mostTraceID:");
+    sb.append(this.mostTraceID);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("leastTraceID:");
+    sb.append(this.leastTraceID);
     first = false;
     if (!first) sb.append(", ");
     sb.append("name:");
@@ -728,20 +867,12 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     first = false;
     if (!first) sb.append(", ");
     sb.append("spanID:");
-    if (this.spanID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.spanID);
-    }
+    sb.append(this.spanID);
     first = false;
     if (isSetParentSpanId()) {
       if (!first) sb.append(", ");
       sb.append("parentSpanId:");
-      if (this.parentSpanId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.parentSpanId);
-      }
+      sb.append(this.parentSpanId);
       first = false;
     }
     if (!first) sb.append(", ");
@@ -760,10 +891,10 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       sb.append(this.binaryAnnotations);
     }
     first = false;
-    if (isSetDebug()) {
+    if (isSetFlag()) {
       if (!first) sb.append(", ");
-      sb.append("debug:");
-      sb.append(this.debug);
+      sb.append("flag:");
+      sb.append(this.flag);
       first = false;
     }
     sb.append(")");
@@ -810,15 +941,31 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
           break;
         }
         switch (schemeField.id) {
-          case 1: // TRACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.traceID = iprot.readString();
-              struct.setTraceIDIsSet(true);
+          case 1: // TIMESTAMP
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.timestamp = iprot.readI64();
+              struct.setTimestampIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // NAME
+          case 2: // MOST_TRACE_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.mostTraceID = iprot.readI64();
+              struct.setMostTraceIDIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // LEAST_TRACE_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.leastTraceID = iprot.readI64();
+              struct.setLeastTraceIDIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // NAME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.setNameIsSet(true);
@@ -826,23 +973,23 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // SPAN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.spanID = iprot.readString();
+          case 5: // SPAN_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.spanID = iprot.readI64();
               struct.setSpanIDIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // PARENT_SPAN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parentSpanId = iprot.readString();
+          case 6: // PARENT_SPAN_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.parentSpanId = iprot.readI64();
               struct.setParentSpanIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // ANNOTATIONS
+          case 7: // ANNOTATIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -861,7 +1008,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 6: // BINARY_ANNOTATIONS
+          case 8: // BINARY_ANNOTATIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -880,10 +1027,10 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 7: // DEBUG
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.debug = iprot.readBool();
-              struct.setDebugIsSet(true);
+          case 9: // FLAG
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.flag = iprot.readI32();
+              struct.setFlagIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -901,28 +1048,28 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.traceID != null) {
-        oprot.writeFieldBegin(TRACE_ID_FIELD_DESC);
-        oprot.writeString(struct.traceID);
-        oprot.writeFieldEnd();
-      }
+      oprot.writeFieldBegin(TIMESTAMP_FIELD_DESC);
+      oprot.writeI64(struct.timestamp);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(MOST_TRACE_ID_FIELD_DESC);
+      oprot.writeI64(struct.mostTraceID);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(LEAST_TRACE_ID_FIELD_DESC);
+      oprot.writeI64(struct.leastTraceID);
+      oprot.writeFieldEnd();
       if (struct.name != null) {
         oprot.writeFieldBegin(NAME_FIELD_DESC);
         oprot.writeString(struct.name);
         oprot.writeFieldEnd();
       }
-      if (struct.spanID != null) {
-        oprot.writeFieldBegin(SPAN_ID_FIELD_DESC);
-        oprot.writeString(struct.spanID);
+      oprot.writeFieldBegin(SPAN_ID_FIELD_DESC);
+      oprot.writeI64(struct.spanID);
+      oprot.writeFieldEnd();
+      if (struct.isSetParentSpanId()) {
+        oprot.writeFieldBegin(PARENT_SPAN_ID_FIELD_DESC);
+        oprot.writeI64(struct.parentSpanId);
         oprot.writeFieldEnd();
       }
-      if (struct.parentSpanId != null) {
-        if (struct.isSetParentSpanId()) {
-          oprot.writeFieldBegin(PARENT_SPAN_ID_FIELD_DESC);
-          oprot.writeString(struct.parentSpanId);
-          oprot.writeFieldEnd();
-        }
-      }
       if (struct.annotations != null) {
         oprot.writeFieldBegin(ANNOTATIONS_FIELD_DESC);
         {
@@ -947,9 +1094,9 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         }
         oprot.writeFieldEnd();
       }
-      if (struct.isSetDebug()) {
-        oprot.writeFieldBegin(DEBUG_FIELD_DESC);
-        oprot.writeBool(struct.debug);
+      if (struct.isSetFlag()) {
+        oprot.writeFieldBegin(FLAG_FIELD_DESC);
+        oprot.writeI32(struct.flag);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -970,39 +1117,51 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
     public void write(org.apache.thrift.protocol.TProtocol prot, Span struct) throws org.apache.thrift.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetTraceID()) {
+      if (struct.isSetTimestamp()) {
         optionals.set(0);
       }
-      if (struct.isSetName()) {
+      if (struct.isSetMostTraceID()) {
         optionals.set(1);
       }
-      if (struct.isSetSpanID()) {
+      if (struct.isSetLeastTraceID()) {
         optionals.set(2);
       }
-      if (struct.isSetParentSpanId()) {
+      if (struct.isSetName()) {
         optionals.set(3);
       }
-      if (struct.isSetAnnotations()) {
+      if (struct.isSetSpanID()) {
         optionals.set(4);
       }
-      if (struct.isSetBinaryAnnotations()) {
+      if (struct.isSetParentSpanId()) {
         optionals.set(5);
       }
-      if (struct.isSetDebug()) {
+      if (struct.isSetAnnotations()) {
         optionals.set(6);
       }
-      oprot.writeBitSet(optionals, 7);
-      if (struct.isSetTraceID()) {
-        oprot.writeString(struct.traceID);
+      if (struct.isSetBinaryAnnotations()) {
+        optionals.set(7);
+      }
+      if (struct.isSetFlag()) {
+        optionals.set(8);
+      }
+      oprot.writeBitSet(optionals, 9);
+      if (struct.isSetTimestamp()) {
+        oprot.writeI64(struct.timestamp);
+      }
+      if (struct.isSetMostTraceID()) {
+        oprot.writeI64(struct.mostTraceID);
+      }
+      if (struct.isSetLeastTraceID()) {
+        oprot.writeI64(struct.leastTraceID);
       }
       if (struct.isSetName()) {
         oprot.writeString(struct.name);
       }
       if (struct.isSetSpanID()) {
-        oprot.writeString(struct.spanID);
+        oprot.writeI64(struct.spanID);
       }
       if (struct.isSetParentSpanId()) {
-        oprot.writeString(struct.parentSpanId);
+        oprot.writeI64(struct.parentSpanId);
       }
       if (struct.isSetAnnotations()) {
         {
@@ -1022,32 +1181,40 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
           }
         }
       }
-      if (struct.isSetDebug()) {
-        oprot.writeBool(struct.debug);
+      if (struct.isSetFlag()) {
+        oprot.writeI32(struct.flag);
       }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Span struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(7);
+      BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
-        struct.traceID = iprot.readString();
-        struct.setTraceIDIsSet(true);
+        struct.timestamp = iprot.readI64();
+        struct.setTimestampIsSet(true);
       }
       if (incoming.get(1)) {
+        struct.mostTraceID = iprot.readI64();
+        struct.setMostTraceIDIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.leastTraceID = iprot.readI64();
+        struct.setLeastTraceIDIsSet(true);
+      }
+      if (incoming.get(3)) {
         struct.name = iprot.readString();
         struct.setNameIsSet(true);
       }
-      if (incoming.get(2)) {
-        struct.spanID = iprot.readString();
+      if (incoming.get(4)) {
+        struct.spanID = iprot.readI64();
         struct.setSpanIDIsSet(true);
       }
-      if (incoming.get(3)) {
-        struct.parentSpanId = iprot.readString();
+      if (incoming.get(5)) {
+        struct.parentSpanId = iprot.readI64();
         struct.setParentSpanIdIsSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.annotations = new ArrayList<Annotation>(_list10.size);
@@ -1061,7 +1228,7 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         }
         struct.setAnnotationsIsSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.binaryAnnotations = new ArrayList<BinaryAnnotation>(_list13.size);
@@ -1075,9 +1242,9 @@ public class Span implements org.apache.thrift.TBase<Span, Span._Fields>, java.i
         }
         struct.setBinaryAnnotationsIsSet(true);
       }
-      if (incoming.get(6)) {
-        struct.debug = iprot.readBool();
-        struct.setDebugIsSet(true);
+      if (incoming.get(8)) {
+        struct.flag = iprot.readI32();
+        struct.setFlagIsSet(true);
       }
     }
   }
diff --git a/makethrift.sh b/makethrift.sh
new file mode 100755
index 000000000..cb63e8928
--- /dev/null
+++ b/makethrift.sh
@@ -0,0 +1 @@
+mvn clean eclipse:eclipse -P withThrift -Dthrift.executable.property=/Users/netspider/DEV-TOOLS/thrift-0.8.0/bin/thrift
diff --git a/src/main/java/com/profiler/context/EndPoint.java b/src/main/java/com/profiler/context/EndPoint.java
index cf0b9ba72..a943d01e6 100644
--- a/src/main/java/com/profiler/context/EndPoint.java
+++ b/src/main/java/com/profiler/context/EndPoint.java
@@ -13,4 +13,8 @@ public class EndPoint {
 	public String toString() {
 		return "EndPoint{ip=" + ip + ", port=" + port + "}";
 	}
+
+	public com.profiler.context.gen.Endpoint toThrift() {
+		return new com.profiler.context.gen.Endpoint(ip, (short) port);
+	}
 }
diff --git a/src/main/java/com/profiler/context/HippoAnnotation.java b/src/main/java/com/profiler/context/HippoAnnotation.java
index bc7a10daa..9b2b17ac0 100644
--- a/src/main/java/com/profiler/context/HippoAnnotation.java
+++ b/src/main/java/com/profiler/context/HippoAnnotation.java
@@ -32,4 +32,16 @@ public class HippoAnnotation {
 		return sb.toString();
 	}
 
+	public com.profiler.context.gen.Annotation toThrift() {
+		com.profiler.context.gen.Annotation ann = new com.profiler.context.gen.Annotation();
+
+		ann.setTimestamp(time);
+		ann.setValue(value);
+
+		if (duration != null) {
+			ann.setDuration(duration);
+		}
+
+		return ann;
+	}
 }
diff --git a/src/main/java/com/profiler/context/HippoBinaryAnnotation.java b/src/main/java/com/profiler/context/HippoBinaryAnnotation.java
index 9bbd03323..098d0d2f4 100644
--- a/src/main/java/com/profiler/context/HippoBinaryAnnotation.java
+++ b/src/main/java/com/profiler/context/HippoBinaryAnnotation.java
@@ -1,18 +1,20 @@
 package com.profiler.context;
 
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+
 public class HippoBinaryAnnotation {
 
 	private final long time;
 	private final String key;
 	private final Object value;
-	private final Long duration;
 	private final String threadname; // TODO: remove, just for debug.
 
-	public HippoBinaryAnnotation(long time, String key, Object value, Long duration) {
+	public HippoBinaryAnnotation(long time, String key, Object value) {
 		this.time = time;
 		this.key = key;
 		this.value = value;
-		this.duration = duration;
 		this.threadname = Thread.currentThread().getName();
 	}
 
@@ -24,11 +26,29 @@ public class HippoBinaryAnnotation {
 		sb.append("time=").append(time);
 		sb.append(", key=").append(key);
 		sb.append(", value=").append(value);
-		sb.append(", duration=").append(duration);
 		sb.append(", threadname=").append(threadname);
 		sb.append("}");
 
 		return sb.toString();
 	}
 
+	public com.profiler.context.gen.BinaryAnnotation toThrift() {
+		com.profiler.context.gen.BinaryAnnotation ann = new com.profiler.context.gen.BinaryAnnotation();
+
+		ann.setTimestamp(time);
+		ann.setKey(key);
+
+		try {
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			ObjectOutput out = new ObjectOutputStream(bos);
+			out.writeObject(value);
+			ann.setValue(bos.toByteArray());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		ann.setValueType(value.getClass().getName());
+
+		return ann;
+	}
 }
diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index 2c8a75784..2204fde12 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -91,4 +91,31 @@ public class Span {
 
 		return sb.toString();
 	}
+
+	public com.profiler.context.gen.Span toThrift() {
+		com.profiler.context.gen.Span span = new com.profiler.context.gen.Span();
+
+		span.setTimestamp(createTime);
+		span.setMostTraceID(traceID.getTraceId().getMostSignificantBits());
+		span.setLeastTraceID(traceID.getTraceId().getLeastSignificantBits());
+		span.setName(name);
+		span.setSpanID(traceID.getSpanId());
+		span.setParentSpanId(traceID.getParentSpanId());
+
+		List<com.profiler.context.gen.Annotation> annotationList = new ArrayList<com.profiler.context.gen.Annotation>(annotations.size());
+		for (HippoAnnotation a : annotations) {
+			annotationList.add(a.toThrift());
+		}
+		span.setAnnotations(annotationList);
+
+		List<com.profiler.context.gen.BinaryAnnotation> binaryAnnotationList = new ArrayList<com.profiler.context.gen.BinaryAnnotation>(binaryAnnotations.size());
+		for (HippoBinaryAnnotation a : binaryAnnotations) {
+			binaryAnnotationList.add(a.toThrift());
+		}
+		span.setBinaryAnnotations(binaryAnnotationList);
+
+		span.setFlag(traceID.getFlags());
+
+		return span;
+	}
 }
diff --git a/src/main/java/com/profiler/context/Trace.java b/src/main/java/com/profiler/context/Trace.java
index 3896e90a4..8283d365a 100644
--- a/src/main/java/com/profiler/context/Trace.java
+++ b/src/main/java/com/profiler/context/Trace.java
@@ -3,6 +3,7 @@ package com.profiler.context;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.profiler.sender.DataSender;
 import com.profiler.util.NamedThreadLocal;
 
 /**
@@ -80,6 +81,8 @@ public final class Trace {
 		try {
 			// TODO: send span to server
 			System.out.println("\n\nWrite span hash=" + span.hashCode() + ", value=" + span + ", spanMap.size=" + spanMap.size() + ", threadid=" + Thread.currentThread().getId() + "\n\n");
+
+			DataSender.getInstance().addDataToSend(span.toThrift());
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.log(Level.SEVERE, e.getMessage());
@@ -108,7 +111,7 @@ public final class Trace {
 			mutate(getTraceId(), new SpanUpdater() {
 				@Override
 				public Span updateSpan(Span span) {
-					span.addAnnotation(new HippoBinaryAnnotation(System.currentTimeMillis(), key, value, null));
+					span.addAnnotation(new HippoBinaryAnnotation(System.currentTimeMillis(), key, value));
 					return span;
 				}
 			});
diff --git a/src/main/java/com/profiler/util/DefaultTBaseLocator.java b/src/main/java/com/profiler/util/DefaultTBaseLocator.java
index a2ebca0af..1298ced11 100644
--- a/src/main/java/com/profiler/util/DefaultTBaseLocator.java
+++ b/src/main/java/com/profiler/util/DefaultTBaseLocator.java
@@ -1,38 +1,42 @@
 package com.profiler.util;
 
+import com.profiler.context.gen.Span;
 import com.profiler.dto.*;
 import org.apache.thrift.TBase;
 
 public class DefaultTBaseLocator implements TBaseLocator {
 
-    private static final short JVM_INFO_THRIFT_DTO = 10;
-    private static final short REQUEST_DATA_LIST_THRIFT_DTO = 20;
-    private static final short REQUEST_THRIFT_DTO = 30;
-
+	private static final short JVM_INFO_THRIFT_DTO = 10;
+	private static final short REQUEST_DATA_LIST_THRIFT_DTO = 20;
+	private static final short REQUEST_THRIFT_DTO = 30;
+	private static final short SPAN = 40;
 
 	@Override
 	public TBase<?, ?> tBaseLookup(short type) {
-        switch (type) {
-			case JVM_INFO_THRIFT_DTO:
-				return new JVMInfoThriftDTO();
-			case REQUEST_DATA_LIST_THRIFT_DTO:
-				return new RequestDataListThriftDTO();
-			case REQUEST_THRIFT_DTO:
-				return new RequestThriftDTO();
+		switch (type) {
+		case JVM_INFO_THRIFT_DTO:
+			return new JVMInfoThriftDTO();
+		case REQUEST_DATA_LIST_THRIFT_DTO:
+			return new RequestDataListThriftDTO();
+		case REQUEST_THRIFT_DTO:
+			return new RequestThriftDTO();
 		}
 		throw new IllegalArgumentException("Unsupported type:" + type);
 	}
 
-    public short typeLookup(TBase<?, ?> tbase) {
-        if(tbase instanceof JVMInfoThriftDTO) {
-            return JVM_INFO_THRIFT_DTO;
-        }
-        if(tbase instanceof RequestDataListThriftDTO) {
-            return REQUEST_DATA_LIST_THRIFT_DTO;
-        }
-        if(tbase instanceof RequestThriftDTO) {
-            return REQUEST_THRIFT_DTO;
-        }
-        throw new UnsupportedOperationException("Unsupported Type");
-    }
+	public short typeLookup(TBase<?, ?> tbase) {
+		if (tbase instanceof JVMInfoThriftDTO) {
+			return JVM_INFO_THRIFT_DTO;
+		}
+		if (tbase instanceof RequestDataListThriftDTO) {
+			return REQUEST_DATA_LIST_THRIFT_DTO;
+		}
+		if (tbase instanceof RequestThriftDTO) {
+			return REQUEST_THRIFT_DTO;
+		}
+		if (tbase instanceof Span) {
+			return SPAN;
+		}
+		throw new UnsupportedOperationException("Unsupported Type");
+	}
 }
diff --git a/thrift/Trace.thrift b/thrift/Trace.thrift
index 69075e667..cacd8c03e 100644
--- a/thrift/Trace.thrift
+++ b/thrift/Trace.thrift
@@ -8,31 +8,29 @@ const string SERVER_RECV = "SR"
 struct Endpoint {
   1: string ip,
   2: i16 port,
-  3: string name,
 }
 
 struct Annotation {
   1: i64 timestamp,
   2: string value,
-  3: optional Endpoint host,
-  4: optional i32 duration,
+  3: optional i64 duration,
 }
 
 struct BinaryAnnotation {
   1: i64 timestamp, 
   2: string key,
   3: binary value,
-  4: string annotationType,
-  5: optional Endpoint host
+  4: string valueType,
 }
 
 struct Span {
-  1: long mostTraceID
-  2: long leastTraceID
-  3: string name,
-  4: long spanID,
-  5: optional long parentSpanId,
-  6: list<Annotation> annotations,
-  7: list<BinaryAnnotation> binaryAnnotations
-  8: optional bool debug = 0
+  1: i64 timestamp,
+  2: i64 mostTraceID
+  3: i64 leastTraceID
+  4: string name,
+  5: i64 spanID,
+  6: optional i64 parentSpanId,
+  7: list<Annotation> annotations,
+  8: list<BinaryAnnotation> binaryAnnotations
+  9: optional i32 flag = 0
 }
\ No newline at end of file