merge collector

Browse Source

...

This commit is contained in:

Jongho Moon

2014-08-27 18:01:36 +09:00

parent 5e9bc3f8d9

commit 38317abf7d

130 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

HbaseSetting.txt → collector/HbaseSetting.txt

README.md → collector/README.md

build.sh → collector/build.sh

findbugs-exclude.xml → collector/findbugs-exclude.xml

original_source_code_20120909.zip → collector/original_source_code_20120909.zip

pom.xml → collector/pom.xml

runscript/restart.sh → collector/runscript/restart.sh

runscript/start.sh → collector/runscript/start.sh

runscript/stop.sh → collector/runscript/stop.sh

src/main/java/com/nhn/pinpoint/collector/cluster/PinpointClusterManager.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/PinpointClusterManager.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/ZookeeperClient.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperClient.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/ZookeeperClusterManager.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperClusterManager.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/ZookeeperEventWatcher.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperEventWatcher.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/ZookeeperLatestJobWorker.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperLatestJobWorker.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/AuthException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/AuthException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/BadOperationException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/BadOperationException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/ConnectionException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/ConnectionException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/PinpointZookeeperException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/PinpointZookeeperException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/TimeoutException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/TimeoutException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/exception/UnknownException.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/exception/UnknownException.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/job/AbstractJob.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/job/AbstractJob.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/job/DeleteJob.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/job/DeleteJob.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/job/Job.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/job/Job.java

src/main/java/com/nhn/pinpoint/collector/cluster/zookeeper/job/UpdateJob.java → collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/job/UpdateJob.java

src/main/java/com/nhn/pinpoint/collector/config/CollectorConfiguration.java → collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java

src/main/java/com/nhn/pinpoint/collector/dao/AgentIdApplicationIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/AgentIdApplicationIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/AgentInfoDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/AgentInfoDao.java

src/main/java/com/nhn/pinpoint/collector/dao/AgentStatDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/AgentStatDao.java

src/main/java/com/nhn/pinpoint/collector/dao/ApiMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApiMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/ApplicationIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/ApplicationTraceIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationTraceIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/AutoFlusher.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java

src/main/java/com/nhn/pinpoint/collector/dao/CachedStatisticsDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/CachedStatisticsDao.java

src/main/java/com/nhn/pinpoint/collector/dao/HostApplicationMapDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/HostApplicationMapDao.java

src/main/java/com/nhn/pinpoint/collector/dao/MapResponseTimeDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/MapResponseTimeDao.java

src/main/java/com/nhn/pinpoint/collector/dao/MapStatisticsCalleeDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/MapStatisticsCalleeDao.java

src/main/java/com/nhn/pinpoint/collector/dao/MapStatisticsCallerDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/MapStatisticsCallerDao.java

src/main/java/com/nhn/pinpoint/collector/dao/SqlMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/SqlMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/StringMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/StringMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/TracesDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/TracesDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseAgentIdApplicationIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentIdApplicationIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseAgentInfoDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentInfoDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseAgentStatDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApiMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApiMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseMapResponseTimeDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseMapResponseTimeDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseMapStatisticsCalleeDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseMapStatisticsCalleeDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseMapStatisticsCallerDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseMapStatisticsCallerDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseSqlMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseSqlMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseStringMetaDataDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseStringMetaDataDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseTraceDao.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseTraceDao.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/CallRowKey.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/CallRowKey.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/CalleeColumnName.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/CalleeColumnName.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/CallerColumnName.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/CallerColumnName.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/ColumnName.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/ColumnName.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/DefaultRowInfo.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultRowInfo.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/ResponseColumnName.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/ResponseColumnName.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/RowInfo.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/RowInfo.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/RowKey.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/RowKey.java

src/main/java/com/nhn/pinpoint/collector/dao/hbase/statistics/RowKeyMerge.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/RowKeyMerge.java

src/main/java/com/nhn/pinpoint/collector/handler/AgentInfoHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/AgentInfoHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/AgentStatHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/AgentStatHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/ApiMetaDataHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/ApiMetaDataHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/Handler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/Handler.java

src/main/java/com/nhn/pinpoint/collector/handler/RequestResponseHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/RequestResponseHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/SimpleHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/SimpleHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/SpanChunkHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/SpanHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/SqlMetaDataHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/SqlMetaDataHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/StatisticsHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/StatisticsHandler.java

src/main/java/com/nhn/pinpoint/collector/handler/StringMetaDataHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/handler/StringMetaDataHandler.java

src/main/java/com/nhn/pinpoint/collector/mapper/ApplicationNameMapper.java → collector/src/main/java/com/navercorp/pinpoint/collector/mapper/ApplicationNameMapper.java

src/main/java/com/nhn/pinpoint/collector/mapper/thrift/AgentStatCpuLoadBoMapper.java → collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/AgentStatCpuLoadBoMapper.java

src/main/java/com/nhn/pinpoint/collector/mapper/thrift/AgentStatMemoryGcBoMapper.java → collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/AgentStatMemoryGcBoMapper.java

src/main/java/com/nhn/pinpoint/collector/mapper/thrift/ThriftBoMapper.java → collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftBoMapper.java

src/main/java/com/nhn/pinpoint/collector/monitor/CollectorMetric.java → collector/src/main/java/com/navercorp/pinpoint/collector/monitor/CollectorMetric.java

src/main/java/com/nhn/pinpoint/collector/receiver/AbstractDispatchHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/AbstractDispatchHandler.java

src/main/java/com/nhn/pinpoint/collector/receiver/DataReceiver.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/DataReceiver.java

src/main/java/com/nhn/pinpoint/collector/receiver/DispatchHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/DispatchHandler.java

src/main/java/com/nhn/pinpoint/collector/receiver/TcpDispatchHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/TcpDispatchHandler.java

src/main/java/com/nhn/pinpoint/collector/receiver/UdpDispatchHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/UdpDispatchHandler.java

src/main/java/com/nhn/pinpoint/collector/receiver/UdpSpanDispatchHandler.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/UdpSpanDispatchHandler.java

src/main/java/com/nhn/pinpoint/collector/receiver/tcp/AgentProperties.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/tcp/AgentProperties.java

src/main/java/com/nhn/pinpoint/collector/receiver/tcp/AgentPropertiesType.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/tcp/AgentPropertiesType.java

src/main/java/com/nhn/pinpoint/collector/receiver/tcp/TCPReceiver.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/tcp/TCPReceiver.java

src/main/java/com/nhn/pinpoint/collector/receiver/udp/UDPReceiver.java → collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/UDPReceiver.java

src/main/java/com/nhn/pinpoint/collector/util/AcceptedTimeService.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/AcceptedTimeService.java

src/main/java/com/nhn/pinpoint/collector/util/AtomicLongUpdateMap.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/AtomicLongUpdateMap.java

src/main/java/com/nhn/pinpoint/collector/util/ConcurrentCounterMap.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/ConcurrentCounterMap.java

src/main/java/com/nhn/pinpoint/collector/util/DatagramPacketFactory.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/DatagramPacketFactory.java

src/main/java/com/nhn/pinpoint/collector/util/ObjectPool.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/ObjectPool.java

src/main/java/com/nhn/pinpoint/collector/util/ObjectPoolFactory.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/ObjectPoolFactory.java

src/main/java/com/nhn/pinpoint/collector/util/PacketUtils.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/PacketUtils.java

src/main/java/com/nhn/pinpoint/collector/util/ThreadLocalAcceptedTimeService.java → collector/src/main/java/com/navercorp/pinpoint/collector/util/ThreadLocalAcceptedTimeService.java

src/main/resources-dev/hbase.properties → collector/src/main/resources-dev/hbase.properties

src/main/resources-dev/log4j.xml → collector/src/main/resources-dev/log4j.xml

src/main/resources-dev/pinpoint-collector.properties → collector/src/main/resources-dev/pinpoint-collector.properties

src/main/resources-local/hbase.properties → collector/src/main/resources-local/hbase.properties

Some files were not shown because too many files have changed in this diff Show More