diff --git a/pom.xml b/pom.xml index 454d58b13..c9967b300 100644 --- a/pom.xml +++ b/pom.xml @@ -252,21 +252,7 @@ - - - - - - - - - - - - - - - + diff --git a/src/main/java/com/profiler/SystemMonitor.java b/src/main/java/com/profiler/SystemMonitor.java index 01e7849f1..c566bf450 100644 --- a/src/main/java/com/profiler/SystemMonitor.java +++ b/src/main/java/com/profiler/SystemMonitor.java @@ -13,7 +13,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import com.profiler.dto.JVMInfoThriftDTO; +import com.profiler.common.dto.thrift.JVMInfoThriftDTO; import com.profiler.sender.DataSender; import com.profiler.trace.RequestTracer; import com.sun.management.OperatingSystemMXBean; diff --git a/src/main/java/com/profiler/dto/AgentInfoDTO.java b/src/main/java/com/profiler/common/dto/AgentInfoDTO.java similarity index 98% rename from src/main/java/com/profiler/dto/AgentInfoDTO.java rename to src/main/java/com/profiler/common/dto/AgentInfoDTO.java index 01eec7b3a..e10a7a2e7 100644 --- a/src/main/java/com/profiler/dto/AgentInfoDTO.java +++ b/src/main/java/com/profiler/common/dto/AgentInfoDTO.java @@ -1,4 +1,4 @@ -package com.profiler.dto; +package com.profiler.common.dto; import java.io.Serializable; import java.util.Map.Entry; diff --git a/src/main/java/com/profiler/dto/Header.java b/src/main/java/com/profiler/common/dto/Header.java similarity index 92% rename from src/main/java/com/profiler/dto/Header.java rename to src/main/java/com/profiler/common/dto/Header.java index cde7e33ee..9c9d2f548 100644 --- a/src/main/java/com/profiler/dto/Header.java +++ b/src/main/java/com/profiler/common/dto/Header.java @@ -1,4 +1,4 @@ -package com.profiler.dto; +package com.profiler.common.dto; public class Header { diff --git a/src/main/java/com/profiler/context/gen/Annotation.java b/src/main/java/com/profiler/common/dto/thrift/Annotation.java similarity index 99% rename from src/main/java/com/profiler/context/gen/Annotation.java rename to src/main/java/com/profiler/common/dto/thrift/Annotation.java index 317d367f3..be0b01e07 100644 --- a/src/main/java/com/profiler/context/gen/Annotation.java +++ b/src/main/java/com/profiler/common/dto/thrift/Annotation.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.context.gen; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/context/gen/BinaryAnnotation.java b/src/main/java/com/profiler/common/dto/thrift/BinaryAnnotation.java similarity index 99% rename from src/main/java/com/profiler/context/gen/BinaryAnnotation.java rename to src/main/java/com/profiler/common/dto/thrift/BinaryAnnotation.java index 2276e716d..74cc7a92f 100644 --- a/src/main/java/com/profiler/context/gen/BinaryAnnotation.java +++ b/src/main/java/com/profiler/common/dto/thrift/BinaryAnnotation.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.context.gen; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/context/gen/Constants.java b/src/main/java/com/profiler/common/dto/thrift/Constants.java similarity index 96% rename from src/main/java/com/profiler/context/gen/Constants.java rename to src/main/java/com/profiler/common/dto/thrift/Constants.java index 8e676b0fa..961846295 100644 --- a/src/main/java/com/profiler/context/gen/Constants.java +++ b/src/main/java/com/profiler/common/dto/thrift/Constants.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.context.gen; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/context/gen/Endpoint.java b/src/main/java/com/profiler/common/dto/thrift/Endpoint.java similarity index 99% rename from src/main/java/com/profiler/context/gen/Endpoint.java rename to src/main/java/com/profiler/common/dto/thrift/Endpoint.java index e39307e14..66a2226f1 100644 --- a/src/main/java/com/profiler/context/gen/Endpoint.java +++ b/src/main/java/com/profiler/common/dto/thrift/Endpoint.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.context.gen; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/dto/JVMInfoThriftDTO.java b/src/main/java/com/profiler/common/dto/thrift/JVMInfoThriftDTO.java similarity index 99% rename from src/main/java/com/profiler/dto/JVMInfoThriftDTO.java rename to src/main/java/com/profiler/common/dto/thrift/JVMInfoThriftDTO.java index 3503adbf0..419dcae85 100644 --- a/src/main/java/com/profiler/dto/JVMInfoThriftDTO.java +++ b/src/main/java/com/profiler/common/dto/thrift/JVMInfoThriftDTO.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.dto; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/dto/RequestDataListThriftDTO.java b/src/main/java/com/profiler/common/dto/thrift/RequestDataListThriftDTO.java similarity index 99% rename from src/main/java/com/profiler/dto/RequestDataListThriftDTO.java rename to src/main/java/com/profiler/common/dto/thrift/RequestDataListThriftDTO.java index 33e767ddd..b39b57a58 100644 --- a/src/main/java/com/profiler/dto/RequestDataListThriftDTO.java +++ b/src/main/java/com/profiler/common/dto/thrift/RequestDataListThriftDTO.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.dto; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/dto/RequestDataThriftDTO.java b/src/main/java/com/profiler/common/dto/thrift/RequestDataThriftDTO.java similarity index 99% rename from src/main/java/com/profiler/dto/RequestDataThriftDTO.java rename to src/main/java/com/profiler/common/dto/thrift/RequestDataThriftDTO.java index 59855e804..58d25196c 100644 --- a/src/main/java/com/profiler/dto/RequestDataThriftDTO.java +++ b/src/main/java/com/profiler/common/dto/thrift/RequestDataThriftDTO.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.dto; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/dto/RequestThriftDTO.java b/src/main/java/com/profiler/common/dto/thrift/RequestThriftDTO.java similarity index 99% rename from src/main/java/com/profiler/dto/RequestThriftDTO.java rename to src/main/java/com/profiler/common/dto/thrift/RequestThriftDTO.java index 6a9fcf539..4f81fc6c1 100644 --- a/src/main/java/com/profiler/dto/RequestThriftDTO.java +++ b/src/main/java/com/profiler/common/dto/thrift/RequestThriftDTO.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.dto; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; diff --git a/src/main/java/com/profiler/context/gen/Span.java b/src/main/java/com/profiler/common/dto/thrift/Span.java similarity index 89% rename from src/main/java/com/profiler/context/gen/Span.java rename to src/main/java/com/profiler/common/dto/thrift/Span.java index b9c72ecf9..e06620074 100644 --- a/src/main/java/com/profiler/context/gen/Span.java +++ b/src/main/java/com/profiler/common/dto/thrift/Span.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.profiler.context.gen; +package com.profiler.common.dto.thrift; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; @@ -30,15 +30,16 @@ import org.slf4j.LoggerFactory; public class Span implements org.apache.thrift.TBase, 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 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 org.apache.thrift.protocol.TField AGENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("agentID", org.apache.thrift.protocol.TType.STRING, (short)1); + 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)2); + 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)3); + 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)4); + 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)5); + 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)6); + 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)7); + 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)8); + 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)9); + 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)10); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -46,6 +47,7 @@ public class Span implements org.apache.thrift.TBase, java.i schemes.put(TupleScheme.class, new SpanTupleSchemeFactory()); } + private String agentID; // required private long timestamp; // required private long mostTraceID; // required private long leastTraceID; // required @@ -58,15 +60,16 @@ public class Span implements org.apache.thrift.TBase, java.i /** 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"), - 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"); + AGENT_ID((short)1, "agentID"), + TIMESTAMP((short)2, "timestamp"), + MOST_TRACE_ID((short)3, "mostTraceID"), + LEAST_TRACE_ID((short)4, "leastTraceID"), + NAME((short)5, "name"), + SPAN_ID((short)6, "spanID"), + PARENT_SPAN_ID((short)7, "parentSpanId"), + ANNOTATIONS((short)8, "annotations"), + BINARY_ANNOTATIONS((short)9, "binaryAnnotations"), + FLAG((short)10, "flag"); private static final Map byName = new HashMap(); @@ -81,23 +84,25 @@ public class Span implements org.apache.thrift.TBase, java.i */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // TIMESTAMP + case 1: // AGENT_ID + return AGENT_ID; + case 2: // TIMESTAMP return TIMESTAMP; - case 2: // MOST_TRACE_ID + case 3: // MOST_TRACE_ID return MOST_TRACE_ID; - case 3: // LEAST_TRACE_ID + case 4: // LEAST_TRACE_ID return LEAST_TRACE_ID; - case 4: // NAME + case 5: // NAME return NAME; - case 5: // SPAN_ID + case 6: // SPAN_ID return SPAN_ID; - case 6: // PARENT_SPAN_ID + case 7: // PARENT_SPAN_ID return PARENT_SPAN_ID; - case 7: // ANNOTATIONS + case 8: // ANNOTATIONS return ANNOTATIONS; - case 8: // BINARY_ANNOTATIONS + case 9: // BINARY_ANNOTATIONS return BINARY_ANNOTATIONS; - case 9: // FLAG + case 10: // FLAG return FLAG; default: return null; @@ -150,6 +155,8 @@ public class Span implements org.apache.thrift.TBase, java.i 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.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.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, @@ -180,6 +187,7 @@ public class Span implements org.apache.thrift.TBase, java.i } public Span( + String agentID, long timestamp, long mostTraceID, long leastTraceID, @@ -189,6 +197,7 @@ public class Span implements org.apache.thrift.TBase, java.i List binaryAnnotations) { this(); + this.agentID = agentID; this.timestamp = timestamp; setTimestampIsSet(true); this.mostTraceID = mostTraceID; @@ -208,6 +217,9 @@ public class Span implements org.apache.thrift.TBase, java.i public Span(Span other) { __isset_bit_vector.clear(); __isset_bit_vector.or(other.__isset_bit_vector); + if (other.isSetAgentID()) { + this.agentID = other.agentID; + } this.timestamp = other.timestamp; this.mostTraceID = other.mostTraceID; this.leastTraceID = other.leastTraceID; @@ -239,6 +251,7 @@ public class Span implements org.apache.thrift.TBase, java.i @Override public void clear() { + this.agentID = null; setTimestampIsSet(false); this.timestamp = 0; setMostTraceIDIsSet(false); @@ -256,6 +269,29 @@ public class Span implements org.apache.thrift.TBase, java.i } + public String getAgentID() { + return this.agentID; + } + + public void setAgentID(String agentID) { + this.agentID = agentID; + } + + public void unsetAgentID() { + this.agentID = null; + } + + /** Returns true if field agentID is set (has been assigned a value) and false otherwise */ + public boolean isSetAgentID() { + return this.agentID != null; + } + + public void setAgentIDIsSet(boolean value) { + if (!value) { + this.agentID = null; + } + } + public long getTimestamp() { return this.timestamp; } @@ -489,6 +525,14 @@ public class Span implements org.apache.thrift.TBase, java.i public void setFieldValue(_Fields field, Object value) { switch (field) { + case AGENT_ID: + if (value == null) { + unsetAgentID(); + } else { + setAgentID((String)value); + } + break; + case TIMESTAMP: if (value == null) { unsetTimestamp(); @@ -566,6 +610,9 @@ public class Span implements org.apache.thrift.TBase, java.i public Object getFieldValue(_Fields field) { switch (field) { + case AGENT_ID: + return getAgentID(); + case TIMESTAMP: return Long.valueOf(getTimestamp()); @@ -604,6 +651,8 @@ public class Span implements org.apache.thrift.TBase, java.i } switch (field) { + case AGENT_ID: + return isSetAgentID(); case TIMESTAMP: return isSetTimestamp(); case MOST_TRACE_ID: @@ -639,6 +688,15 @@ public class Span implements org.apache.thrift.TBase, java.i if (that == null) return false; + boolean this_present_agentID = true && this.isSetAgentID(); + boolean that_present_agentID = true && that.isSetAgentID(); + if (this_present_agentID || that_present_agentID) { + if (!(this_present_agentID && that_present_agentID)) + return false; + if (!this.agentID.equals(that.agentID)) + return false; + } + boolean this_present_timestamp = true; boolean that_present_timestamp = true; if (this_present_timestamp || that_present_timestamp) { @@ -736,6 +794,16 @@ public class Span implements org.apache.thrift.TBase, java.i int lastComparison = 0; Span typedOther = (Span)other; + lastComparison = Boolean.valueOf(isSetAgentID()).compareTo(typedOther.isSetAgentID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAgentID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.agentID, typedOther.agentID); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); if (lastComparison != 0) { return lastComparison; @@ -846,6 +914,14 @@ public class Span implements org.apache.thrift.TBase, java.i StringBuilder sb = new StringBuilder("Span("); boolean first = true; + sb.append("agentID:"); + if (this.agentID == null) { + sb.append("null"); + } else { + sb.append(this.agentID); + } + first = false; + if (!first) sb.append(", "); sb.append("timestamp:"); sb.append(this.timestamp); first = false; @@ -941,7 +1017,15 @@ public class Span implements org.apache.thrift.TBase, java.i break; } switch (schemeField.id) { - case 1: // TIMESTAMP + case 1: // AGENT_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.agentID = iprot.readString(); + struct.setAgentIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // TIMESTAMP if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.timestamp = iprot.readI64(); struct.setTimestampIsSet(true); @@ -949,7 +1033,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // MOST_TRACE_ID + case 3: // MOST_TRACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.mostTraceID = iprot.readI64(); struct.setMostTraceIDIsSet(true); @@ -957,7 +1041,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // LEAST_TRACE_ID + case 4: // LEAST_TRACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.leastTraceID = iprot.readI64(); struct.setLeastTraceIDIsSet(true); @@ -965,7 +1049,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // NAME + case 5: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -973,7 +1057,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // SPAN_ID + case 6: // SPAN_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.spanID = iprot.readI64(); struct.setSpanIDIsSet(true); @@ -981,7 +1065,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // PARENT_SPAN_ID + case 7: // PARENT_SPAN_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.parentSpanId = iprot.readI64(); struct.setParentSpanIdIsSet(true); @@ -989,7 +1073,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // ANNOTATIONS + case 8: // ANNOTATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -1008,7 +1092,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // BINARY_ANNOTATIONS + case 9: // BINARY_ANNOTATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); @@ -1027,7 +1111,7 @@ public class Span implements org.apache.thrift.TBase, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // FLAG + case 10: // FLAG if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.flag = iprot.readI32(); struct.setFlagIsSet(true); @@ -1048,6 +1132,11 @@ public class Span implements org.apache.thrift.TBase, java.i struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.agentID != null) { + oprot.writeFieldBegin(AGENT_ID_FIELD_DESC); + oprot.writeString(struct.agentID); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(TIMESTAMP_FIELD_DESC); oprot.writeI64(struct.timestamp); oprot.writeFieldEnd(); @@ -1117,34 +1206,40 @@ public class Span implements org.apache.thrift.TBase, 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.isSetTimestamp()) { + if (struct.isSetAgentID()) { optionals.set(0); } - if (struct.isSetMostTraceID()) { + if (struct.isSetTimestamp()) { optionals.set(1); } - if (struct.isSetLeastTraceID()) { + if (struct.isSetMostTraceID()) { optionals.set(2); } - if (struct.isSetName()) { + if (struct.isSetLeastTraceID()) { optionals.set(3); } - if (struct.isSetSpanID()) { + if (struct.isSetName()) { optionals.set(4); } - if (struct.isSetParentSpanId()) { + if (struct.isSetSpanID()) { optionals.set(5); } - if (struct.isSetAnnotations()) { + if (struct.isSetParentSpanId()) { optionals.set(6); } - if (struct.isSetBinaryAnnotations()) { + if (struct.isSetAnnotations()) { optionals.set(7); } - if (struct.isSetFlag()) { + if (struct.isSetBinaryAnnotations()) { optionals.set(8); } - oprot.writeBitSet(optionals, 9); + if (struct.isSetFlag()) { + optionals.set(9); + } + oprot.writeBitSet(optionals, 10); + if (struct.isSetAgentID()) { + oprot.writeString(struct.agentID); + } if (struct.isSetTimestamp()) { oprot.writeI64(struct.timestamp); } @@ -1189,32 +1284,36 @@ public class Span implements org.apache.thrift.TBase, java.i @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(9); + BitSet incoming = iprot.readBitSet(10); if (incoming.get(0)) { + struct.agentID = iprot.readString(); + struct.setAgentIDIsSet(true); + } + if (incoming.get(1)) { struct.timestamp = iprot.readI64(); struct.setTimestampIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(2)) { struct.mostTraceID = iprot.readI64(); struct.setMostTraceIDIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.leastTraceID = iprot.readI64(); struct.setLeastTraceIDIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.name = iprot.readString(); struct.setNameIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.spanID = iprot.readI64(); struct.setSpanIDIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.parentSpanId = iprot.readI64(); struct.setParentSpanIdIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { { org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.annotations = new ArrayList(_list10.size); @@ -1228,7 +1327,7 @@ public class Span implements org.apache.thrift.TBase, java.i } struct.setAnnotationsIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { { org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.binaryAnnotations = new ArrayList(_list13.size); @@ -1242,7 +1341,7 @@ public class Span implements org.apache.thrift.TBase, java.i } struct.setBinaryAnnotationsIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.flag = iprot.readI32(); struct.setFlagIsSet(true); } diff --git a/src/main/java/com/profiler/util/DefaultTBaseLocator.java b/src/main/java/com/profiler/common/util/DefaultTBaseLocator.java similarity index 78% rename from src/main/java/com/profiler/util/DefaultTBaseLocator.java rename to src/main/java/com/profiler/common/util/DefaultTBaseLocator.java index 768241716..d6b78d05b 100644 --- a/src/main/java/com/profiler/util/DefaultTBaseLocator.java +++ b/src/main/java/com/profiler/common/util/DefaultTBaseLocator.java @@ -1,9 +1,12 @@ -package com.profiler.util; +package com.profiler.common.util; -import com.profiler.context.gen.Span; -import com.profiler.dto.*; import org.apache.thrift.TBase; +import com.profiler.common.dto.thrift.JVMInfoThriftDTO; +import com.profiler.common.dto.thrift.RequestDataListThriftDTO; +import com.profiler.common.dto.thrift.RequestThriftDTO; +import com.profiler.common.dto.thrift.Span; + public class DefaultTBaseLocator implements TBaseLocator { private static final short JVM_INFO_THRIFT_DTO = 10; diff --git a/src/main/java/com/profiler/util/HeaderTBaseDeserializer.java b/src/main/java/com/profiler/common/util/HeaderTBaseDeserializer.java similarity index 93% rename from src/main/java/com/profiler/util/HeaderTBaseDeserializer.java rename to src/main/java/com/profiler/common/util/HeaderTBaseDeserializer.java index 516e5956f..a973b40a2 100644 --- a/src/main/java/com/profiler/util/HeaderTBaseDeserializer.java +++ b/src/main/java/com/profiler/common/util/HeaderTBaseDeserializer.java @@ -1,6 +1,7 @@ -package com.profiler.util; +package com.profiler.common.util; + +import com.profiler.common.dto.Header; -import com.profiler.dto.Header; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.thrift.protocol.*; diff --git a/src/main/java/com/profiler/util/HeaderTBaseSerializer.java b/src/main/java/com/profiler/common/util/HeaderTBaseSerializer.java similarity index 94% rename from src/main/java/com/profiler/util/HeaderTBaseSerializer.java rename to src/main/java/com/profiler/common/util/HeaderTBaseSerializer.java index 759e7abad..cdd20c958 100644 --- a/src/main/java/com/profiler/util/HeaderTBaseSerializer.java +++ b/src/main/java/com/profiler/common/util/HeaderTBaseSerializer.java @@ -1,4 +1,4 @@ -package com.profiler.util; +package com.profiler.common.util; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; @@ -10,7 +10,7 @@ import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.transport.TIOStreamTransport; -import com.profiler.dto.Header; +import com.profiler.common.dto.Header; /** * Generic utility for easily serializing objects into a byte array or Java diff --git a/src/main/java/com/profiler/util/HeaderUtil.java b/src/main/java/com/profiler/common/util/HeaderUtil.java similarity index 63% rename from src/main/java/com/profiler/util/HeaderUtil.java rename to src/main/java/com/profiler/common/util/HeaderUtil.java index 2672e64cb..b96831cfc 100644 --- a/src/main/java/com/profiler/util/HeaderUtil.java +++ b/src/main/java/com/profiler/common/util/HeaderUtil.java @@ -1,7 +1,7 @@ -package com.profiler.util; +package com.profiler.common.util; -import com.profiler.dto.Header; +import com.profiler.common.dto.Header; public class HeaderUtil { public static boolean validateSignature(byte signature){ diff --git a/src/main/java/com/profiler/util/TBaseLocator.java b/src/main/java/com/profiler/common/util/TBaseLocator.java similarity index 64% rename from src/main/java/com/profiler/util/TBaseLocator.java rename to src/main/java/com/profiler/common/util/TBaseLocator.java index a02a2a6be..efbc69f11 100644 --- a/src/main/java/com/profiler/util/TBaseLocator.java +++ b/src/main/java/com/profiler/common/util/TBaseLocator.java @@ -1,6 +1,7 @@ -package com.profiler.util; +package com.profiler.common.util; + +import com.profiler.common.dto.Header; -import com.profiler.dto.Header; import org.apache.thrift.TBase; public interface TBaseLocator { diff --git a/src/main/java/com/profiler/config/TomcatProfilerConstant.java b/src/main/java/com/profiler/config/TomcatProfilerConstant.java index 7e9b65f1b..7d5c83c17 100644 --- a/src/main/java/com/profiler/config/TomcatProfilerConstant.java +++ b/src/main/java/com/profiler/config/TomcatProfilerConstant.java @@ -24,7 +24,7 @@ public class TomcatProfilerConstant { // public static final int DATA_TYPE_NON_HEAP_MEMORY_STAT=1520; // public static final String CLASS_NAME_REQUEST_TRACER = "com.profiler.trace.RequestTransactionTracer"; - public static final String CLASS_NAME_REQUEST_THRIFT_DTO = "com.profiler.dto.RequestThriftDTO"; + public static final String CLASS_NAME_REQUEST_THRIFT_DTO = "com.profiler.common.dto.thrift.RequestThriftDTO"; // public static final String CLASS_NAME_REQUEST_DATA_TRACER = "com.profiler.trace.RequestDataTracer"; // public static final String CLASS_NAME_AGENT_STATE_MANAGER = "com.profiler.thread.AgentStateManager"; diff --git a/src/main/java/com/profiler/context/EndPoint.java b/src/main/java/com/profiler/context/EndPoint.java index 2ffbfe790..a6bb6815d 100644 --- a/src/main/java/com/profiler/context/EndPoint.java +++ b/src/main/java/com/profiler/context/EndPoint.java @@ -14,7 +14,7 @@ public class EndPoint { return "{ip=" + ip + ", port=" + port + "}"; } - public com.profiler.context.gen.Endpoint toThrift() { - return new com.profiler.context.gen.Endpoint(ip, (short) port); + public com.profiler.common.dto.thrift.Endpoint toThrift() { + return new com.profiler.common.dto.thrift.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 a8027b439..5e33c617b 100644 --- a/src/main/java/com/profiler/context/HippoAnnotation.java +++ b/src/main/java/com/profiler/context/HippoAnnotation.java @@ -38,8 +38,8 @@ 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(); + public com.profiler.common.dto.thrift.Annotation toThrift() { + com.profiler.common.dto.thrift.Annotation ann = new com.profiler.common.dto.thrift.Annotation(); ann.setTimestamp(time); ann.setValue(value); diff --git a/src/main/java/com/profiler/context/HippoBinaryAnnotation.java b/src/main/java/com/profiler/context/HippoBinaryAnnotation.java index 098d0d2f4..361b1bf39 100644 --- a/src/main/java/com/profiler/context/HippoBinaryAnnotation.java +++ b/src/main/java/com/profiler/context/HippoBinaryAnnotation.java @@ -32,8 +32,8 @@ public class HippoBinaryAnnotation { return sb.toString(); } - public com.profiler.context.gen.BinaryAnnotation toThrift() { - com.profiler.context.gen.BinaryAnnotation ann = new com.profiler.context.gen.BinaryAnnotation(); + public com.profiler.common.dto.thrift.BinaryAnnotation toThrift() { + com.profiler.common.dto.thrift.BinaryAnnotation ann = new com.profiler.common.dto.thrift.BinaryAnnotation(); ann.setTimestamp(time); ann.setKey(key); diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java index 385d51a76..ad930e379 100644 --- a/src/main/java/com/profiler/context/Span.java +++ b/src/main/java/com/profiler/context/Span.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.Set; import java.util.TimerTask; +import com.profiler.Agent; + /** * * @author netspider @@ -119,9 +121,10 @@ 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(); + public com.profiler.common.dto.thrift.Span toThrift() { + com.profiler.common.dto.thrift.Span span = new com.profiler.common.dto.thrift.Span(); + span.setAgentID(String.valueOf(Agent.getInstance().getAgentHashCode())); span.setTimestamp(createTime); span.setMostTraceID(traceID.getId().getMostSignificantBits()); span.setLeastTraceID(traceID.getId().getLeastSignificantBits()); @@ -129,13 +132,13 @@ public class Span { span.setSpanID(traceID.getSpanId()); span.setParentSpanId(traceID.getParentSpanId()); - List annotationList = new ArrayList(annotations.size()); + List annotationList = new ArrayList(annotations.size()); for (HippoAnnotation a : annotations) { annotationList.add(a.toThrift()); } span.setAnnotations(annotationList); - List binaryAnnotationList = new ArrayList(binaryAnnotations.size()); + List binaryAnnotationList = new ArrayList(binaryAnnotations.size()); for (HippoBinaryAnnotation a : binaryAnnotations) { binaryAnnotationList.add(a.toThrift()); } diff --git a/src/main/java/com/profiler/sender/AgentInfoSender.java b/src/main/java/com/profiler/sender/AgentInfoSender.java index 9193e890d..0eb51b47b 100644 --- a/src/main/java/com/profiler/sender/AgentInfoSender.java +++ b/src/main/java/com/profiler/sender/AgentInfoSender.java @@ -5,8 +5,8 @@ import java.net.Socket; import java.util.logging.Level; import java.util.logging.Logger; +import com.profiler.common.dto.AgentInfoDTO; import com.profiler.config.TomcatProfilerConfig; -import com.profiler.dto.AgentInfoDTO; public class AgentInfoSender extends Thread { diff --git a/src/main/java/com/profiler/sender/DataSender.java b/src/main/java/com/profiler/sender/DataSender.java index 8b6195235..fb8429fea 100644 --- a/src/main/java/com/profiler/sender/DataSender.java +++ b/src/main/java/com/profiler/sender/DataSender.java @@ -10,13 +10,13 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import com.profiler.dto.Header; -import com.profiler.util.DefaultTBaseLocator; -import com.profiler.util.HeaderTBaseSerializer; -import com.profiler.util.TBaseLocator; import org.apache.thrift.TBase; import org.apache.thrift.TException; +import com.profiler.common.dto.Header; +import com.profiler.common.util.DefaultTBaseLocator; +import com.profiler.common.util.HeaderTBaseSerializer; +import com.profiler.common.util.TBaseLocator; import com.profiler.config.TomcatProfilerConfig; diff --git a/src/main/java/com/profiler/trace/DatabaseRequestTracer.java b/src/main/java/com/profiler/trace/DatabaseRequestTracer.java index ab1e54788..4abfa4f08 100644 --- a/src/main/java/com/profiler/trace/DatabaseRequestTracer.java +++ b/src/main/java/com/profiler/trace/DatabaseRequestTracer.java @@ -12,11 +12,11 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; import com.profiler.Agent; +import com.profiler.common.dto.AgentInfoDTO; +import com.profiler.common.dto.thrift.RequestDataListThriftDTO; +import com.profiler.common.dto.thrift.RequestDataThriftDTO; import com.profiler.config.TomcatProfilerConfig; import com.profiler.config.TomcatProfilerConstant; -import com.profiler.dto.AgentInfoDTO; -import com.profiler.dto.RequestDataListThriftDTO; -import com.profiler.dto.RequestDataThriftDTO; import com.profiler.util.NamedThreadLocal; import com.profiler.util.QueryStringUtil; diff --git a/src/main/java/com/profiler/trace/RequestTracer.java b/src/main/java/com/profiler/trace/RequestTracer.java index 07b386a2b..0d6e48fb8 100644 --- a/src/main/java/com/profiler/trace/RequestTracer.java +++ b/src/main/java/com/profiler/trace/RequestTracer.java @@ -5,9 +5,9 @@ import java.util.HashSet; import java.util.Set; import com.profiler.Agent; +import com.profiler.common.dto.thrift.RequestDataListThriftDTO; +import com.profiler.common.dto.thrift.RequestThriftDTO; import com.profiler.config.TomcatProfilerConstant; -import com.profiler.dto.RequestDataListThriftDTO; -import com.profiler.dto.RequestThriftDTO; import com.profiler.sender.DataSender; import com.profiler.util.SystemUtils; diff --git a/src/main/thrift/Hippo.thrift b/src/main/thrift/Hippo.thrift new file mode 100644 index 000000000..1f9b0818d --- /dev/null +++ b/src/main/thrift/Hippo.thrift @@ -0,0 +1,59 @@ +namespace java com.profiler.common.dto.thrift + +struct JVMInfoThriftDTO { + 1: i32 agentHashCode, + 2: i64 dataTime, + 3: i32 activeThreadCount, + 4: optional i64 gc1Count, + 5: optional i64 gc1Time, + 6: optional i64 gc2Count, + 7: optional i64 gc2Time, + 8: i64 heapUsed, + 9: i64 heapCommitted, + 10: i64 nonHeapUsed, + 11: i64 nonHeapCommitted, + 12: optional double processCPUTime +} + +struct RequestDataThriftDTO { + 1: i32 dataType, + 2: i64 dataTime, + 3: optional i32 dataHashCode, + 4: optional string dataString, + 5: optional string extraData1, + 6: optional string extraData2, + 7: optional string extraData3, + 8: optional i32 extraInt1, + 9: optional i32 extraInt2, + 10: optional i32 extraInt3, + 11: optional i64 extraLong1, + 12: optional i64 extraLong2, + 13: optional i64 extraLong3 +} + +struct RequestDataListThriftDTO { + 1: i32 hostHashCode, + 2: i32 requestHashCode, + 3: list requestDataList +} + +struct RequestThriftDTO { + 1: i32 hostHashCode, + 2: i32 requestHashCode, + 3: i32 dataType, + 4: i64 dataTime, + 5: i64 threadCPUTime, + 6: i64 threadUserTime, + 7: optional string requestID, + 8: optional string requestURL, + 9: optional string clientIP, + 10: optional string extraData1, + 11: optional string extraData2, + 12: optional string extraData3, + 13: optional i32 extraInt1, + 14: optional i32 extraInt2, + 15: optional i32 extraInt3, + 16: optional i64 extraLong1, + 17: optional i64 extraLong2, + 18: optional i64 extraLong3 +} \ No newline at end of file diff --git a/src/main/thrift/JVMInfoThriftDTO.thrift b/src/main/thrift/JVMInfoThriftDTO.thrift deleted file mode 100644 index f71a5dc9f..000000000 --- a/src/main/thrift/JVMInfoThriftDTO.thrift +++ /dev/null @@ -1,17 +0,0 @@ -namespace java com.profiler.dto - -struct JVMInfoThriftDTO { - 1: i32 agentHashCode, - 2: i64 dataTime, - 3: i32 activeThreadCount, - 4: optional i64 gc1Count, - 5: optional i64 gc1Time, - 6: optional i64 gc2Count, - 7: optional i64 gc2Time, - 8: i64 heapUsed, - 9: i64 heapCommitted, - 10: i64 nonHeapUsed, - 11: i64 nonHeapCommitted, - 12: optional double processCPUTime - -} diff --git a/src/main/thrift/RequestDataThriftDTO.thrift b/src/main/thrift/RequestDataThriftDTO.thrift deleted file mode 100644 index f36cc921b..000000000 --- a/src/main/thrift/RequestDataThriftDTO.thrift +++ /dev/null @@ -1,22 +0,0 @@ -namespace java com.profiler.dto -struct RequestDataThriftDTO { - 1: i32 dataType, - 2: i64 dataTime, - 3: optional i32 dataHashCode, - 4: optional string dataString, - 5: optional string extraData1, - 6: optional string extraData2, - 7: optional string extraData3, - 8: optional i32 extraInt1, - 9: optional i32 extraInt2, - 10: optional i32 extraInt3, - 11: optional i64 extraLong1, - 12: optional i64 extraLong2, - 13: optional i64 extraLong3 -} - -struct RequestDataListThriftDTO { - 1: i32 hostHashCode, - 2: i32 requestHashCode, - 3: list requestDataList -} diff --git a/src/main/thrift/RequestThriftDTO.thrift b/src/main/thrift/RequestThriftDTO.thrift deleted file mode 100644 index 020522cb5..000000000 --- a/src/main/thrift/RequestThriftDTO.thrift +++ /dev/null @@ -1,22 +0,0 @@ -namespace java com.profiler.dto -struct RequestThriftDTO { - 1: i32 hostHashCode, - 2: i32 requestHashCode, - 3: i32 dataType, - 4: i64 dataTime, - 5: i64 threadCPUTime, - 6: i64 threadUserTime, - 7: optional string requestID, - 8: optional string requestURL, - 9: optional string clientIP, - 10: optional string extraData1, - 11: optional string extraData2, - 12: optional string extraData3, - 13: optional i32 extraInt1, - 14: optional i32 extraInt2, - 15: optional i32 extraInt3, - 16: optional i64 extraLong1, - 17: optional i64 extraLong2, - 18: optional i64 extraLong3 -} - diff --git a/src/main/thrift/Trace.thrift b/src/main/thrift/Trace.thrift index cacd8c03e..1c0c9a721 100644 --- a/src/main/thrift/Trace.thrift +++ b/src/main/thrift/Trace.thrift @@ -1,4 +1,4 @@ -namespace java com.profiler.context.gen +namespace java com.profiler.common.dto.thrift const string CLIENT_SEND = "CS" const string CLIENT_RECV = "CR" @@ -24,13 +24,14 @@ struct BinaryAnnotation { } struct Span { - 1: i64 timestamp, - 2: i64 mostTraceID - 3: i64 leastTraceID - 4: string name, - 5: i64 spanID, - 6: optional i64 parentSpanId, - 7: list annotations, - 8: list binaryAnnotations - 9: optional i32 flag = 0 + 1: string agentID + 2: i64 timestamp, + 3: i64 mostTraceID + 4: i64 leastTraceID + 5: string name, + 6: i64 spanID, + 7: optional i64 parentSpanId, + 8: list annotations, + 9: list binaryAnnotations + 10: optional i32 flag = 0 } \ No newline at end of file diff --git a/src/test/java/com/profiler/dto/HeaderTest.java b/src/test/java/com/profiler/dto/HeaderTest.java index 7c3bcf0dc..b5780ecb4 100644 --- a/src/test/java/com/profiler/dto/HeaderTest.java +++ b/src/test/java/com/profiler/dto/HeaderTest.java @@ -2,6 +2,8 @@ package com.profiler.dto; import org.junit.Test; +import com.profiler.common.dto.Header; + import java.util.logging.Logger; public class HeaderTest { diff --git a/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java b/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java index be26555e0..5ae8ed489 100644 --- a/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java +++ b/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java @@ -1,7 +1,11 @@ package com.profiler.util; -import com.profiler.dto.Header; -import com.profiler.dto.JVMInfoThriftDTO; +import com.profiler.common.dto.Header; +import com.profiler.common.dto.thrift.JVMInfoThriftDTO; +import com.profiler.common.util.DefaultTBaseLocator; +import com.profiler.common.util.HeaderTBaseDeserializer; +import com.profiler.common.util.HeaderTBaseSerializer; +import com.profiler.common.util.TBaseLocator; import org.apache.thrift.TBase; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/profiler/util/HeaderUtilTest.java b/src/test/java/com/profiler/util/HeaderUtilTest.java index 839e04693..45f6ed839 100644 --- a/src/test/java/com/profiler/util/HeaderUtilTest.java +++ b/src/test/java/com/profiler/util/HeaderUtilTest.java @@ -1,5 +1,7 @@ package com.profiler.util; +import com.profiler.common.dto.Header; +import com.profiler.common.util.HeaderUtil; import com.profiler.dto.*; import org.apache.thrift.TException; import org.junit.Assert;