You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/03/26 17:19:40 UTC
[incubator-skywalking] branch endpoint-rename created (now 4f701b6)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch endpoint-rename
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at 4f701b6 Add more logs
This branch includes the following new commits:
new 4f701b6 Add more logs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-skywalking] 01/01: Add more logs
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch endpoint-rename
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 4f701b6fd156717552b73342262ae8754ae41662
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Mar 26 10:19:27 2019 -0700
Add more logs
---
.../org/apache/skywalking/apm/util/StringFormatGroup.java | 13 +++++++++++++
.../aop/server/receiver/mesh/EndpointNameFormater.java | 3 +++
.../aop/server/receiver/mesh/TelemetryDataDispatcher.java | 8 +++++++-
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
index 36d689b..e2b7a4f 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
@@ -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 +
+ '}';
+ }
}
}
diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
index 0b88705..2c3ca34 100644
--- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
@@ -51,6 +51,7 @@ public class EndpointNameFormater {
properties.load(stream);
properties.forEach((key, value) -> {
endpointRule.addRule((String)key, (String)value);
+ logger.debug("endpoint rule of service {} found, name[{}] and rule[{}]", service, key, value);
});
}
} catch (IOException e) {
@@ -58,6 +59,8 @@ public class EndpointNameFormater {
}
ALL_RULES.put(service, endpointRule);
+ logger.debug("endpoint rules of service {} added. {}", service, endpointRule);
+
}
public static StringFormatGroup.FormatResult format(String service, String endpointName) {
diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index 06a59d3..4731d48 100644
--- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -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()) {