You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/09/20 02:54:04 UTC
[skywalking] branch cluster/telemetry created (now ee5a272)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch cluster/telemetry
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at ee5a272 Set telemtry instance id in etcd and nacos plugins
This branch includes the following new commits:
new 7dc42ac Merge remote-tracking branch 'origin/master'
new ee5a272 Set telemtry instance id in etcd and nacos plugins
The 2 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.
[skywalking] 02/02: Set telemtry instance id in etcd and nacos
plugins
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch cluster/telemetry
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ee5a2727eb5f5a9876d5db88415f0779fdf7bd42
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Sep 20 10:53:20 2019 +0800
Set telemtry instance id in etcd and nacos plugins
---
.../skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java | 2 ++
.../skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
index b614158..307da9e 100644
--- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
+++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
@@ -33,6 +33,7 @@ import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException;
import org.apache.skywalking.oap.server.core.remote.client.Address;
+import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext;
/**
* @author Alan Lau
@@ -90,6 +91,7 @@ public class EtcdCoordinator implements ClusterRegister, ClusterNodesQuery {
}
this.selfAddress = remoteInstance.getAddress();
+ TelemetryRelatedContext.INSTANCE.setId(selfAddress.toString());
EtcdEndpoint endpoint = new EtcdEndpoint.Builder().serviceName(serviceName).host(selfAddress.getHost()).port(selfAddress.getPort()).build();
try {
diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
index 4225a75..f2f73ac 100644
--- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
+++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
@@ -24,6 +24,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
import org.apache.skywalking.oap.server.core.cluster.*;
import org.apache.skywalking.oap.server.core.remote.client.Address;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
+import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext;
import java.util.ArrayList;
import java.util.List;
@@ -72,5 +73,6 @@ public class NacosCoordinator implements ClusterRegister, ClusterNodesQuery {
throw new ServiceRegisterException(e.getMessage());
}
this.selfAddress = remoteInstance.getAddress();
+ TelemetryRelatedContext.INSTANCE.setId(selfAddress.toString());
}
}
[skywalking] 01/02: Merge remote-tracking branch 'origin/master'
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch cluster/telemetry
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 7dc42ac3457bc6256ae61bfaab4fea48d12e6378
Merge: f3b84d2 60236a2
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Sep 20 10:37:56 2019 +0800
Merge remote-tracking branch 'origin/master'
.../network/trace/component/ComponentsDefine.java | 4 +
.../skywalking/apm/agent/core/conf/Config.java | 21 +++
.../apm/agent/core/logging/core/FileWriter.java | 59 +++++++--
.../remote/ServiceAndEndpointRegisterClient.java | 13 +-
.../agent/core/logging/core/FileWriterTest.java | 29 ++++-
.../cassandra-java-driver-3.x-plugin/pom.xml | 46 +++++++
.../java/driver/v3/ClusterConnectInterceptor.java | 58 +++++++++
...ConstructorWithStateListenerArgInterceptor.java | 48 +++++++
.../cassandra/java/driver/v3/ConnectionInfo.java | 33 +++--
.../plugin/cassandra/java/driver/v3/Constants.java | 14 +-
...sultSetFutureGetUninterruptiblyInterceptor.java | 61 +++++++++
...AndExecuteAsyncWithStatementArgInterceptor.java | 84 ++++++++++++
.../driver/v3/define/ClusterInstrumentation.java | 84 ++++++++++++
.../DefaultResultSetFutureInstrumentation.java | 71 +++++++++++
.../v3/define/SessionManagerInstrumentation.java | 72 +++++++++++
.../src/main/resources/skywalking-plugin.def | 7 +-
.../driver/v3/ClusterConnectInterceptorTest.java | 68 ++++++++++
...tructorWithStateListenerArgInterceptorTest.java | 74 +++++++++++
...SetFutureGetUninterruptiblyInterceptorTest.java | 79 ++++++++++++
...xecuteAsyncWithStatementArgInterceptorTest.java | 88 +++++++++++++
.../light4j-plugins/light4j-plugin/pom.xml | 51 ++++++++
.../plugin/light4j/HandleRequestInterceptor.java | 141 +++++++++++++++++++++
.../light4j/define/LightInstrumentation.java | 73 +++++++++++
.../src/main/resources/skywalking-plugin.def | 5 +-
.../light4j/HandleRequestInterceptorTest.java | 85 +++++++++++++
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 42 ++++++
apm-sniffer/apm-sdk-plugin/pom.xml | 2 +
...trollerForLowVersionConstructorInterceptor.java | 41 ++++++
.../v4/define/AbstractSpring4Instrumentation.java | 2 +-
.../ControllerForLowVersionInstrumentation.java | 57 +++++++++
...RestControllerForLowVersionInstrumentation.java | 57 +++++++++
.../v4/define/RestControllerInstrumentation.java | 12 +-
.../src/main/resources/skywalking-plugin.def | 2 +
apm-sniffer/config/agent.config | 4 +
docs/en/FAQ/why_mq_not_involved.md | 2 +-
docs/en/setup/envoy/als_setting.md | 29 +----
docs/en/setup/service-agent/java-agent/README.md | 3 +
.../service-agent/java-agent/Supported-list.md | 3 +
.../oap/server/core/CoreModuleProvider.java | 11 +-
.../oap/server/core/query/entity/Service.java | 3 +-
.../server/core/query/entity/ServiceInstance.java | 8 +-
.../server/core/remote/RemoteSenderService.java | 27 +++-
.../src/test/resources/component-libraries.yml | 12 +-
.../handler/v6/grpc/RegisterServiceHandler.java | 44 +++++--
.../src/main/resources/component-libraries.yml | 12 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 41 +++---
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 42 +++---
skywalking-ui | 2 +-
.../apache/skywalking/e2e/AgentRebootITCase.java | 28 ++--
.../skywalking/e2e/ClusterVerificationITCase.java | 8 +-
.../skywalking/e2e/SampleVerificationITCase.java | 20 +--
51 files changed, 1717 insertions(+), 165 deletions(-)