Skip to content

Commit f0203f4

Browse files
authored
Merge pull request #422 from scouter-project/develop
Develop
2 parents 41af75d + 45ff58b commit f0203f4

File tree

106 files changed

+952
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+952
-254
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
![scouter](./scouter.document/img/main/scouter-logo-w200.png)
66

7-
![Englsh](https://img.shields.io/badge/language-English-orange.svg) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
7+
[![Englsh](https://img.shields.io/badge/language-English-orange.svg)](README.md) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
88

99
## Application Performance Monitoring for Open Source S/Ws.
1010
SCOUTER is an open source APM like new relic and appdynamics.

README_kr.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
![scouter](./scouter.document/img/main/scouter-logo-w200.png)
66

7-
[![Englsh](https://img.shields.io/badge/language-English-orange.svg)](README.md) ![Korean](https://img.shields.io/badge/language-Korean-blue.svg)
7+
[![Englsh](https://img.shields.io/badge/language-English-orange.svg)](README.md) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
88

99
## 어플리케이션 성능 모니터링
1010

@@ -33,10 +33,10 @@
3333
## Documents
3434
- [Document Home](./scouter.document/index_kr.md)
3535
- [Quick Start(Scouter Demo 설치)](./scouter.document/main/Quick-Start_kr.md)
36-
- [Scouter 설치](./scouter.document/main/Setup.md)
36+
- [Scouter 설치](./scouter.document/main/Setup_kr.md)
3737
- [Live demo 접속](./scouter.document/main/Live-Demo_kr.md)
38-
- [XLog 로 분석하기](./scouter.document/client/Reading-XLog.md)
39-
- [사용자 정의 알람 스크립팅 - Alert plugins guide](./scouter.document/main/Alert-Plugin-Guide.md)
38+
- [XLog 로 분석하기](./scouter.document/client/Reading-XLog_kr.md)
39+
- [사용자 정의 알람 스크립팅 - Alert plugins guide](./scouter.document/main/Alert-Plugin-Guide_kr.md)
4040
- [Client 화면 설명](./scouter.document/client/How-To-Use-Client_kr.md)
4141

4242
## Download
@@ -81,8 +81,6 @@
8181
- **Agent plugin**
8282
- TBD
8383

84-
<br>s
85-
8684
## Facebook
8785
- [Scouter APM 사용자 모임 - Facebook 그룹](https://www.facebook.com/groups/scouterapm/)
8886

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>1.8.0</version>
7+
<version>1.8.1.SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>SCOUTER APM</name>

scouter.agent.batch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.scouter-project</groupId>
77
<artifactId>scouter-parent</artifactId>
8-
<version>1.8.0</version>
8+
<version>1.8.1.SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scouter-agent-batch</artifactId>

scouter.agent.host/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>1.8.0</version>
7+
<version>1.8.1.SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scouter-agent-host</artifactId>

scouter.agent.java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>1.8.0</version>
7+
<version>1.8.1.SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scouter-agent-java</artifactId>

scouter.agent.java/src/main/java/scouter/AnyTrace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static Object startService(String name) {
3636
}
3737

3838
public static void setServiceName(String name) {
39-
TraceMain.setServiceName(name);
39+
TraceMain.setSpringControllerName(name);
4040
}
4141

4242
public static void serviceError(String emsg) {

scouter.agent.java/src/main/java/scouter/agent/AgentCommonConstant.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*
77
*/
88
public class AgentCommonConstant {
9-
public static final String SPRING_REQUEST_MAPPING_POSTFIX_FLAG = " [:SRM]";
109
public static final String REQUEST_ATTRIBUTE_INITIAL_TRACE_CONTEXT = "__scouter__itc__";
1110
public static final String REQUEST_ATTRIBUTE_TRACE_CONTEXT = "__scouter__tc__";
1211
public static final String REQUEST_ATTRIBUTE_ASYNC_DISPATCH = "__scouter__ad__";
@@ -18,20 +17,6 @@ public class AgentCommonConstant {
1817

1918
private static final char at = '@';
2019

21-
/**
22-
* remove " [:SRM]" from service name
23-
*/
24-
public static String removeSpringRequestMappingPostfixFlag(String org) {
25-
int pos = org.indexOf(SPRING_REQUEST_MAPPING_POSTFIX_FLAG);
26-
if(pos < 0) return org;
27-
String pre = org.substring(0, pos);
28-
if(org.length() > pre.length() + SPRING_REQUEST_MAPPING_POSTFIX_FLAG.length()) {
29-
return pre + org.substring(pos + SPRING_REQUEST_MAPPING_POSTFIX_FLAG.length());
30-
} else {
31-
return pre;
32-
}
33-
}
34-
3520
public static String normalizeHashCode(String text) {
3621
if(text == null) return text;
3722
int atPos = text.lastIndexOf(at);

scouter.agent.java/src/main/java/scouter/agent/Configure.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@ public final static synchronized Configure getInstance() {
577577
public long counter_recentuser_valid_ms = DateUtil.MILLIS_PER_FIVE_MINUTE;
578578
@ConfigDesc("Path to file creation directory of process ID file")
579579
public String counter_object_registry_path = "/tmp/scouter";
580+
@ConfigDesc("Activating custom jmx")
581+
public boolean counter_custom_jmx_enabled = false;
580582

581583
// SFA(Stack Frequency Analyzer)
582584
@ConfigDesc("Activating period threaddump function")
@@ -639,6 +641,7 @@ public final static synchronized Configure getInstance() {
639641
private int hook_signature;
640642
private StringSet _hook_method_ignore_classes = new StringSet();
641643
private int enduser_perf_endpoint_hash = HashUtil.hash(enduser_trace_endpoint_url);
644+
private StringSet custom_jmx_set = new StringSet();
642645

643646
/**
644647
* sometimes call by sample application, at that time normally set some
@@ -914,6 +917,8 @@ private void apply() {
914917

915918
this.counter_recentuser_valid_ms = getLong("counter_recentuser_valid_ms", DateUtil.MILLIS_PER_FIVE_MINUTE);
916919
this.counter_object_registry_path = getValue("counter_object_registry_path", "/tmp/scouter");
920+
this.counter_custom_jmx_enabled = getBoolean("counter_custom_jmx_enabled", false);
921+
this.custom_jmx_set = getStringSet("custom_jmx_set", "||");
917922
this.sfa_dump_enabled = getBoolean("sfa_dump_enabled", false);
918923
this.sfa_dump_interval_ms = getInt("sfa_dump_interval_ms", 10000);
919924

@@ -1092,6 +1097,10 @@ public boolean isIgnoreMethodPrefix(String name) {
10921097
return false;
10931098
}
10941099

1100+
public StringSet getCustomJmxSet() {
1101+
return this.custom_jmx_set;
1102+
}
1103+
10951104
public boolean isIgnoreMethodClass(String classname) {
10961105
return _hook_method_ignore_classes.hasKey(classname);
10971106
}

scouter.agent.java/src/main/java/scouter/agent/ObjTypeDetector.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public class ObjTypeDetector {
3636
bootClass.put("org/apache/catalina/startup/Bootstrap", CounterConstants.TOMCAT);
3737
bootClass.put("org/apache/catalina/startup/Tomcat", CounterConstants.TOMCAT);
3838
bootClass.put("com/caucho/server/resin/Resin", CounterConstants.RESIN); // resin 4.x
39+
bootClass.put("com/sun/enterprise/glassfish/bootstrap/ASMain", CounterConstants.GLASSFISH);
40+
bootClass.put("weblogic/Server", CounterConstants.WEBLOGIC);
41+
bootClass.put("com/ibm/wsspi/bootstrap/WSPreLauncher", CounterConstants.WEBSPHERE);
3942
}
4043

4144
public static String objType = null;

0 commit comments

Comments
 (0)