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

Fix endpoint name rule package (#2405) 

* Add more logs

* no message

* no message

* Exclude test file.
This commit is contained in:
吴晟 Wu Sheng 2019-03-26 13:25:07 -07:00 committed by GitHub
parent 9a09e96204
commit 59d4725091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
View File

@ -63,6 +63,12 @@ public class StringFormatGroup {
return new FormatResult(false, string);
}
@Override public String toString() {
return "StringFormatGroup{" +
"rules=" + rules +
'}';
}
public class FormatResult {
private boolean match;
private String name;
@ -97,5 +103,12 @@ public class StringFormatGroup {
public Pattern getPattern() {
return pattern;
}
@Override public String toString() {
return "PatternRule{" +
"name='" + name + '\'' +
", pattern=" + pattern +
'}';
}
}
}

7
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
View File

@ -46,18 +46,21 @@ public class EndpointNameFormater {
}
if (stream == null) {
logger.info("endpoint_naming_rules.properties not found. No endpoint name setup.");
logger.info("endpoint_naming_rules.properties not found. No endpoint naming setup.");
} else {
properties.load(stream);
properties.forEach((key, value) -> {
endpointRule.addRule((String)key, (String)value);
logger.debug("endpoint naming rule of service {} found, name[{}] and rule[{}]", service, key, value);
});
}
} catch (IOException e) {
logger.info("{}_endpoint_rules.properties not found. No endpoint name setup.", service);
logger.info("{}_endpoint_rules.properties not found. No endpoint naming setup.", service);
}
ALL_RULES.put(service, endpointRule);
logger.debug("endpoint naming rules of service {} added. {}", service, endpointRule);
}
public static StringFormatGroup.FormatResult format(String service, String endpointName) {

8
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
View File

@ -63,10 +63,16 @@ public class TelemetryDataDispatcher {
public static void preProcess(ServiceMeshMetric data) {
String service = data.getDestServiceId() == Const.NONE ? data.getDestServiceName() :
SERVICE_CACHE.get(data.getDestServiceId()).getName();
StringFormatGroup.FormatResult formatResult = EndpointNameFormater.format(service, data.getEndpoint());
String endpointName = data.getEndpoint();
StringFormatGroup.FormatResult formatResult = EndpointNameFormater.format(service, endpointName);
if (formatResult.isMatch()) {
data = data.toBuilder().setEndpoint(formatResult.getName()).build();
}
if (logger.isDebugEnabled()) {
if (formatResult.isMatch()) {
logger.debug("Endpoint {} is renamed to {}", endpointName, data.getEndpoint());
}
}
ServiceMeshMetricDataDecorator decorator = new ServiceMeshMetricDataDecorator(data);
if (decorator.tryMetaDataRegister()) {

1
oap-server/server-starter/pom.xml
View File

@ -186,6 +186,7 @@
<exclude>alarm-settings.yml</exclude>
<exclude>component-libraries.yml</exclude>
<exclude>datasource-settings.properties</exclude>
<exclude>endpoint_naming_rules.properties</exclude>
</excludes>
</configuration>
</plugin>