Woonduk Kang
a623a8900a
Merge branch 'master' of emeroad/pinpoint
...
from pull-request 5
* refs/heads/master:
#3 JAVA_7_HOME->env.JAVA_7_HOME
2014-09-01 11:39:11 +09:00
Woonduk Kang
b55c050a41
#3 JAVA_7_HOME->env.JAVA_7_HOME
2014-09-01 11:37:16 +09:00
Woonduk Kang
d2811ca846
#3 add pinpoint-version property, change log4j scope->compile,
2014-08-29 15:37:03 +09:00
Woonduk Kang
50620b6da1
Merge branch 'master' of lioolli/pinpoint
...
from pull-request 1
* refs/heads/master:
[NO-BTS] correct jsp tag library xsd file version and location.
[#2 ] remove NetworkUtilsTest.testGetMachineName__getHostName() * If getHostName() fails because of UnknownHostException, call getMachineName()
2014-08-29 14:09:20 +09:00
Hyun Jeong
db85e3a673
Merge branch 'master' of hyungil.jeong/pinpoint
...
from pull-request 3
* refs/heads/master:
[#3 ] Commit modified Version file.
2014-08-28 19:26:55 +09:00
Hyun Jeong
44e18921f2
[ #3 ] Commit modified Version file.
2014-08-28 19:25:54 +09:00
Hyun Jeong
d45bbb02c0
Merge branch 'master' of hyungil.jeong/pinpoint
...
from pull-request 2
* refs/heads/master:
[#3 ] Change Pinpoint versions to 1.0.3-SNAPSHOT.
2014-08-28 19:20:52 +09:00
Hyun Jeong
57b0c583d3
[ #3 ] Change Pinpoint versions to 1.0.3-SNAPSHOT.
2014-08-28 19:18:56 +09:00
Jongho Moon
b0a5a03f13
[NO-BTS] correct jsp tag library xsd file version and location.
2014-08-28 18:17:23 +09:00
Jongho Moon
40a35e5ec5
[ #2 ] remove NetworkUtilsTest.testGetMachineName__getHostName()
...
* If getHostName() fails because of UnknownHostException, call
getMachineName()
2014-08-28 16:52:30 +09:00
Jongho Moon
2ac2d0ed13
[ #1 ] add omitted antrun plugin to profiler-optional project.
2014-08-27 19:00:12 +09:00
Jongho Moon
6f9b181081
[ #1 ] merge pinpoint projects and convert to maven multi module project
2014-08-27 18:45:10 +09:00
Jongho Moon
d55ebfa61e
merge web
2014-08-27 18:13:03 +09:00
Jongho Moon
8ca58f7bec
Merge remote-tracking branch 'web/master' into merge
2014-08-27 18:11:01 +09:00
Jongho Moon
7300ae6fe1
merge thrift
2014-08-27 18:09:53 +09:00
Jongho Moon
e3daa546bd
Merge remote-tracking branch 'thrift/master' into merge
2014-08-27 18:09:03 +09:00
Jongho Moon
118aa1ce8a
merge testweb
2014-08-27 18:08:12 +09:00
Jongho Moon
60832fa487
Merge remote-tracking branch 'testweb/master' into merge
2014-08-27 18:07:36 +09:00
Jongho Moon
3a8e293802
merge rpc
2014-08-27 18:06:43 +09:00
Jongho Moon
527bf90e18
Merge remote-tracking branch 'rpc/master' into merge
2014-08-27 18:06:22 +09:00
Jongho Moon
e44767de1b
merge profiler-optional
2014-08-27 18:05:41 +09:00
Jongho Moon
24afb425cb
Merge remote-tracking branch 'profiler-optional/master' into merge
2014-08-27 18:05:12 +09:00
Jongho Moon
7d46cd3f31
merge profiler
2014-08-27 18:03:19 +09:00
Jongho Moon
13249c905b
Merge remote-tracking branch 'profiler/master' into merge
2014-08-27 18:02:38 +09:00
Jongho Moon
38317abf7d
merge collector
2014-08-27 18:01:36 +09:00
Jongho Moon
5e9bc3f8d9
Merge remote-tracking branch 'collector/master' into merge
2014-08-27 18:00:04 +09:00
Jongho Moon
c48b7c8568
merge commons
2014-08-27 17:51:15 +09:00
Jongho Moon
0797045b3e
Merge remote-tracking branch 'commons/master' into merge
2014-08-27 17:49:54 +09:00
Jongho Moon
4d7e3966b9
merge bootstrap
2014-08-27 17:49:43 +09:00
Hyun Jeong
3be7af01ce
Merge branch 'hyungil.jeong/pinpoint-profiler/issue-73' of hyungil.jeong/pinpoint-web
...
from pull-request 3
* refs/heads/hyungil.jeong/pinpoint-profiler/issue-73:
[Pinpoint/pinpoint-profiler#73 ] Added support for AgentStats batch.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-27 10:57:18 +09:00
Hyun Jeong
540b16e8bb
Merge branch 'hyungil.jeong/pinpoint-profiler/issue-73' of hyungil.jeong/pinpoint-collector
...
from pull-request 2
* refs/heads/hyungil.jeong/pinpoint-profiler/issue-73:
Fixed indentation issue.
[Pinpoint/pinpoint-profiler#73 ] Changed how AgentStats are stored. Before : serialized Thrift DTO After : serialized BO
[Pinpoint/pinpoint-profiler#73 ] Added Thrift DTO to BO mapping.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-27 10:57:12 +09:00
Hyun Jeong
81d79114ad
Merge branch 'hyungil.jeong/issue-73' of hyungil.jeong/pinpoint-tomcat-profiler
...
from pull-request 15
* refs/heads/hyungil.jeong/issue-73:
Fixed indentation issue.
[#73 ] 별도로 AgentStatSingle DTO를 사용하지 않고, TAgentStat을 묶어 보내도록 변경.
[#73 ] AgentStatCollector에서 각 collector들 가져오는 방법 및 CpuLoadCollector 생성 방법 변경. [#73 ] 지원되지 않는 GarbageCollector는 UnknownGarbageCollector를 반환하도록 변경.
[#73 ] AgentStat 모아 보내기 구현
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-27 10:57:06 +09:00
Hyun Jeong
d1a2455eab
Merge branch 'hyungil.jeong/pinpoint-profiler/issue-73' of hyungil.jeong/pinpoint-commons
...
from pull-request 5
* refs/heads/hyungil.jeong/pinpoint-profiler/issue-73:
fixed indentation issue.
[Pinpoint/pinpoint-profiler#73 ] Added BO for memory/gc, and cpuLoad.
[Pinpoint/pinpoint-profiler#73 ] Added support for double.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-27 10:56:56 +09:00
Hyun Jeong
cb5733b744
Merge branch 'hyungil.jeong/pinpoint-profiler/issue-73' of hyungil.jeong/pinpoint-thrift
...
from pull-request 4
* refs/heads/hyungil.jeong/pinpoint-profiler/issue-73:
[Pinpoint/pinpoint-profiler#73 ] TAgentStatBatch 헤더 정보 및 TBaseLocator에 추가
[Pinpoint/pinpoint-profiler#73 ] Added Thrift DTOs for AgentStat batch send
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-27 10:56:46 +09:00
Hyun Jeong
d08b3b9c68
Merge branch 'hyungil.jeong/issue-17' of hyungil.jeong/pinpoint-tomcat-profiler
...
from pull-request 19
* refs/heads/hyungil.jeong/issue-17:
[#17 ] Modified test target to the one loaded with TestClassLoader. [#17 ] Removed unnecessary context class loader switching. [#17 ] Added hierarchical search for PinpointTestClassLoader annotation.
Fixed indentation issue and author.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-26 19:06:53 +09:00
Woonduk Kang
ae7f7c2488
[RELEASE-8] unknown node의 링크 클릭시 데이터가 정상적이지 않아 일단 scope 초기화를 주석 처리함.
2014-08-26 18:15:06 +09:00
Woonduk Kang
d6ae1de2ba
[RELEASE-8] 오타 수정.
2014-08-26 10:38:52 +09:00
Hyun Jeong
898e386793
[ #17 ] Modified test target to the one loaded with TestClassLoader.
...
[#17 ] Removed unnecessary context class loader switching.
[#17 ] Added hierarchical search for PinpointTestClassLoader annotation.
2014-08-25 19:23:47 +09:00
Hyun Jeong
7e3af0f27d
Merge branch 'master' of hyungil.jeong/pinpoint-collector
...
from pull-request 4
* refs/heads/master:
[NOBTS] local 환경에서는 local-dev hbase 바라보도록 수정.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-25 19:03:59 +09:00
Hyun Jeong
541a0f6585
Merge branch 'master' of hyungil.jeong/pinpoint-web
...
from pull-request 4
* refs/heads/master:
[NOBTS] local 환경에서는 local-dev hbase 바라보도록 수정.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-25 19:01:45 +09:00
Hyun Jeong
2b1eb4d86d
[NOBTS] local 환경에서는 local-dev hbase 바라보도록 수정.
2014-08-25 19:01:04 +09:00
Hyun Jeong
93a1f9c4d4
[NOBTS] local 환경에서는 local-dev hbase 바라보도록 수정.
2014-08-25 19:00:51 +09:00
Woonduk Kang
5f0e89dd7c
[RELEASE-8] 1.0.2 에서 난독화 스크립트 수정.
2014-08-25 17:22:15 +09:00
Woonduk Kang
a3004b93de
[RELEASE-8] 1.0.2 에서 난독화 스크립트 수정.
2014-08-25 15:06:40 +09:00
Hyun Jeong
2bd7f52eb9
Merge branch 'master' of hyungil.jeong/pinpoint-bootstrap
...
from pull-request 3
* refs/heads/master:
[RELEASE-8] 1.0.2 릴리즈를 위한 난독화 수정.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-25 11:27:14 +09:00
Hyun Jeong
3cad8deb6e
[RELEASE-8] 1.0.2 릴리즈를 위한 난독화 수정.
2014-08-25 11:23:55 +09:00
Hyun Jeong
470398a19f
Merge branch 'hyungil.jeong/pinpoint-tomcat-profiler/issue-13' of hyungil.jeong/pinpoint-bootstrap
...
from pull-request 1
* refs/heads/hyungil.jeong/pinpoint-tomcat-profiler/issue-13:
[Pinpoint/pinpoint-profiler#13 ] profiler-optional에서 상속받는 class/interface 난독화 제외.
Reviewed-by: 정현길 <hyungil.jeong@navercorp.com >
2014-08-25 10:48:50 +09:00
Hyun Jeong
7b56dac536
Fixed indentation issue and author.
2014-08-25 10:09:04 +09:00
koo-taejin
b5ee9a8b74
#8 l4 는 상태체크에서 제거
2014-08-22 16:22:24 +09:00
Woonduk Kang
99e109e5b5
[RELEASE-8] 1.0.2 에서 신규로 추가된 테이블 추가 및 관리 스크립트 수정.
2014-08-22 11:46:20 +09:00