diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java index 3ca792249..2b46f592c 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java @@ -90,7 +90,6 @@ public class HbaseAgentStatDao implements AgentStatDao { // Transaction if (agentStat.isSetTransaction()) { TTransaction transaction = agentStat.getTransaction(); - put.addColumn(AGENT_STAT_CF_STATISTICS, AGENT_STAT_COL_TRANSACTION_VERSION, Bytes.toBytes(transaction.getVersion())); put.addColumn(AGENT_STAT_CF_STATISTICS, AGENT_STAT_COL_TRANSACTION_SAMPLED_NEW, Bytes.toBytes(transaction.getSampledNewCount())); put.addColumn(AGENT_STAT_CF_STATISTICS, AGENT_STAT_COL_TRANSACTION_SAMPLED_CONTINUATION, Bytes.toBytes(transaction.getSampledContinuationCount())); put.addColumn(AGENT_STAT_CF_STATISTICS, AGENT_STAT_COL_TRANSACTION_UNSAMPLED_NEW, Bytes.toBytes(transaction.getUnsampledNewCount())); diff --git a/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HBaseTables.java b/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HBaseTables.java index 0335e86c2..7e69d3951 100644 --- a/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HBaseTables.java +++ b/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HBaseTables.java @@ -50,7 +50,6 @@ public final class HBaseTables { public static final byte[] AGENT_STAT_COL_NON_HEAP_MAX = Bytes.toBytes("nHpM"); // qualifier for non-heap max public static final byte[] AGENT_STAT_COL_JVM_CPU = Bytes.toBytes("jvmCpu"); // qualifier for JVM CPU usage public static final byte[] AGENT_STAT_COL_SYS_CPU = Bytes.toBytes("sysCpu"); // qualifier for system CPU usage - public static final byte[] AGENT_STAT_COL_TRANSACTION_VERSION = Bytes.toBytes("tV"); // qualifier for transaction version public static final byte[] AGENT_STAT_COL_TRANSACTION_SAMPLED_NEW = Bytes.toBytes("tSN"); // qualifier for sampled new count public static final byte[] AGENT_STAT_COL_TRANSACTION_SAMPLED_CONTINUATION = Bytes.toBytes("tSC"); // qualifier for sampled continuation count public static final byte[] AGENT_STAT_COL_TRANSACTION_UNSAMPLED_NEW = Bytes.toBytes("tUnSN"); // qualifier for unsampled new count diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java index 0955d8ee8..0ca3744eb 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/dto/TTransaction.java @@ -34,11 +34,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-29") public class TTransaction implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransaction"); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.I16, (short)1); private static final org.apache.thrift.protocol.TField SAMPLED_NEW_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sampledNewCount", org.apache.thrift.protocol.TType.I64, (short)2); private static final org.apache.thrift.protocol.TField SAMPLED_CONTINUATION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sampledContinuationCount", org.apache.thrift.protocol.TType.I64, (short)3); private static final org.apache.thrift.protocol.TField UNSAMPLED_NEW_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("unsampledNewCount", org.apache.thrift.protocol.TType.I64, (short)4); @@ -50,7 +49,6 @@ public class TTransaction implements org.apache.thrift.TBase 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.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16))); tmpMap.put(_Fields.SAMPLED_NEW_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sampledNewCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.SAMPLED_CONTINUATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sampledContinuationCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -152,16 +144,6 @@ public class TTransaction implements org.apache.thrift.TBase list = new ArrayList(); - boolean present_version = true; - list.add(present_version); - if (present_version) - list.add(version); - boolean present_sampledNewCount = true && (isSetSampledNewCount()); list.add(present_sampledNewCount); if (present_sampledNewCount) @@ -492,16 +422,6 @@ public class TTransaction implements org.apache.thrift.TBase> { if (qualifierMap.containsKey(AGENT_STAT_COL_SYS_CPU)) { agentStat.setSystemCpuUsage(Bytes.toDouble(qualifierMap.get(AGENT_STAT_COL_SYS_CPU))); } - if (qualifierMap.containsKey(AGENT_STAT_COL_TRANSACTION_VERSION)) { - agentStat.setTransactionVersion(Bytes.toShort(qualifierMap.get(AGENT_STAT_COL_TRANSACTION_VERSION))); - } if (qualifierMap.containsKey(AGENT_STAT_COL_TRANSACTION_SAMPLED_NEW)) { agentStat.setSampledNewCount(Bytes.toLong(qualifierMap.get(AGENT_STAT_COL_TRANSACTION_SAMPLED_NEW))); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/AgentStat.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/AgentStat.java index d5d9bd862..1060a3242 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/AgentStat.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/AgentStat.java @@ -39,7 +39,6 @@ public class AgentStat { private double jvmCpuUsage = NOT_COLLECTED; private double systemCpuUsage = NOT_COLLECTED; - private short transactionVersion; private long sampledNewCount = NOT_COLLECTED; private long sampledContinuationCount = NOT_COLLECTED; private long unsampledNewCount = NOT_COLLECTED; @@ -144,14 +143,6 @@ public class AgentStat { this.systemCpuUsage = systemCpuUsage; } - public short getTransactionVersion() { - return transactionVersion; - } - - public void setTransactionVersion(short transactionVersion) { - this.transactionVersion = transactionVersion; - } - public long getSampledNewCount() { return sampledNewCount; } @@ -190,9 +181,8 @@ public class AgentStat { + ", gcType=" + gcType + ", gcOldCount=" + gcOldCount + ", gcOldTime=" + gcOldTime + ", heapUsed=" + heapUsed + ", heapMax=" + heapMax + ", nonHeapUsed=" + nonHeapUsed + ", nonHeapMax=" + nonHeapMax + ", jvmCpuUsage=" + jvmCpuUsage + ", systemCpuUsage="+ systemCpuUsage - + ", transactionVersion=" + transactionVersion + ", sampledNewCount=" + sampledNewCount - + ", sampledContinuationCount=" + sampledContinuationCount + ", unsampledNewCount=" + unsampledNewCount - + ", unsampledContinuationCount=" + unsampledContinuationCount + "]"; + + ", sampledNewCount=" + sampledNewCount + ", sampledContinuationCount=" + sampledContinuationCount + + ", unsampledNewCount=" + unsampledNewCount + ", unsampledContinuationCount=" + unsampledContinuationCount + "]"; } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/AgentStatMapperTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/AgentStatMapperTest.java index 166b08633..a54924ffc 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/AgentStatMapperTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/AgentStatMapperTest.java @@ -77,7 +77,6 @@ public class AgentStatMapperTest { private static final double JVM_CPU_USAGE = 10; private static final double SYS_CPU_USAGE = 20; - private static final short TRANSACTION_VERSION = 1; private static final long SAMPLED_NEW_COUNT = 100L; private static final long SAMPLED_CONTINUATION_COUNT = 200L; private static final long UNSAMPLED_NEW_COUNT = 50L; @@ -109,7 +108,6 @@ public class AgentStatMapperTest { createCell(AGENT_STAT_COL_NON_HEAP_MAX, Bytes.toBytes(NON_HEAP_MAX)), createCell(AGENT_STAT_COL_JVM_CPU, Bytes.toBytes(JVM_CPU_USAGE)), createCell(AGENT_STAT_COL_SYS_CPU, Bytes.toBytes(SYS_CPU_USAGE)), - createCell(AGENT_STAT_COL_TRANSACTION_VERSION, Bytes.toBytes(TRANSACTION_VERSION)), createCell(AGENT_STAT_COL_TRANSACTION_SAMPLED_NEW, Bytes.toBytes(SAMPLED_NEW_COUNT)), createCell(AGENT_STAT_COL_TRANSACTION_SAMPLED_CONTINUATION, Bytes.toBytes(SAMPLED_CONTINUATION_COUNT)), createCell(AGENT_STAT_COL_TRANSACTION_UNSAMPLED_NEW, Bytes.toBytes(UNSAMPLED_NEW_COUNT)), @@ -143,7 +141,6 @@ public class AgentStatMapperTest { assertJvmGc(agentStat); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getJvmCpuUsage(), DELTA); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getSystemCpuUsage(), DELTA); - assertEquals(0, agentStat.getTransactionVersion()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getSampledNewCount()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getSampledContinuationCount()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getUnsampledNewCount()); @@ -164,7 +161,6 @@ public class AgentStatMapperTest { assertEquals(0, agentStat.getCollectInterval()); assertJvmGc(agentStat); assertCpuUsage(agentStat); - assertEquals(0, agentStat.getTransactionVersion()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getSampledNewCount()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getSampledContinuationCount()); assertEquals(AgentStat.NOT_COLLECTED, agentStat.getUnsampledNewCount()); @@ -189,7 +185,6 @@ public class AgentStatMapperTest { } private void assertTransaction(AgentStat agentStat) { - assertEquals(TRANSACTION_VERSION, agentStat.getTransactionVersion()); assertEquals(SAMPLED_NEW_COUNT, agentStat.getSampledNewCount()); assertEquals(SAMPLED_CONTINUATION_COUNT, agentStat.getSampledContinuationCount()); assertEquals(UNSAMPLED_NEW_COUNT, agentStat.getUnsampledNewCount());