kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix doc on recently pr (#5432)

This commit is contained in:
Evan 2020-09-03 23:20:36 +08:00 committed by GitHub
parent 9143f1342d
commit 0e132685e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apm-sniffer/config/agent.config
View File

@ -92,7 +92,7 @@ logging.level=${SW_LOGGING_LEVEL:INFO}
# plugin.kafka.bootstrap_servers=${SW_KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
# Exclude activated plugins
# plugin.exclude_plugins=${SW_EXCLUDE_PLUGINS:""}
# plugin.exclude_plugins=${SW_EXCLUDE_PLUGINS:}
# Match spring bean with regex expression for classname
# plugin.springannotation.classname_match_regex_expression=${SW_SPRINGANNOTATION_CLASSNAME_MATCH_REGEX_EXPRESSION:""}
# plugin.springannotation.classname_match_regex=${SW_SPRINGANNOTATION_CLASSNAME_MATCH_REGEX:}

6
apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java
View File

@ -34,7 +34,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not;
import static org.apache.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch;
import static org.apache.skywalking.apm.agent.core.plugin.match.RegexMatch.byRegexMatch;
import static org.apache.skywalking.apm.plugin.spring.annotations.SpringAnnotationConfig.Plugin.SpringAnnotation.CLASSNAME_MATCH_REGEX_EXPRESSION;
import static org.apache.skywalking.apm.plugin.spring.annotations.SpringAnnotationConfig.Plugin.SpringAnnotation.CLASSNAME_MATCH_REGEX;
public abstract class AbstractSpringBeanInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.spring.annotations.SpringAnnotationInterceptor";
@ -72,11 +72,11 @@ public abstract class AbstractSpringBeanInstrumentation extends ClassInstanceMet
@Override
protected ClassMatch enhanceClass() {
if (StringUtil.isEmpty(CLASSNAME_MATCH_REGEX_EXPRESSION)) {
if (StringUtil.isEmpty(CLASSNAME_MATCH_REGEX)) {
return byClassAnnotationMatch(getEnhanceAnnotation());
} else {
return LogicalMatchOperation.and(
byRegexMatch(CLASSNAME_MATCH_REGEX_EXPRESSION.split(",")),
byRegexMatch(CLASSNAME_MATCH_REGEX.split(",")),
byClassAnnotationMatch(getEnhanceAnnotation())
);
}

2
apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationConfig.java
View File

@ -28,7 +28,7 @@ public class SpringAnnotationConfig {
/**
* regex expression to match spring bean classname
*/
public static String CLASSNAME_MATCH_REGEX_EXPRESSION = "";
public static String CLASSNAME_MATCH_REGEX = "";
}
}
}

2
docs/en/setup/service-agent/java-agent/README.md
View File

@ -153,7 +153,7 @@ property key | Description | Default |
`plugin.kafka.topic_segment` | Specify which Kafka topic name for traces data to report to. | `skywalking_segments` |
`plugin.kafka.topic_profilings` | Specify which Kafka topic name for Thread Profiling snapshot to report to. | `skywalking_profilings` |
`plugin.kafka.topic_management` | Specify which Kafka topic name for the register or heartbeat data of Service Instance to report to. | `skywalking_managements` |
`plugin.springannotation.classname_match_regex_expression` | Match spring beans with regex expression for the class name. Multiple expressions could be separated by a comma. This only works when `Spring annotation plugin` has been activated. | `All the spring beans tagged with @Bean,@Service,@Dao, or @Repository.` |
`plugin.springannotation.classname_match_regex` | Match spring beans with regular expression for the class name. Multiple expressions could be separated by a comma. This only works when `Spring annotation plugin` has been activated. | `All the spring beans tagged with @Bean,@Service,@Dao, or @Repository.` |
## Optional Plugins