home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-19 01:35:58 +10:00
Code Issues Packages Projects Releases Wiki Activity
4,483 Commits 5 Branches 14 Tags
cdbf9d2a67eb32a52c855f3ab2884508543700ea
Commit Graph
4483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaehong Kim cdbf9d2a67 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint 
Conflicts:
	commons/compile.txt
 2014-09-25 13:31:24 +09:00
Jaehong Kim ad9babe17a Merge branch 'master' of http://kimjh008@yobi.navercorp.com/kimjh008/pinpoint_redis_interceptor 2014-09-25 11:54:09 +09:00
Jaehong Kim 9e0e90e40a #7 fix comment & try catched unexpected exception 2014-09-25 11:53:52 +09:00
Woonduk Kang 5add84f191 Merge branch 'master' of emeroad/pinpoint 
from pull-request 23

* refs/heads/master:
  remove unused script
 2014-09-25 11:52:20 +09:00
Woonduk Kang b5b7d8920d remove unused script 2014-09-25 11:51:27 +09:00
Woonduk Kang b703d08cb8 Merge branch 'master' of emeroad/pinpoint 
from pull-request 22

* refs/heads/master:
  add target dir
 2014-09-25 11:41:51 +09:00
Woonduk Kang 05d19d0b93 add target dir 2014-09-25 11:39:11 +09:00
Jaehong Kim 3d1d571d44 #7 add properties - redis/nbaseArc enabled 2014-09-25 11:37:50 +09:00
Woonduk Kang a7e47e9c26 Merge branch 'master' of emeroad/pinpoint 
from pull-request 21

* refs/heads/master:
  [#23] fix maven warning message
 2014-09-25 11:26:48 +09:00
Woonduk Kang 9cd47e7338 [#23] fix maven warning message 2014-09-25 11:25:12 +09:00
Jaehong Kim 8aad79ba89 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint 
Conflicts:
	bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/config/ProfilerConfig.java
	bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/interceptor/InterceptorRegistry.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/DefaultModifierRegistry.java
	testweb/src/main/resources/applicationContext-testweb.xml
 2014-09-24 19:36:23 +09:00
Jaehong Kim d5f26e6350 Merge branch 'master' of http://kimjh008@yobi.navercorp.com/kimjh008/pinpoint_redis_interceptor 2014-09-24 18:57:53 +09:00
Jaehong Kim 605755ca66 #7 need merge ... 2014-09-24 18:57:35 +09:00
Jaehong Kim 4d4738ded7 #7 add pipeline & trace destination id 2014-09-24 18:38:47 +09:00
Woonduk Kang 26cbadd453 Merge branch 'master' of emeroad/pinpoint 
from pull-request 20

* refs/heads/master:
  code cleanup : remove deprecated testcase, remove Sys.out
 2014-09-24 18:20:39 +09:00
Woonduk Kang 3b17dc6f90 code cleanup : remove deprecated testcase, remove Sys.out 2014-09-24 18:06:05 +09:00
Woonduk Kang e7d4575d49 Merge branch 'master' of kimjh008/pinpoint_interceptor_registry 
from pull-request 19

* refs/heads/master:
  Merge branch 'master' of http://kimjh008@yobi.navercorp.com/kimjh008/pinpoint_interceptor_registry
  #21 increase max & fix bug - size compare logic
 2014-09-24 16:29:40 +09:00
Jaehong Kim 8beedb732e Merge branch 'master' of http://kimjh008@yobi.navercorp.com/kimjh008/pinpoint_interceptor_registry 2014-09-24 16:19:44 +09:00
Woonduk Kang 322fa14393 #21 increase max & fix bug - size compare logic 2014-09-24 16:18:21 +09:00
Woonduk Kang 3e274401f4 Merge branch 'master' of emeroad/pinpoint 
from pull-request 18

* refs/heads/master:
  [#10] add mssqlserver test, testcase refactoring
 2014-09-24 15:34:48 +09:00
Woonduk Kang a585fb456e [#10] add mssqlserver test, testcase refactoring 2014-09-24 15:31:57 +09:00
Woonduk Kang 99e1c87ce2 Merge branch 'master' of emeroad/pinpoint 
from pull-request 17

* refs/heads/master:
  [#10] add mssqlserver test, testcase refactoring
  Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint
  [#10] add mssqlserver test, testcase refactoring
  [#10] add mssqlserver test, testcase refactoring
 2014-09-24 13:44:54 +09:00
Woonduk Kang 295da683eb [#10] add mssqlserver test, testcase refactoring 2014-09-24 13:43:55 +09:00
Woonduk Kang 8f1ac6acf5 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint 
Conflicts:
	profiler/src/test/java/com/nhn/pinpoint/profiler/junit4/PinpointJUnit4ClassRunner.java
 2014-09-24 13:31:18 +09:00
Woonduk Kang 38da117434 [#10] add mssqlserver test, testcase refactoring 2014-09-24 13:29:04 +09:00
Woonduk Kang 231dc3d772 [#10] add mssqlserver test, testcase refactoring 2014-09-24 11:38:21 +09:00
Jaehong Kim f6a0aedccd #7 redis&nBase-ARC interceptor 2014-09-23 14:16:22 +09:00
Hyun Jeong b8ac48a330 Merge branch 'hyungil.jeong/issue-14' of hyungil.jeong/pinpoint 
from pull-request 10

* refs/heads/hyungil.jeong/issue-14:
  [#14] Modified LifeCycleEventListener to directly check Agent's status.
  [#14] Changed Tomcat start event hook to when StandardService starts.
 2014-09-22 10:15:12 +09:00
Hyun Jeong 67de78768f Merge branch 'hyungil.jeong/issue-4' of hyungil.jeong/pinpoint 
from pull-request 4

* refs/heads/hyungil.jeong/issue-4:
  [#4] Added StandardHostValveInvokeModifier root span trace test.
  [#4] Add support for RootSpan tracing to test modifier/interceptors.
 2014-09-22 10:15:05 +09:00
Woonduk Kang 78fe2bb704 Merge branch 'master' of emeroad/pinpoint 
from pull-request 13

* refs/heads/master:
  [#10] testcase refactoring
 2014-09-19 18:32:54 +09:00
Woonduk Kang 6d2e9b3caa [#10] testcase refactoring 2014-09-19 18:31:46 +09:00
koo-taejin 799576a79e Merge branch 'master' of sunsh318/pinpoint 
from pull-request 9

* refs/heads/master:
  #5 Pinpoint 클러스터 개발
  #5 Pinpoint 클러스터 개발
  #5 Pinpoint 클러스터 개발
  #12 thrift command 객체 추가
  Merge remote-tracking branch 'upstream/master'
  #12 thrift command 객체 추가
  Merge remote-tracking branch 'upstream/master'
 2014-09-19 14:36:27 +09:00
Woonduk Kang dc81ae8e7a Merge branch 'master' of emeroad/pinpoint 
from pull-request 12

* refs/heads/master:
  [#10] support jtds driver(ms sqlserver)  - add testcase
 2014-09-18 19:08:07 +09:00
Woonduk Kang 0373759e92 [#10] support jtds driver(ms sqlserver) 
- add testcase
 2014-09-18 19:06:54 +09:00
Woonduk Kang 136f5b4dfe Merge branch 'master' of emeroad/pinpoint 
from pull-request 11

* refs/heads/master:
  [#10] support jtds driver(ms sqlserver)
 2014-09-18 18:43:41 +09:00
Hyun Jeong 138951c8e4 [#14] Modified LifeCycleEventListener to directly check Agent's status. 2014-09-18 18:39:12 +09:00
Woonduk Kang 9f6939c285 [#10] support jtds driver(ms sqlserver) 2014-09-18 18:38:40 +09:00
Hyun Jeong 127165ff79 [#14] Changed Tomcat start event hook to when StandardService starts. 2014-09-18 13:07:06 +09:00
koo-taejin bc5fdd3f20 #5 Pinpoint 클러스터 개발 
1. 테스트코드 작성
 2014-09-16 21:36:22 +09:00
koo-taejin c3f668bfdf #5 Pinpoint 클러스터 개발 2014-09-16 20:11:54 +09:00
koo-taejin bcd849d36a #5 Pinpoint 클러스터 개발 
1. clusterPoint간의 데이터를 전달하는 clusterRouter 추가 
2. clusterPoint 기능 강화 
3. 클래스 구조 및 ci서버 지적사항 수정
 2014-09-16 19:41:11 +09:00
koo-taejin d8f48c9880 #12 thrift command 객체 추가 
1. version 등록 (1.0.3-SNAPSHOT)
2. command 기능 등록
 echo (echo)
 commandTransfer (단순 req/res 방식 형태의 command message를 전달하는 기능)
 (stream은 이후 추가 예정)
 2014-09-16 18:17:39 +09:00
koo-taejin f1fbe18227 Merge remote-tracking branch 'upstream/master' 2014-09-16 14:10:00 +09:00
koo-taejin f3a92ee327 #12 thrift command 객체 추가 
1. version 등록 (1.0.3-SNAPSHOT)
2. command 기능 등록
 echo (echo)
 commandTransfer (단순 req/res 방식 형태의 command message를 전달하는 기능)
 (stream은 이후 추가 예정)
 2014-09-16 14:06:02 +09:00
Hyun Jeong 6ee3c7d3ae Merge branch 'master' of sunsh318/pinpoint 
from pull-request 8

* refs/heads/master:
  #5 Pinpoint 클러스터 개발
 2014-09-16 10:14:26 +09:00
koo-taejin 2365bbef8b Merge remote-tracking branch 'upstream/master' 2014-09-04 19:00:01 +09:00
koo-taejin 5bd0562ece #5 Pinpoint 클러스터 개발 
- Pinpoint web에서 클러스터 등록시 해당 acceptor로 연결할수 있는 기능 지원
- cluster 지원 설정 추가 
- 상태값 보강
- 로그 강화
 2014-09-04 18:55:30 +09:00
koo-taejin 959b65cd0f Merge branch 'master' of sunsh318/pinpoint 
from pull-request 7

* refs/heads/master:
  #5 Pinpoint 클러스터 개발
  #5 Pinpoint 클러스터 개발
  #5 Pinpoint 클러스터 개발
  #5 Pinpoint 클러스터 개발
 2014-09-04 18:52:23 +09:00
koo-taejin 4cfc851629 #5 Pinpoint 클러스터 개발 
1. 로컬 설정을 되돌림 테스트시 실패가 가능하기 때문에
 2014-09-01 18:40:01 +09:00
koo-taejin e1edaf2089 #5 Pinpoint 클러스터 개발 
1. 환경별 설정 이름 변경
 2014-09-01 18:18:33 +09:00