(skywalking-showcase) branch fix_SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES_typo deleted (was e30ef69)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch 
fix_SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES_typo
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


 was e30ef69  fix env var typo

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(skywalking-showcase) branch main updated: fix env var typo (#154)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


The following commit(s) were added to refs/heads/main by this push:
 new f07cdad  fix env var typo (#154)
f07cdad is described below

commit f07cdad0d6a5fcf54fda3836713b9282d2c2eb6b
Author: Jared Tan 
AuthorDate: Sun Dec 24 19:21:48 2023 +0800

fix env var typo (#154)
---
 deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
 deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
 deploy/platform/kubernetes/values.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/platform/docker/docker-compose.cluster.yaml 
b/deploy/platform/docker/docker-compose.cluster.yaml
index 07b7f65..bb4d41f 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -53,7 +53,7 @@ services:
   SW_CLUSTER_ZK_HOST_PORT: zookeeper:2181 # @feature: cluster; set up the 
cluster coordinator address
   SW_HEALTH_CHECKER: default # @feature: health-check;
   SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that 
receives the VM metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm; enable the OC rules that analyse the VM metrics
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm; enable the OC rules that analyse the VM metrics
   SW_STORAGE: elasticsearch
   SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml 
b/deploy/platform/docker/docker-compose.single-node.yaml
index 1aa6fc6..705ca26 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -43,7 +43,7 @@ services:
 environment:
   SW_HEALTH_CHECKER: default # @feature: health-check;
   SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that 
receives the VM metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,mysql/*,postgresql/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm,mysql,postgresql,elasticsearch; enable the OC rules that analyse the metrics
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,mysql/*,postgresql/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm,mysql,postgresql,elasticsearch; enable the OC rules that analyse the metrics
   SW_STORAGE: elasticsearch
   SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
diff --git a/deploy/platform/kubernetes/values.yaml 
b/deploy/platform/kubernetes/values.yaml
index dffd3f7..180778f 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -40,7 +40,7 @@ skywalking:
   # @feature: istiod-monitor; enable rules to analyze Istio control plane 
metrics
   # @feature: mysql; enable mysql rules to analyze MySQL metrics
   # @feature: apisix-monitor; enable APISIX rules to analyze APISIX metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
   SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS: "mx-mesh,persistence" # @feature: 
als; enable mesh analyzer (mx-mesh) to analyze ALS logs
   K8S_SERVICE_NAME_RULE: "mesh-svr::${service.metadata.name}"

(skywalking-showcase) branch fix_SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES_typo created (now e30ef69)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch 
fix_SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES_typo
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


  at e30ef69  fix env var typo

This branch includes the following new commits:

 new e30ef69  fix env var typo

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.

(skywalking-showcase) 01/01: fix env var typo

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch 
fix_SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES_typo
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit e30ef693537fcf050f9d3ff17b2b5db567ab9737
Author: Jared Tan 
AuthorDate: Sun Dec 24 19:17:21 2023 +0800

fix env var typo
---
 deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
 deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
 deploy/platform/kubernetes/values.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/platform/docker/docker-compose.cluster.yaml 
b/deploy/platform/docker/docker-compose.cluster.yaml
index 07b7f65..bb4d41f 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -53,7 +53,7 @@ services:
   SW_CLUSTER_ZK_HOST_PORT: zookeeper:2181 # @feature: cluster; set up the 
cluster coordinator address
   SW_HEALTH_CHECKER: default # @feature: health-check;
   SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that 
receives the VM metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm; enable the OC rules that analyse the VM metrics
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm; enable the OC rules that analyse the VM metrics
   SW_STORAGE: elasticsearch
   SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml 
b/deploy/platform/docker/docker-compose.single-node.yaml
index 1aa6fc6..705ca26 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -43,7 +43,7 @@ services:
 environment:
   SW_HEALTH_CHECKER: default # @feature: health-check;
   SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that 
receives the VM metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,mysql/*,postgresql/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm,mysql,postgresql,elasticsearch; enable the OC rules that analyse the metrics
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,mysql/*,postgresql/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: 
vm,mysql,postgresql,elasticsearch; enable the OC rules that analyse the metrics
   SW_STORAGE: elasticsearch
   SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
diff --git a/deploy/platform/kubernetes/values.yaml 
b/deploy/platform/kubernetes/values.yaml
index dffd3f7..180778f 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -40,7 +40,7 @@ skywalking:
   # @feature: istiod-monitor; enable rules to analyze Istio control plane 
metrics
   # @feature: mysql; enable mysql rules to analyze MySQL metrics
   # @feature: apisix-monitor; enable APISIX rules to analyze APISIX metrics
-  SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: 
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
+  SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: 
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
   SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
   SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS: "mx-mesh,persistence" # @feature: 
als; enable mesh analyzer (mx-mesh) to analyze ALS logs
   K8S_SERVICE_NAME_RULE: "mesh-svr::${service.metadata.name}"

[skywalking] branch 9.2.0-master-tlsnoverify updated: revert

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch 9.2.0-master-tlsnoverify
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/9.2.0-master-tlsnoverify by 
this push:
 new b6269f14e8 revert
b6269f14e8 is described below

commit b6269f14e8450a88def2be11996e20d391b89d05
Author: jian.tan 
AuthorDate: Fri Sep 2 15:50:28 2022 +0800

revert
---
 apm-webapp/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index 7e713bfb10..67abb8e4c7 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -149,7 +149,7 @@
 ${ui.path}
 v16.14.0
 
-   
+
 
 
 maven-resources-plugin

[skywalking] branch 9.2.0-master-tlsnoverify created (now d42c7e29d7)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch 9.2.0-master-tlsnoverify
in repository https://gitbox.apache.org/repos/asf/skywalking.git


  at d42c7e29d7 Merge branch 'master' of 
https://github.com/apache/skywalking

This branch includes the following new commits:

 new 8efcf8a345 tls insecure host verify
 new d42c7e29d7 Merge branch 'master' of 
https://github.com/apache/skywalking

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] 01/02: tls insecure host verify

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch 9.2.0-master-tlsnoverify
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 8efcf8a3457c575d6092bbe6cad6fb76d3182a0a
Author: jian.tan 
AuthorDate: Wed Jun 8 14:17:19 2022 +0800

tls insecure host verify
---
 apm-webapp/pom.xml |  6 +++---
 .../client/elasticsearch/ElasticSearchClient.java  |  8 +++-
 .../elasticsearch/bulk/ITElasticSearch.java| 24 --
 .../elasticsearch/ElasticSearchBuilder.java| 11 ++
 .../src/main/resources/application.yml |  1 +
 .../StorageModuleElasticsearchConfig.java  |  1 +
 .../StorageModuleElasticsearchProvider.java|  2 +-
 7 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index 2761c731a9..3a6a5ed510 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -149,7 +149,7 @@
 ${ui.path}
 v16.14.0
 
-
+   
 
 
 maven-resources-plugin
diff --git 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
index 0d67fc..1c92411e91 100644
--- 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
+++ 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
@@ -86,6 +86,7 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
 
 private final int numHttpClientThread;
 
+private final String insecureHosts;
 private final AtomicReference es = new AtomicReference<>();
 
 public ElasticSearchClient(String clusterNodes,
@@ -98,7 +99,8 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
int connectTimeout,
int socketTimeout,
int responseTimeout,
-   int numHttpClientThread) {
+   int numHttpClientThread,
+   String insecureHosts) {
 this.clusterNodes = clusterNodes;
 this.protocol = protocol;
 this.trustStorePath = trustStorePath;
@@ -110,6 +112,7 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
 this.socketTimeout = socketTimeout;
 this.responseTimeout = responseTimeout;
 this.numHttpClientThread = numHttpClientThread;
+this.insecureHosts = insecureHosts;
 }
 
 @Override
@@ -145,6 +148,9 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
 if (!Strings.isNullOrEmpty(password)) {
 cb.password(password);
 }
+if (!Strings.isNullOrEmpty(insecureHosts)) {
+cb.insecureHosts(insecureHosts);
+}
 
 final ElasticSearch newOne = cb.build();
 // Only swap the old / new after the new one established a new 
connection.
diff --git 
a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ITElasticSearch.java
 
b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ITElasticSearch.java
index 6a6980a626..f29dec66b0 100644
--- 
a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ITElasticSearch.java
+++ 
b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ITElasticSearch.java
@@ -27,7 +27,6 @@ import java.util.Optional;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.server.library.util.StringUtil;
 import org.apache.skywalking.library.elasticsearch.requests.search.Query;
 import org.apache.skywalking.library.elasticsearch.requests.search.Search;
 import 
org.apache.skywalking.library.elasticsearch.requests.search.SearchBuilder;
@@ -37,6 +36,7 @@ import 
org.apache.skywalking.library.elasticsearch.response.Mappings;
 import 
org.apache.skywalking.library.elasticsearch.response.search.SearchResponse;
 import 
org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
 import 
org.apache.skywalking.oap.server.library.client.elasticsearch.IndexRequestWrapper;
+import org.apache.skywalking.oap.server.library.util.StringUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -54,10 +54,22 @@ public class ITElastic

[skywalking] 02/02: Merge branch 'master' of https://github.com/apache/skywalking

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch 9.2.0-master-tlsnoverify
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit d42c7e29d79844bb1da32409c431efc607357ce8
Merge: 8efcf8a345 097a9e8706
Author: jian.tan 
AuthorDate: Fri Sep 2 14:40:07 2022 +0800

Merge branch 'master' of https://github.com/apache/skywalking

 .dlc.json  |2 +-
 .github/PULL_REQUEST_TEMPLATE  |2 +-
 .github/workflows/skywalking.yaml  |  204 ++-
 .licenserc.yaml|   52 +
 LICENSE|2 +
 NOTICE |   21 +
 README.md  |   14 +-
 apm-dist/pom.xml   |2 +-
 apm-dist/src/main/assembly/binary.xml  |2 +-
 apm-protocol/apm-network/pom.xml   |2 +-
 .../command/EBPFProfilingTaskCommand.java  |   11 +-
 apm-protocol/apm-network/src/main/proto|2 +-
 apm-protocol/pom.xml   |2 +-
 apm-webapp/pom.xml |2 +-
 dist-material/release-docs/LICENSE |  670 ++---
 dist-material/release-docs/LICENSE.tpl |   33 +
 .../release-docs/licenses/LICENSE-jopt-simple.txt  |   22 -
 ...icSearch-storage-option-explanation-in-9.2.0.md |   23 +
 docs/en/FAQ/README.md  |1 +
 docs/en/FAQ/install_agent_on_websphere.md  |2 +-
 docs/en/academy/list.md|4 +-
 docs/en/changes/changes-8.6.0.md   |2 +-
 docs/en/changes/{changes.md => changes-9.1.0.md}   |0
 docs/en/changes/changes-9.2.0.md   |  123 ++
 docs/en/changes/changes.md |  113 +-
 docs/en/concepts-and-designs/ebpf-cpu-profiling.md |  166 ++
 docs/en/concepts-and-designs/event.md  |   46 -
 docs/en/concepts-and-designs/lal.md|4 +-
 docs/en/concepts-and-designs/mal.md|6 +
 docs/en/concepts-and-designs/oal.md|2 -
 docs/en/concepts-and-designs/overview.md   |8 +-
 docs/en/concepts-and-designs/probe-introduction.md |2 +-
 docs/en/concepts-and-designs/sdk-profiling.md  |2 +-
 docs/en/guides/How-to-release.md   |   14 +-
 docs/en/guides/README.md   |   14 +-
 docs/en/protocols/README.md|6 +-
 docs/en/protocols/Trace-Data-Protocol-v3.md|4 +-
 docs/en/setup/backend/backend-alarm.md |   85 +-
 docs/en/setup/backend/backend-docker.md|4 +-
 docs/en/setup/backend/backend-k8s-monitoring.md|   14 +-
 .../backend/backend-k8s-network-monitoring.md  |   35 +
 docs/en/setup/backend/backend-meter.md |4 +
 docs/en/setup/backend/backend-mysql-monitoring.md  |   37 +
 .../setup/backend/backend-postgresql-monitoring.md |   51 +
 docs/en/setup/backend/backend-storage.md   |   21 +
 docs/en/setup/backend/backend-telemetry.md |   26 +-
 docs/en/setup/backend/backend-vm-monitoring.md |   16 +-
 docs/en/setup/backend/backend-zabbix.md|4 +
 docs/en/setup/backend/configuration-vocabulary.md  |   26 +-
 .../en/setup/backend/dashboards-so11y-satellite.md |   31 +
 docs/en/setup/backend/dashboards-so11y.md  |   54 +
 docs/en/setup/backend/dynamic-config-apollo.md |2 +-
 docs/en/setup/backend/dynamic-config-configmap.md  |2 +-
 docs/en/setup/backend/dynamic-config.md|4 +-
 docs/en/setup/backend/dynamical-logging.md |2 +-
 docs/en/setup/backend/endpoint-grouping-rules.md   |4 +-
 docs/en/setup/backend/on-demand-pod-log.md |2 +-
 docs/en/setup/backend/opentelemetry-receiver.md|   28 +-
 docs/en/setup/backend/prometheus-metrics.md|4 +
 docs/en/setup/backend/spring-sleuth-setup.md   |   15 +-
 docs/en/setup/backend/zipkin-trace.md  |   25 +-
 docs/en/setup/envoy/metrics_service_setting.md |4 +
 docs/en/setup/service-agent/agent-compatibility.md |6 +-
 docs/en/ui/README.md   |   63 +
 docs/menu.yml  |   34 +-
 oap-server-bom/pom.xml |   11 +-
 oap-server/analyzer/agent-analyzer/pom.xml |2 +-
 .../provider/meter/config/MeterConfig.java |2 +
 .../parser/ISegmentParserListenerManager.java  |4 +
 .../trace/parser/SegmentParserListenerManager.java |3 +-
 ...EndpointDepFromCrossThreadAnalysisListener.java |1 +
 .../trace/parser/listener/RPCAnalysisListener.java |2 +-
 oap-server/analyzer/event-analyzer/pom.xml |2 +-
 .../oap/server/analyzer/event/EventAnalyzer.java   |6 +-
 .../a

[skywalking] branch master updated: [OAL] Keep the endpoint avg resp time meter name the same with others scope. (#8534)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new c1765b5  [OAL] Keep the endpoint avg resp time meter name the same 
with others scope. (#8534)
c1765b5 is described below

commit c1765b5177e60bcfeddfc6c70c729ac27a98b74c
Author: Jared Tan 
AuthorDate: Fri Feb 11 20:48:02 2022 +0800

[OAL] Keep the endpoint avg resp time meter name the same with others 
scope. (#8534)

* Keep the endpoint avg resp time meter name the same with others scope.

* fix e2e.

* update changes.

* Update CHANGES.md

Co-authored-by: 吴晟 Wu Sheng 

* sync submodule.

* revert break changes

* fix UT

Co-authored-by: 吴晟 Wu Sheng 
---
 CHANGES.md  | 1 +
 dist-material/alarm-settings.yml| 4 ++--
 docs/en/concepts-and-designs/oal.md | 2 +-
 .../java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java  | 4 ++--
 .../src/test/resources/skywalking-dynamic-configmap.example.yaml| 4 ++--
 oap-server/server-starter/src/main/resources/oal/core.oal   | 2 +-
 .../src/main/resources/ui-initialized-templates/apm.yml | 6 +++---
 .../main/resources/ui-initialized-templates/topology-endpoint.yml   | 4 ++--
 test/e2e-v2/cases/gateway/e2e.yaml  | 2 +-
 test/e2e-v2/cases/go/e2e.yaml   | 2 +-
 test/e2e-v2/cases/istio/als/e2e.yaml| 4 ++--
 test/e2e-v2/cases/lua/e2e.yaml  | 2 +-
 test/e2e-v2/cases/nodejs/e2e.yaml   | 2 +-
 test/e2e-v2/cases/php/e2e.yaml  | 2 +-
 test/e2e-v2/cases/python/e2e.yaml   | 2 +-
 test/e2e-v2/cases/simple/simple-cases.yaml  | 4 ++--
 16 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4d952d3..11491d9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -56,6 +56,7 @@ Release Notes.
 * Add OpenFunction component ID(5013).
 * Expose configuration `responseTimeout` of ES client.
 * Support datasource metric analysis.
+* [Break Change] Keep the endpoint avg resp time meter name the same with 
others scope. (This may break 3rd party integration and existing alarm rule 
settings)
 
  UI
 
diff --git a/dist-material/alarm-settings.yml b/dist-material/alarm-settings.yml
index 6402151..c5e0646 100644
--- a/dist-material/alarm-settings.yml
+++ b/dist-material/alarm-settings.yml
@@ -71,8 +71,8 @@ rules:
 #  Active endpoint related metrics alarm will cost more memory than service 
and service instance metrics alarm.
 #  Because the number of endpoint is much more than service and instance.
 #
-#  endpoint_avg_rule:
-#metrics-name: endpoint_avg
+#  endpoint_resp_time_rule:
+#metrics-name: endpoint_resp_time
 #op: ">"
 #threshold: 1000
 #period: 10
diff --git a/docs/en/concepts-and-designs/oal.md 
b/docs/en/concepts-and-designs/oal.md
index 1555b33..579778d 100644
--- a/docs/en/concepts-and-designs/oal.md
+++ b/docs/en/concepts-and-designs/oal.md
@@ -131,7 +131,7 @@ endpoint_p99 = from(Endpoint.latency).filter(name in 
("Endpoint1", "Endpoint2"))
 serv_Endpoint_p99 = from(Endpoint.latency).filter(name like 
"serv%").summary(0.99)
 
 // Calculate the avg response time of each Endpoint
-endpoint_avg = from(Endpoint.latency).avg()
+endpoint_resp_time = from(Endpoint.latency).avg()
 
 // Calculate the p50, p75, p90, p95 and p99 of each Endpoint by 50 ms steps.
 endpoint_percentile = from(Endpoint.latency).percentile(10)
diff --git 
a/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java
 
b/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java
index 4b699d5..0ef9f54 100644
--- 
a/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java
+++ 
b/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java
@@ -47,7 +47,7 @@ public class ScriptParserTest {
 @Test
 public void testParse() throws IOException {
 ScriptParser parser = ScriptParser.createFromScriptText(
-"Endpoint_avg = from(Endpoint.latency).longAvg(); //comment test" 
+ "\n" + "Service_avg = from(Service.latency).longAvg()",
+"endpoint_resp_time = from(Endpoint.latency).longAvg(); //comment 
test" + "\n" + "Service_avg = from(Service.latency).longAvg()",
 TEST_SOURCE_PACKAGE
 );
 List results = parser.parse().getMetricsStmts();
@@ -55,7 +55,7 @@ pub

[skywalking] branch update_enpoint_avg_resp_time updated (a24bd64 -> 10d8938)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from a24bd64  revert break changes
 add 10d8938  fix UT

No new revisions were added by this update.

Summary of changes:
 .../test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch update_enpoint_avg_resp_time updated (46765cd -> a24bd64)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 46765cd  sync submodule.
 add a24bd64  revert break changes

No new revisions were added by this update.

Summary of changes:
 .../query-graphql-plugin/src/main/resources/query-protocol  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch update_enpoint_avg_resp_time updated (d736d3e -> 46765cd)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from d736d3e  Update CHANGES.md
 add 46765cd  sync submodule.

No new revisions were added by this update.

Summary of changes:
 .../query-graphql-plugin/src/main/resources/query-protocol  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking-query-protocol] branch fix_comment created (now 6d6aea0)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_comment
in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git.


  at 6d6aea0  fix comment for metric condition

This branch includes the following new commits:

 new 6d6aea0  fix comment for metric condition

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.

[skywalking-query-protocol] 01/01: fix comment for metric condition

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_comment
in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git

commit 6d6aea03369b706909593c0fcad4a0cf4953fc6e
Author: jian.tan 
AuthorDate: Fri Feb 11 16:59:51 2022 +0800

fix comment for metric condition
---
 metric.graphqls | 8 
 metrics-v2.graphqls | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/metric.graphqls b/metric.graphqls
index f04c2bb..6996bd4 100644
--- a/metric.graphqls
+++ b/metric.graphqls
@@ -20,8 +20,8 @@
 input MetricCondition {
 # Metric name, which should be defined in OAL script
 # Such as:
-# Endpoint_avg = from(Endpoint.latency).avg()
-# Then, `Endpoint_avg`
+# endpoint_resp_time = from(Endpoint.latency).avg()
+# Then, `endpoint_resp_time`
 name: String!
 # Id in this metric type.
 # In the above case, the id should be endpoint id.
@@ -31,8 +31,8 @@ input MetricCondition {
 input BatchMetricConditions {
 # Metric name, which should be defined in OAL script
 # Such as:
-# Endpoint_avg = from(Endpoint.latency).avg()
-# Then, `Endpoint_avg`
+# endpoint_resp_time = from(Endpoint.latency).avg()
+# Then, `endpoint_resp_time`
 name: String!
 # Id in this metric type.
 # In the above case, the id should be endpoint id.
diff --git a/metrics-v2.graphqls b/metrics-v2.graphqls
index d1cf512..fd426a4 100644
--- a/metrics-v2.graphqls
+++ b/metrics-v2.graphqls
@@ -58,8 +58,8 @@ input Entity {
 input MetricsCondition {
 # Metrics name, which should be defined in OAL script
 # Such as:
-# Endpoint_avg = from(Endpoint.latency).avg()
-# Then, `Endpoint_avg`
+# endpoint_resp_time = from(Endpoint.latency).avg()
+# Then, `endpoint_resp_time`
 name: String!
 # Follow entity definition description.
 entity: Entity!

[skywalking] branch update_enpoint_avg_resp_time updated (99fee86 -> d736d3e)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 99fee86  Merge branch 'master' into update_enpoint_avg_resp_time
 add d736d3e  Update CHANGES.md

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch update_enpoint_avg_resp_time updated (e32da03 -> 2097ee6)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from e32da03  fix e2e.
 add 2097ee6  update changes.

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch update_enpoint_avg_resp_time updated (3282e02 -> e32da03)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 3282e02  Keep the endpoint avg resp time meter name the same with 
others scope.
 add e32da03  fix e2e.

No new revisions were added by this update.

Summary of changes:
 dist-material/alarm-settings.yml| 4 ++--
 docs/en/concepts-and-designs/oal.md | 2 +-
 .../java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java  | 2 +-
 .../src/test/resources/skywalking-dynamic-configmap.example.yaml| 4 ++--
 .../src/main/resources/ui-initialized-templates/apm.yml | 6 +++---
 .../main/resources/ui-initialized-templates/topology-endpoint.yml   | 4 ++--
 test/e2e-v2/cases/gateway/e2e.yaml  | 2 +-
 test/e2e-v2/cases/go/e2e.yaml   | 2 +-
 test/e2e-v2/cases/istio/als/e2e.yaml| 4 ++--
 test/e2e-v2/cases/lua/e2e.yaml  | 2 +-
 test/e2e-v2/cases/nodejs/e2e.yaml   | 2 +-
 test/e2e-v2/cases/php/e2e.yaml  | 2 +-
 test/e2e-v2/cases/python/e2e.yaml   | 2 +-
 test/e2e-v2/cases/simple/simple-cases.yaml  | 4 ++--
 14 files changed, 21 insertions(+), 21 deletions(-)

[skywalking] branch update_enpoint_avg_resp_time created (now 3282e02)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 3282e02  Keep the endpoint avg resp time meter name the same with 
others scope.

This branch includes the following new commits:

 new 3282e02  Keep the endpoint avg resp time meter name the same with 
others scope.

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.

[skywalking] 01/01: Keep the endpoint avg resp time meter name the same with others scope.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch update_enpoint_avg_resp_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 3282e024a6484fa404a8d55fcedf89dc53d36b33
Author: jian.tan 
AuthorDate: Fri Feb 11 10:27:20 2022 +0800

Keep the endpoint avg resp time meter name the same with others scope.
---
 CHANGES.md| 1 +
 oap-server/server-starter/src/main/resources/oal/core.oal | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 595bd51..6303ddb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -55,6 +55,7 @@ Release Notes.
 * Add Guava EventBus component ID(123) of Java agent.
 * Add OpenFunction component ID(5013).
 * Expose configuration `responseTimeout` of ES client.
+* Keep the endpoint avg resp time meter name the same with others scope.
 
  UI
 
diff --git a/oap-server/server-starter/src/main/resources/oal/core.oal 
b/oap-server/server-starter/src/main/resources/oal/core.oal
index d95af57..59ee34b 100755
--- a/oap-server/server-starter/src/main/resources/oal/core.oal
+++ b/oap-server/server-starter/src/main/resources/oal/core.oal
@@ -59,7 +59,7 @@ service_instance_cpm = from(ServiceInstance.*).cpm();
 
 // Endpoint scope metrics
 endpoint_cpm = from(Endpoint.*).cpm();
-endpoint_avg = from(Endpoint.latency).longAvg();
+endpoint_resp_time = from(Endpoint.latency).longAvg();
 endpoint_sla = from(Endpoint.*).percent(status == true);
 endpoint_percentile = from(Endpoint.latency).percentile(10); // Multiple 
values including p50, p75, p90, p95, p99
 endpoint_mq_consume_count = from(Endpoint.*).filter(type == 
RequestType.MQ).count();

[skywalking] branch env_typo created (now 149f456)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 149f456  polish etcd config env vars.

This branch includes the following new commits:

 new 82d7f41  polish etcd config env vars.
 new 149f456  polish etcd config env vars.

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] 01/02: polish etcd config env vars.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 82d7f4119e44fc4f55a143fee84c8e084f4cb873
Author: JaredTan95 
AuthorDate: Tue Dec 7 08:57:53 2021 +0800

polish etcd config env vars.
---
 docs/en/setup/backend/backend-cluster.md | 6 +++---
 oap-server/server-starter/src/main/resources/application.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/setup/backend/backend-cluster.md 
b/docs/en/setup/backend/backend-cluster.md
index 119a04d..bb829a9 100644
--- a/docs/en/setup/backend/backend-cluster.md
+++ b/docs/en/setup/backend/backend-cluster.md
@@ -99,10 +99,10 @@ cluster:
 # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
 endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
 namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
 authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-user: ${SW_SCLUSTER_ETCD_USER:}
-password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+user: ${SW_CLUSTER_ETCD_USER:}
+password: ${SW_CLUSTER_ETCD_PASSWORD:}
 ```
 
 Same as the Zookeeper coordinator,
diff --git a/oap-server/server-starter/src/main/resources/application.yml 
b/oap-server/server-starter/src/main/resources/application.yml
index 631be41..b9a99c0 100755
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -41,10 +41,10 @@ cluster:
 # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
 endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
 namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
 authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-user: ${SW_SCLUSTER_ETCD_USER:}
-password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+user: ${SW_CLUSTER_ETCD_USER:}
+password: ${SW_CLUSTER_ETCD_PASSWORD:}
   nacos:
 serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
 hostPort: ${SW_CLUSTER_NACOS_HOST_PORT:localhost:8848}

[skywalking] 02/02: polish etcd config env vars.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 149f4568edeaa364d95dc4856c987efc95b49bdf
Author: JaredTan95 
AuthorDate: Tue Dec 7 08:58:56 2021 +0800

polish etcd config env vars.
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index dc1d101..e951e95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
 
 * Fix potential NPE in OAL string match and a bug when right-hand-side 
variable includes double quotes.
 * Bump up Armeria version to fix CVE.
+* Polish ETCD cluster config environment variables.
 
  UI
 

[skywalking] branch support_insecure_hosts updated (58a7710 -> 4654db3)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch support_insecure_hosts
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 58a7710  Merge branch 'master' into support_insecure_hosts
 add cb2dfee  revert default config
 add 4654db3  Merge branch 'support_insecure_hosts' of 
https://github.com/apache/skywalking into support_insecure_hosts

No new revisions were added by this update.

Summary of changes:
 oap-server/server-starter/src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch support_insecure_hosts updated (00c77e2 -> 58a7710)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch support_insecure_hosts
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 00c77e2  Support disables the verification of server's TLS certificate 
chain for specific hosts
 add fb69094  Highlight profiling blogs (#8214)
 add 58a7710  Merge branch 'master' into support_insecure_hosts

No new revisions were added by this update.

Summary of changes:
 docs/en/ui/README.md | 3 +++
 1 file changed, 3 insertions(+)

[skywalking] branch support_insecure_hosts created (now 00c77e2)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch support_insecure_hosts
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 00c77e2  Support disables the verification of server's TLS certificate 
chain for specific hosts

This branch includes the following new commits:

 new 00c77e2  Support disables the verification of server's TLS certificate 
chain for specific hosts

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.

[skywalking] 01/01: Support disables the verification of server's TLS certificate chain for specific hosts

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch support_insecure_hosts
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 00c77e235c8350d529a5a1cb760c031e659b8038
Author: JaredTan95 
AuthorDate: Tue Nov 30 19:04:19 2021 +0800

Support disables the verification of server's TLS certificate chain for 
specific hosts
---
 CHANGES.md |  2 +-
 docs/en/setup/backend/configuration-vocabulary.md  |  1 +
 .../library/client/elasticsearch/ElasticSearchClient.java  | 11 +--
 .../library/elasticsearch/bulk/ITElasticSearch.java|  2 +-
 .../library/elasticsearch/ElasticSearchBuilder.java| 14 --
 .../server-starter/src/main/resources/application.yml  |  3 ++-
 .../elasticsearch/StorageModuleElasticsearchConfig.java|  1 +
 .../elasticsearch/StorageModuleElasticsearchProvider.java  |  4 ++--
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b8aa70d..867b152 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -63,7 +63,7 @@ Release Notes.
 * Add customized envoy ALS protocol receiver for satellite transmit batch data.
 * Remove `logback` dependencies in IoTDB plugin.
 * Fix `StorageModuleElasticsearchProvider` doesn't watch on `trustStorePath`.
-
+* Support disables the verification of server's TLS certificate chain for 
specific hosts by `SW_STORAGE_ES_SSL_INSECURE_HOSTS` env.
  UI
 
 * Optimize endpoint dependency.
diff --git a/docs/en/setup/backend/configuration-vocabulary.md 
b/docs/en/setup/backend/configuration-vocabulary.md
index 891517f..bbc5c92 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -90,6 +90,7 @@ core|default|role|Option values: `Mixed/Receiver/Aggregator`. 
**Receiver** mode
 | - | - | password | Password of ElasticSearch cluster. | SW_ES_PASSWORD | - |
 | - | - | trustStorePath | Trust JKS file path. Only works when username and 
password are enabled. | SW_STORAGE_ES_SSL_JKS_PATH | - |
 | - | - | trustStorePass | Trust JKS file password. Only works when username 
and password are enabled. | SW_STORAGE_ES_SSL_JKS_PASS | - |
+| - | - | insecureHosts | Disables the verification of server's TLS 
certificate chain for specific hosts. **NOTE**: You should never use this in 
production but only for a testing purpose. | SW_STORAGE_ES_SSL_INSECURE_HOSTS | 
- |
 | - | - | secretsManagementFile| Secrets management file in the properties 
format, including username and password, which are managed by a 3rd party tool. 
Capable of being updated them at runtime. |SW_ES_SECRETS_MANAGEMENT_FILE | - |
 | - | - | dayStep| Represents the number of days in the one-minute/hour/day 
index. | SW_STORAGE_DAY_STEP | 1|
 | - | - | indexShardsNumber | Shard number of new indexes. | 
SW_STORAGE_ES_INDEX_SHARDS_NUMBER | 1 |
diff --git 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
index 2a457f4..cd023a8 100644
--- 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
+++ 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
@@ -33,7 +33,6 @@ import java.util.function.Supplier;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.server.library.util.StringUtil;
 import org.apache.skywalking.library.elasticsearch.ElasticSearch;
 import org.apache.skywalking.library.elasticsearch.ElasticSearchBuilder;
 import org.apache.skywalking.library.elasticsearch.ElasticSearchVersion;
@@ -49,6 +48,7 @@ import org.apache.skywalking.oap.server.library.client.Client;
 import 
org.apache.skywalking.oap.server.library.client.healthcheck.DelegatedHealthChecker;
 import 
org.apache.skywalking.oap.server.library.client.healthcheck.HealthCheckable;
 import org.apache.skywalking.oap.server.library.util.HealthChecker;
+import org.apache.skywalking.oap.server.library.util.StringUtil;
 
 /**
  * ElasticSearchClient connects to the ES server by using ES client APIs.
@@ -67,6 +67,8 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
 @Setter
 private volatile String trustStorePass;
 
+private final String insecureHosts;
+
 @Setter
 private volatile String user;
 
@@ -94,7 +96,8 @@ public class ElasticSearchClient implements Client, 
HealthCheckable {
Function indexNameConverter,
int connectTimeout,
 

[skywalking-showcase] branch main updated: fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place. (#8)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


The following commit(s) were added to refs/heads/main by this push:
 new 675e9f6  fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place. (#8)
675e9f6 is described below

commit 675e9f68da46e5fe6fb7fa1295ca489f40aed842
Author: Jared Tan 
AuthorDate: Wed Nov 17 14:17:49 2021 +0800

fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place. (#8)
---
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 61fafa2..c7bc02a 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -134,6 +134,8 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
+- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
+  value: "0"
 - name: SW_TELEMETRY
   value: prometheus
 
@@ -205,8 +207,6 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
-- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
-  value: "0"
 - name: SW_TELEMETRY
   value: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
 - name: SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS

[skywalking-showcase] branch fix_wrong_place created (now ff43e31)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_wrong_place
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git.


  at ff43e31  fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place.

This branch includes the following new commits:

 new ff43e31  fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place.

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.

[skywalking-showcase] 01/01: fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_wrong_place
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit ff43e3150cc5d70280c59ff506ce8296974f983a
Author: JaredTan95 
AuthorDate: Wed Nov 17 14:13:54 2021 +0800

fix SW_STORAGE_ES_INDEX_REPLICAS_NUMBER wrong place.
---
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 61fafa2..c7bc02a 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -134,6 +134,8 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
+- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
+  value: "0"
 - name: SW_TELEMETRY
   value: prometheus
 
@@ -205,8 +207,6 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
-- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
-  value: "0"
 - name: SW_TELEMETRY
   value: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
 - name: SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS

[skywalking-showcase] 03/03: Merge remote-tracking branch 'origin/main' into es_cluster_yellow

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch es_cluster_yellow
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit 33892c1d3679ef0b4e787087be71cb604779b6da
Merge: 836f280 6afa571
Author: JaredTan95 
AuthorDate: Sun Nov 14 14:15:57 2021 +0800

Merge remote-tracking branch 'origin/main' into es_cluster_yellow

 Makefile.in   | 2 +-
 deploy/platform/docker/docker-compose.single-node.yaml| 2 +-
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
 deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

[skywalking-showcase] 01/03: Merge branch 'main' of https://github.com/apache/skywalking-showcase

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch es_cluster_yellow
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit 91e91b121e0bd53a804fc4afddb9c8018a2bf7bb
Merge: d7cd767 7182566
Author: JaredTan95 
AuthorDate: Fri Nov 12 16:15:02 2021 +0800

Merge branch 'main' of https://github.com/apache/skywalking-showcase

[skywalking-showcase] branch es_cluster_yellow created (now 33892c1)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch es_cluster_yellow
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git.


  at 33892c1  Merge remote-tracking branch 'origin/main' into 
es_cluster_yellow

This branch includes the following new commits:

 new 91e91b1  Merge branch 'main' of 
https://github.com/apache/skywalking-showcase
 new 836f280  fix es cluster yellow if only one es replica.
 new 33892c1  Merge remote-tracking branch 'origin/main' into 
es_cluster_yellow

The 3 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-showcase] 02/03: fix es cluster yellow if only one es replica.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch es_cluster_yellow
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit 836f280527f78960070789923593ce37456c52e4
Author: JaredTan95 
AuthorDate: Sun Nov 14 14:13:07 2021 +0800

fix es cluster yellow if only one es replica.
---
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 ++
 deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index f2dc205..212f9f4 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -205,6 +205,8 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
+- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
+  value: "0"
 - name: SW_TELEMETRY
   value: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
 - name: SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml 
b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 5af8ad0..cbf50f8 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -155,6 +155,8 @@ spec:
   value: elasticsearch
 - name: SW_STORAGE_ES_CLUSTER_NODES
   value: elasticsearch:9200
+- name: SW_STORAGE_ES_INDEX_REPLICAS_NUMBER
+  value: "0"
 - name: SW_TELEMETRY
   value: prometheus # @feature: so11y; expose the metrics of self 
o11y through prometheus
 - name: SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS

[skywalking-showcase] branch main updated: Fix wait for es (#2)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


The following commit(s) were added to refs/heads/main by this push:
 new 7182566  Fix wait for es (#2)
7182566 is described below

commit 7182566e721202a0caaf3b14bba4f21f12ec4802
Author: Jared Tan 
AuthorDate: Fri Nov 12 16:12:47 2021 +0800

Fix wait for es (#2)

* fix wait for es

* add env

* revert
---
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index d385a41..f2dc205 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -115,7 +115,7 @@ spec:
   restartPolicy: Never
   initContainers:
 - name: wait-for-es
-  image: 
docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
+  image: busybox:1.30
   command:
 - 'sh'
 - '-c'

[skywalking-showcase] branch fix_wait_for_es updated (6d61636 -> 9b019a0)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_wait_for_es
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git.


from 6d61636  add env
 add 9b019a0  revert

No new revisions were added by this update.

Summary of changes:
 Makefile.in   | 2 --
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

[skywalking-showcase] branch fix_wait_for_es updated: add env

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_wait_for_es
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


The following commit(s) were added to refs/heads/fix_wait_for_es by this push:
 new 6d61636  add env
6d61636 is described below

commit 6d6163668b68a5a4b6feddc73859338d5fb8ec17
Author: JaredTan95 
AuthorDate: Fri Nov 12 15:59:21 2021 +0800

add env
---
 Makefile.in   | 2 ++
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 0add014..754304f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,8 @@ TAG ?= $(shell git rev-parse --short HEAD)
 
 ES_VERSION ?= 7.10.0
 
+BUSYBOX_VERSION ?= 1.30
+
 SW_OAP_IMAGE ?= 
ghcr.io/apache/skywalking/oap:c9bd79e8bb974e404766e3490c00c7404b9baf1e
 SW_ROCKET_BOT_IMAGE ?= 
ghcr.io/apache/skywalking/ui:c9bd79e8bb974e404766e3490c00c7404b9baf1e
 
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index f2dc205..01731bf 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -115,7 +115,7 @@ spec:
   restartPolicy: Never
   initContainers:
 - name: wait-for-es
-  image: busybox:1.30
+  image: busybox:${BUSYBOX_VERSION}
   command:
 - 'sh'
 - '-c'

[skywalking-showcase] branch fix_wait_for_es created (now d7cd767)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_wait_for_es
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git.


  at d7cd767  fix wait for es

This branch includes the following new commits:

 new d7cd767  fix wait for es

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.

[skywalking-showcase] 01/01: fix wait for es

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_wait_for_es
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit d7cd767283628838d4e9b2236dcd3d0d422e7f4f
Author: JaredTan95 
AuthorDate: Fri Nov 12 15:57:04 2021 +0800

fix wait for es
---
 deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml 
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index d385a41..f2dc205 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -115,7 +115,7 @@ spec:
   restartPolicy: Never
   initContainers:
 - name: wait-for-es
-  image: 
docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
+  image: busybox:1.30
   command:
 - 'sh'
 - '-c'

[skywalking-java] branch main updated: Support set instance properties in json format (#67)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git


The following commit(s) were added to refs/heads/main by this push:
 new b169ef3  Support set instance properties in json format (#67)
b169ef3 is described below

commit b169ef3cdd377105050fbb9cada71305231ac47a
Author: Jared Tan 
AuthorDate: Sun Nov 7 18:51:34 2021 +0800

Support set instance properties in json format (#67)

* set instance properties in json format: agent.instance_properties_json

* add docs.

* Update docs/en/setup/service-agent/java-agent/configurations.md

* polish and add e2e.

* update

* Update test/e2e/case/expected/service-instance.yml

Co-authored-by: kezhenxu94 

* Update 
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java

Co-authored-by: kezhenxu94 

* update

* update SW_INSTANCE_PROPERTIES_JSON

Co-authored-by: 吴晟 Wu Sheng 
Co-authored-by: kezhenxu94 
---
 CHANGES.md |  1 +
 .../skywalking/apm/agent/core/conf/Config.java | 12 -
 .../agent/core/remote/ServiceManagementClient.java | 17 +++-
 .../core/util/InstanceJsonPropertiesUtil.java  | 51 ++
 apm-sniffer/config/agent.config|  2 +
 .../kafka/KafkaServiceManagementServiceClient.java | 10 +
 .../service-agent/java-agent/configurations.md |  3 +-
 test/e2e/base/base-compose.yml |  2 +
 test/e2e/case/expected/service-instance.yml|  2 +
 9 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2054625..9152043 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Release Notes.
 * Support `Transaction` and fix duplicated methods enhancements for 
`jedis-2.x` plugin.
 * Add ConsumerWrapper/FunctionWrapper to support 
CompletableFuture.x.thenAcceptAsync/thenApplyAsync.
 * Build CLI from Docker instead of source codes, add alpine based Docker image.
+* Support set instance properties in json format.
 
  Documentation
 
diff --git 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index 4195d19..46e109b 100755
--- 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++ 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -104,10 +104,19 @@ public class Config {
 
 /**
  * service instance properties e.g. 
agent.instance_properties[org]=apache
+ * Notice it will be overridden by `agent.instance_properties_json `, 
if the key duplication.
+ * For example: e.g. agent.instance_properties_json = {"org": 
"apache-skywalking"}
  */
+@Deprecated
 public static Map INSTANCE_PROPERTIES = new 
HashMap<>();
 
 /**
+ * service instance properties in json format.
+ * e.g. agent.instance_properties_json = {"org": "apache-skywalking"}
+ */
+public static String INSTANCE_PROPERTIES_JSON = "";
+
+/**
  * How depth the agent goes, when log cause exceptions.
  */
 public static int CAUSE_EXCEPTION_DEPTH = 5;
@@ -169,7 +178,8 @@ public class Config {
  */
 public static long HEARTBEAT_PERIOD = 30;
 /**
- * The agent sends the instance properties to the backend every 
`collector.heartbeat_period * collector.properties_report_period_factor` seconds
+ * The agent sends the instance properties to the backend every 
`collector.heartbeat_period *
+ * collector.properties_report_period_factor` seconds
  */
 public static int PROPERTIES_REPORT_PERIOD_FACTOR = 10;
 /**
diff --git 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
index 707b7e6..f129955 100755
--- 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
+++ 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
@@ -19,7 +19,6 @@
 package org.apache.skywalking.apm.agent.core.remote;
 
 import io.grpc.Channel;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
@@ -35,6 +34,7 @@ import 
org.apache.skywalking.apm.agent.core.jvm.LoadedLibraryCollector;
 import org.ap

[skywalking-java] branch agent_config updated (f1d3b28 -> 98dd41c)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from f1d3b28  update
 add 98dd41c  update SW_INSTANCE_PROPERTIES_JSON

No new revisions were added by this update.

Summary of changes:
 test/e2e/base/base-compose.yml | 1 +
 test/e2e/case/kafka/docker-compose.yml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

[skywalking-java] branch agent_config updated (dc7cfe5 -> f1d3b28)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from dc7cfe5  Update 
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java
 add f1d3b28  update

No new revisions were added by this update.

Summary of changes:
 .../apm/agent/core/util/InstanceJsonPropertiesUtil.java   | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

[skywalking-java] branch agent_config updated (4a8e01f -> dc7cfe5)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from 4a8e01f  Update test/e2e/case/expected/service-instance.yml
 add dc7cfe5  Update 
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java

No new revisions were added by this update.

Summary of changes:
 .../apm/agent/core/util/InstanceJsonPropertiesUtil.java| 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

[skywalking-java] branch agent_config updated (1b5aa86 -> 4a8e01f)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from 1b5aa86  update
 add 4a8e01f  Update test/e2e/case/expected/service-instance.yml

No new revisions were added by this update.

Summary of changes:
 test/e2e/case/expected/service-instance.yml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

[skywalking-java] branch agent_config updated (1955e2a -> 1b5aa86)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from 1955e2a  Merge branch 'agent_config' of 
https://github.com/apache/skywalking-java into agent_config
 add 1b5aa86  update

No new revisions were added by this update.

Summary of changes:
 .../skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

[skywalking-java] branch agent_config updated (79cfd04 -> 1955e2a)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


from 79cfd04  Update 
docs/en/setup/service-agent/java-agent/configurations.md
 add 663c815  polish and add e2e.
 add 1955e2a  Merge branch 'agent_config' of 
https://github.com/apache/skywalking-java into agent_config

No new revisions were added by this update.

Summary of changes:
 .../apm/agent/core/util/InstanceJsonPropertiesUtil.java | 17 -
 apm-sniffer/config/agent.config |  4 ++--
 test/e2e/base/base-compose.yml  |  1 +
 test/e2e/case/expected/service-instance.yml |  5 -
 test/e2e/case/kafka/docker-compose.yml  |  1 +
 5 files changed, 12 insertions(+), 16 deletions(-)

[skywalking-java] 02/02: add docs.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git

commit 89136cdd4a54121f7d371652387aaead7538ca4c
Author: JaredTan95 
AuthorDate: Sun Nov 7 16:53:15 2021 +0800

add docs.
---
 docs/en/setup/service-agent/java-agent/configurations.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/setup/service-agent/java-agent/configurations.md 
b/docs/en/setup/service-agent/java-agent/configurations.md
index 1dfe170..c414cf4 100644
--- a/docs/en/setup/service-agent/java-agent/configurations.md
+++ b/docs/en/setup/service-agent/java-agent/configurations.md
@@ -14,7 +14,8 @@ property key | Description | Default |
 `agent.is_cache_enhanced_class`|If true, SkyWalking agent will cache all 
instrumented classes files to memory or disk files (decided by class cache 
mode), allow another java agent to enhance those classes that enhanced by 
SkyWalking agent. To use some Java diagnostic tools (such as BTrace, Arthas) to 
diagnose applications or add a custom java agent to enhance classes, you need 
to enable this feature. |`false`|
 `agent.class_cache_mode`|The instrumented classes cache mode: `MEMORY` or 
`FILE`. `MEMORY`: cache class bytes to memory, if instrumented classes is too 
many or too large, it may take up more memory. `FILE`: cache class bytes in 
`/class-cache` folder, automatically clean up cached class files when the 
application exits.|`MEMORY`|
 `agent.instance_name` |Instance name is the identity of an instance, should be 
unique in the service. If empty, SkyWalking agent will generate an 32-bit uuid. 
Default, use `UUID`@`hostname` as the instance name. Max length is 50(UTF-8 
char)|`""`|
-`agent.instance_properties[key]=value` | Add service instance custom 
properties. | Not set|
+`agent.instance_properties[key]=value` | Add service instance custom 
properties. Notice it will be overridden by `agent.instance_properties_json `, 
if the key duplication. | Not set|
+`agent.instance_properties_json={"key":"value"}` | Add service instance custom 
properties in json format.  | Not set|
 `agent.cause_exception_depth`|How depth the agent goes, when log all cause 
exceptions.|`5`|
 `agent.force_reconnection_period `|Force reconnection period of grpc, based on 
grpc_channel_check_interval.|`1`|
 `agent.operation_name_threshold `|The operationName max length, setting this 
value > 190 is not recommended.|`150`|

[skywalking-java] branch agent_config created (now 89136cd)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


  at 89136cd  add docs.

This branch includes the following new commits:

 new 075cb82  set instance properties in json format: 
agent.instance_properties_json
 new 89136cd  add docs.

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-java] 01/02: set instance properties in json format: agent.instance_properties_json

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch agent_config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git

commit 075cb8209d5cc2606bd155420a8739d7d6a3f7de
Author: JaredTan95 
AuthorDate: Sun Nov 7 16:49:37 2021 +0800

set instance properties in json format: agent.instance_properties_json
---
 CHANGES.md |  1 +
 .../skywalking/apm/agent/core/conf/Config.java | 12 -
 .../agent/core/remote/ServiceManagementClient.java | 17 +++
 .../core/util/InstanceJsonPropertiesUtil.java  | 56 ++
 apm-sniffer/config/agent.config|  2 +
 .../kafka/KafkaServiceManagementServiceClient.java | 10 +---
 6 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2054625..9152043 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Release Notes.
 * Support `Transaction` and fix duplicated methods enhancements for 
`jedis-2.x` plugin.
 * Add ConsumerWrapper/FunctionWrapper to support 
CompletableFuture.x.thenAcceptAsync/thenApplyAsync.
 * Build CLI from Docker instead of source codes, add alpine based Docker image.
+* Support set instance properties in json format.
 
  Documentation
 
diff --git 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index 4195d19..46e109b 100755
--- 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++ 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -104,10 +104,19 @@ public class Config {
 
 /**
  * service instance properties e.g. 
agent.instance_properties[org]=apache
+ * Notice it will be overridden by `agent.instance_properties_json `, 
if the key duplication.
+ * For example: e.g. agent.instance_properties_json = {"org": 
"apache-skywalking"}
  */
+@Deprecated
 public static Map INSTANCE_PROPERTIES = new 
HashMap<>();
 
 /**
+ * service instance properties in json format.
+ * e.g. agent.instance_properties_json = {"org": "apache-skywalking"}
+ */
+public static String INSTANCE_PROPERTIES_JSON = "";
+
+/**
  * How depth the agent goes, when log cause exceptions.
  */
 public static int CAUSE_EXCEPTION_DEPTH = 5;
@@ -169,7 +178,8 @@ public class Config {
  */
 public static long HEARTBEAT_PERIOD = 30;
 /**
- * The agent sends the instance properties to the backend every 
`collector.heartbeat_period * collector.properties_report_period_factor` seconds
+ * The agent sends the instance properties to the backend every 
`collector.heartbeat_period *
+ * collector.properties_report_period_factor` seconds
  */
 public static int PROPERTIES_REPORT_PERIOD_FACTOR = 10;
 /**
diff --git 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
index 707b7e6..f129955 100755
--- 
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
+++ 
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
@@ -19,7 +19,6 @@
 package org.apache.skywalking.apm.agent.core.remote;
 
 import io.grpc.Channel;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
@@ -35,6 +34,7 @@ import 
org.apache.skywalking.apm.agent.core.jvm.LoadedLibraryCollector;
 import org.apache.skywalking.apm.agent.core.logging.api.ILog;
 import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
 import org.apache.skywalking.apm.agent.core.os.OSUtil;
+import org.apache.skywalking.apm.agent.core.util.InstanceJsonPropertiesUtil;
 import org.apache.skywalking.apm.network.common.v3.Commands;
 import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
 import org.apache.skywalking.apm.network.management.v3.InstancePingPkg;
@@ -69,14 +69,7 @@ public class ServiceManagementClient implements BootService, 
Runnable, GRPCChann
 public void prepare() {
 
ServiceManager.INSTANCE.findService(GRPCChannelManager.class).addChannelListener(this);
 
-SERVICE_INSTANCE_PROPERTIES = new ArrayList<>();
-
-for (String key : Config.Agent.INSTANCE_PROPERTIES.keySet()) {
-SERVICE_INSTANCE_PROPERTIES.add(KeyStringValuePair.newBuilder()
-  .setKey(key)
-  

[skywalking] branch master updated: Replace e2e cases to e2e-v2: Storage (#7934)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new b5578b6  Replace e2e cases to e2e-v2: Storage (#7934)
b5578b6 is described below

commit b5578b68fd0d5d8e4543ad7d8fc9c3066ace456c
Author: Jared Tan 
AuthorDate: Sat Oct 16 18:25:29 2021 +0800

Replace e2e cases to e2e-v2: Storage (#7934)

* replace log e2e cases to e2e-v2.

* update change log

* fix change log.

* revert proto chenge

* fix e2e

* active h2

* contains

* revert storage e2e mis-change
---
 .github/workflows/e2e.storages.yaml|  38 +--
 CHANGES.md |   5 +-
 test/e2e-v2/cases/storage/es/docker-compose.yml|  74 ++
 test/e2e-v2/cases/storage/es/e2e.yaml  | 131 +++
 .../cases/storage/expected/dependency-services.yml |  37 +++
 test/e2e-v2/cases/storage/expected/event-list.yml  |  49 
 .../cases/storage/expected/metrics-has-value.yml   |  19 ++
 .../cases/storage/expected/profile-create.yml  |  17 ++
 .../e2e-v2/cases/storage/expected/profile-list.yml |  34 +++
 .../storage/expected/profile-segment-analyze.yml   |  28 +++
 .../storage/expected/profile-segment-detail.yml|  38 +++
 .../storage/expected/profile-segment-list.yml  |  27 +++
 .../cases/storage/expected/service-endpoint.yml|  19 ++
 .../cases/storage/expected/service-instance.yml|  40 
 test/e2e-v2/cases/storage/expected/service.yml |  23 ++
 .../cases/storage/expected/trace-info-detail.yml   |  68 ++
 .../cases/storage/expected/trace-users-detail.yml  |  41 
 test/e2e-v2/cases/storage/expected/traces-list.yml |  29 +++
 test/e2e-v2/cases/storage/h2/Dockerfile.h2 |  24 ++
 test/e2e-v2/cases/storage/h2/docker-compose.yml|  73 ++
 test/e2e-v2/cases/storage/h2/e2e.yaml  | 131 +++
 .../cases/storage/influxdb/docker-compose.yml  |  71 ++
 test/e2e-v2/cases/storage/influxdb/e2e.yaml| 131 +++
 test/e2e-v2/cases/storage/mysql/docker-compose.yml |  76 ++
 test/e2e-v2/cases/storage/mysql/e2e.yaml   | 131 +++
 .../cases/storage/opensearch/docker-compose.yml|  77 +++
 test/e2e-v2/cases/storage/opensearch/e2e.yaml  | 131 +++
 .../cases/storage/postgres/docker-compose.yml  |  72 ++
 test/e2e-v2/cases/storage/postgres/e2e.yaml| 131 +++
 test/e2e-v2/cases/storage/tidb/docker-compose.yml  |  76 ++
 test/e2e-v2/cases/storage/tidb/e2e.yaml| 131 +++
 .../e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml | 254 +
 32 files changed, 2211 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/e2e.storages.yaml 
b/.github/workflows/e2e.storages.yaml
index 822ff74..95f2001 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -36,17 +36,27 @@ jobs:
 timeout-minutes: 90
 strategy:
   matrix:
-storage: ['mysql', 'influxdb', 'opensearch', 'tidb', 'postgresql']
+config-file:
+  - storage/h2/e2e.yaml
+  - storage/opensearch/e2e.yaml
+  - storage/mysql/e2e.yaml
+  - storage/tidb/e2e.yaml
+  - storage/influxdb/e2e.yaml
+  - storage/postgres/e2e.yaml
 include:
-  - { storage: es, es-version: 6.3.2 }
-  - { storage: es, es-version: 7.0.0 }
-  - { storage: es, es-version: 7.8.0 }
-  - { storage: es, es-version: 7.10.1 }
-  - { storage: es, es-version: 7.14.0 }
-  - { storage: es, es-version: 7.15.0 }
-env:
-  SW_STORAGE: ${{ matrix.storage }}
-  ES_VERSION: ${{ matrix.es-version }}
+  - es-version: 6.3.2
+config-file: storage/es/e2e.yaml
+  - es-version: 7.0.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.8.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.10.1
+config-file: storage/es/e2e.yaml
+  - es-version: 7.14.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.15.0
+config-file: storage/es/e2e.yaml
+
 steps:
   - uses: actions/checkout@v2
 with:
@@ -55,9 +65,11 @@ jobs:
 uses: ./.github/actions/skip
   - name: Run E2E Test
 if: env.SKIP_CI != 'true'
-uses: ./.github/actions/e2e-test
+uses: ./.github/actions/infra-e2e-test
+env:
+  ES_VERSION: ${{ matrix.es-version }}
 with:
-  test_class: org.apache.skywalking.e2e.storage.StorageE2E
+  config-file: ${{ matrix.config-file }}
 
   Storage:
 if: (github.event_name == 'schedule' && github.repository == 
'apache/s

[skywalking] branch replace_storage_e2e updated (7c7c77a -> 0eec6b4)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 7c7c77a  contains
 add b4da778  revert storage e2e mis-change
 add 2fcbe8e  sync ui (#7937)
 add 0eec6b4  Merge remote-tracking branch 'origin/master' into 
replace_storage_e2e

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.storages.yaml   | 9 +
 CHANGES.md| 2 ++
 skywalking-ui | 2 +-
 test/e2e-v2/cases/storage/es/e2e.yaml | 4 +---
 test/e2e-v2/cases/storage/h2/e2e.yaml | 4 +---
 test/e2e-v2/cases/storage/influxdb/e2e.yaml   | 9 +++--
 test/e2e-v2/cases/storage/mysql/e2e.yaml  | 4 +---
 test/e2e-v2/cases/storage/opensearch/e2e.yaml | 4 +---
 test/e2e-v2/cases/storage/postgres/e2e.yaml   | 4 +---
 test/e2e-v2/cases/storage/tidb/e2e.yaml   | 4 +---
 10 files changed, 21 insertions(+), 25 deletions(-)

[skywalking] branch replace_storage_e2e updated (2a50df1 -> 7c7c77a)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 2a50df1  active h2
 add 7c7c77a  contains

No new revisions were added by this update.

Summary of changes:
 test/e2e-v2/cases/storage/expected/trace-users-detail.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch replace_storage_e2e updated (95cd452 -> 2a50df1)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 95cd452  fix e2e
 add 2a50df1  active h2

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.storages.yaml | 1 +
 1 file changed, 1 insertion(+)

[skywalking] branch replace_storage_e2e updated (b619673 -> 95cd452)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from b619673  revert proto chenge
 add 95cd452  fix e2e

No new revisions were added by this update.

Summary of changes:
 test/e2e-v2/cases/storage/es/docker-compose.yml | 2 --
 test/e2e-v2/cases/storage/es/e2e.yaml   | 4 
 test/e2e-v2/cases/storage/h2/e2e.yaml   | 4 
 test/e2e-v2/cases/storage/influxdb/docker-compose.yml   | 2 --
 test/e2e-v2/cases/storage/influxdb/e2e.yaml | 9 +++--
 test/e2e-v2/cases/storage/mysql/docker-compose.yml  | 2 --
 test/e2e-v2/cases/storage/mysql/e2e.yaml| 4 
 test/e2e-v2/cases/storage/opensearch/docker-compose.yml | 2 --
 test/e2e-v2/cases/storage/opensearch/e2e.yaml   | 4 
 test/e2e-v2/cases/storage/postgres/docker-compose.yml   | 2 --
 test/e2e-v2/cases/storage/postgres/e2e.yaml | 4 
 test/e2e-v2/cases/storage/tidb/docker-compose.yml   | 2 --
 test/e2e-v2/cases/storage/tidb/e2e.yaml | 4 
 13 files changed, 3 insertions(+), 42 deletions(-)

[skywalking] branch replace_storage_e2e updated (905bfec -> b619673)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 905bfec  fix change log.
 add b619673  revert proto chenge

No new revisions were added by this update.

Summary of changes:
 apm-protocol/apm-network/src/main/proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch replace_storage_e2e updated (4bf4857 -> 905bfec)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 4bf4857  Merge remote-tracking branch 'origin/master' into 
replace_storage_e2e
 add 905bfec  fix change log.

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

[skywalking] branch replace_storage_e2e updated (b5009ca -> 4bf4857)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from b5009ca  replace log e2e cases to e2e-v2.
 add 676b4ac  update change log
 add d73c51a  Replace e2e cases to e2e-v2: Python (#7932)
 add 605ca03  support negative infinity bucket in meter system (#7930)
 add 4bf4857  Merge remote-tracking branch 'origin/master' into 
replace_storage_e2e

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.python.yaml  |   4 +-
 CHANGES.md |  25 +++-
 .../provider/meter/process/MeterProcessor.java |  11 +-
 .../provider/meter/process/MeterProcessorTest.java | 132 +++
 .../skywalking/oap/meter/analyzer/Analyzer.java|   7 +-
 test/e2e-v2/cases/go/e2e.yaml  |   7 +-
 test/e2e-v2/cases/php/e2e.yaml |   7 +-
 .../cases}/python/Dockerfile.python|   5 +-
 .../docker => e2e-v2/cases}/python/consumer.py |   6 +-
 .../cases}/python/docker-compose.yml   |  48 ---
 test/e2e-v2/cases/python/e2e.yaml  | 143 +
 .../expected/dependency-instance-consumer-py.yml}  |  24 ++--
 .../dependency-instance-provider-py-kafka.yml} |  33 ++---
 .../expected/dependency-instance-provider-py.yml}  |  28 ++--
 .../expected/dependency-services-consumer-py.yml}  |  37 --
 .../expected/dependency-services-provider-py.yml}  |  14 +-
 .../{vm => python}/expected/metrics-has-value.yml  |   0
 .../expected/service-endpoint-consumer-java.yml}   |   0
 .../expected/service-endpoint-consumer-py.yml} |   4 +-
 .../service-endpoint-provider-py-kafka.yml}|   4 +-
 .../expected/service-endpoint-provider-py.yml} |   4 +-
 .../expected/service-instance-consumer-java.yml}   |   0
 .../expected/service-instance-consumer-py.yml} |  12 +-
 .../service-instance-provider-py-kafka.yml}|  12 +-
 .../expected/service-instance-provider-py.yml} |  12 +-
 .../cases/{nodejs => python}/expected/service.yml  |  13 +-
 .../expected/trace-test-detail.yml}| 126 --
 .../expected/traces-list-consumer-java.yml}|   2 +-
 .../expected/traces-list-consumer-py.yml}  |   2 +-
 .../expected/traces-list-provider-py-kafka.yml}|   0
 .../expected/traces-list-provider-py.yml}  |   0
 .../cases}/python/provider-kafka.py|   2 +-
 .../docker => e2e-v2/cases}/python/provider.py |   2 +-
 test/e2e-v2/script/env |   1 +
 34 files changed, 544 insertions(+), 183 deletions(-)
 create mode 100644 
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessorTest.java
 copy test/{e2e/e2e-test/docker => e2e-v2/cases}/python/Dockerfile.python (89%)
 copy test/{e2e/e2e-test/docker => e2e-v2/cases}/python/consumer.py (91%)
 copy test/{e2e/e2e-test/docker => e2e-v2/cases}/python/docker-compose.yml (84%)
 create mode 100644 test/e2e-v2/cases/python/e2e.yaml
 copy test/e2e-v2/cases/{nodejs/expected/dependency-instance.yml => 
python/expected/dependency-instance-consumer-py.yml} (66%)
 copy test/e2e-v2/cases/{gateway/expected/dependency-endpoint.yml => 
python/expected/dependency-instance-provider-py-kafka.yml} (53%)
 copy test/e2e-v2/cases/{nodejs/expected/dependency-instance.yml => 
python/expected/dependency-instance-provider-py.yml} (65%)
 copy test/e2e-v2/cases/{go/expected/dependency-services-go.yml => 
python/expected/dependency-services-consumer-py.yml} (61%)
 copy 
test/e2e-v2/cases/{nodejs/expected/dependency-services-provider-nodejs.yml => 
python/expected/dependency-services-provider-py.yml} (82%)
 copy test/e2e-v2/cases/{vm => python}/expected/metrics-has-value.yml (100%)
 copy test/e2e-v2/cases/{gateway/expected/service-endpoint-consumer.yml => 
python/expected/service-endpoint-consumer-java.yml} (100%)
 copy test/e2e-v2/cases/{php/expected/service-endpoint-php.yml => 
python/expected/service-endpoint-consumer-py.yml} (92%)
 copy test/e2e-v2/cases/{php/expected/service-endpoint-php.yml => 
python/expected/service-endpoint-provider-py-kafka.yml} (91%)
 copy test/e2e-v2/cases/{php/expected/service-endpoint-php.yml => 
python/expected/service-endpoint-provider-py.yml} (91%)
 copy test/e2e-v2/cases/{gateway/expected/service-instance-consumer.yml => 
python/expected/service-instance-consumer-java.yml} (100%)
 copy test/e2e-v2/cases/{nodejs/expected/service-instance-provider-nodejs.yml 
=> python/expected/service-instance-consumer-py.yml} (78%)
 copy test/e2e-v2/cases/{nodejs/expected/service-instance-provider-nodejs.yml 
=> python/expected/service-instance-provider-py-kafka.yml} (78%)
 copy test/e2e-v2/cases/{nodejs/expected/service-instance-pr

[skywalking] 01/01: replace log e2e cases to e2e-v2.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit b5009cad6f4ff53b86a7f014abeac592a8f1fd00
Author: JaredTan95 
AuthorDate: Fri Oct 15 17:49:48 2021 +0800

replace log e2e cases to e2e-v2.
---
 .github/workflows/e2e.storages.yaml|  44 ++--
 CHANGES.md |   4 +-
 test/e2e-v2/cases/storage/es/docker-compose.yml|  76 ++
 test/e2e-v2/cases/storage/es/e2e.yaml  | 137 +++
 .../cases/storage/expected/dependency-services.yml |  37 +++
 test/e2e-v2/cases/storage/expected/event-list.yml  |  49 
 .../cases/storage/expected/metrics-has-value.yml   |  19 ++
 .../cases/storage/expected/profile-create.yml  |  17 ++
 .../e2e-v2/cases/storage/expected/profile-list.yml |  34 +++
 .../storage/expected/profile-segment-analyze.yml   |  28 +++
 .../storage/expected/profile-segment-detail.yml|  38 +++
 .../storage/expected/profile-segment-list.yml  |  27 +++
 .../cases/storage/expected/service-endpoint.yml|  19 ++
 .../cases/storage/expected/service-instance.yml|  40 
 test/e2e-v2/cases/storage/expected/service.yml |  23 ++
 .../cases/storage/expected/trace-info-detail.yml   |  68 ++
 .../cases/storage/expected/trace-users-detail.yml  |  41 
 test/e2e-v2/cases/storage/expected/traces-list.yml |  29 +++
 test/e2e-v2/cases/storage/h2/Dockerfile.h2 |  24 ++
 test/e2e-v2/cases/storage/h2/docker-compose.yml|  73 ++
 test/e2e-v2/cases/storage/h2/e2e.yaml  | 137 +++
 .../cases/storage/influxdb/docker-compose.yml  |  73 ++
 test/e2e-v2/cases/storage/influxdb/e2e.yaml| 137 +++
 test/e2e-v2/cases/storage/mysql/docker-compose.yml |  78 +++
 test/e2e-v2/cases/storage/mysql/e2e.yaml   | 137 +++
 .../cases/storage/opensearch/docker-compose.yml|  79 +++
 test/e2e-v2/cases/storage/opensearch/e2e.yaml  | 137 +++
 .../cases/storage/postgres/docker-compose.yml  |  74 ++
 test/e2e-v2/cases/storage/postgres/e2e.yaml| 137 +++
 test/e2e-v2/cases/storage/tidb/docker-compose.yml  |  78 +++
 test/e2e-v2/cases/storage/tidb/e2e.yaml| 137 +++
 .../e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml | 254 +
 32 files changed, 2262 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/e2e.storages.yaml 
b/.github/workflows/e2e.storages.yaml
index 822ff74..06ab233 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -36,17 +36,26 @@ jobs:
 timeout-minutes: 90
 strategy:
   matrix:
-storage: ['mysql', 'influxdb', 'opensearch', 'tidb', 'postgresql']
+config-file:
+  - storage/opensearch/e2e.yaml
+  - storage/mysql/e2e.yaml
+  - storage/tidb/e2e.yaml
+  - storage/influxdb/e2e.yaml
+  - storage/postgres/e2e.yaml
 include:
-  - { storage: es, es-version: 6.3.2 }
-  - { storage: es, es-version: 7.0.0 }
-  - { storage: es, es-version: 7.8.0 }
-  - { storage: es, es-version: 7.10.1 }
-  - { storage: es, es-version: 7.14.0 }
-  - { storage: es, es-version: 7.15.0 }
-env:
-  SW_STORAGE: ${{ matrix.storage }}
-  ES_VERSION: ${{ matrix.es-version }}
+  - es-version: 6.3.2
+config-file: storage/es/e2e.yaml
+  - es-version: 7.0.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.8.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.10.1
+config-file: storage/es/e2e.yaml
+  - es-version: 7.14.0
+config-file: storage/es/e2e.yaml
+  - es-version: 7.15.0
+config-file: storage/es/e2e.yaml
+
 steps:
   - uses: actions/checkout@v2
 with:
@@ -55,15 +64,8 @@ jobs:
 uses: ./.github/actions/skip
   - name: Run E2E Test
 if: env.SKIP_CI != 'true'
-uses: ./.github/actions/e2e-test
+uses: ./.github/actions/infra-e2e-test
+env:
+  ES_VERSION: ${{ matrix.es-version }}
 with:
-  test_class: org.apache.skywalking.e2e.storage.StorageE2E
-
-  Storage:
-if: (github.event_name == 'schedule' && github.repository == 
'apache/skywalking') || (github.event_name != 'schedule')
-runs-on: ubuntu-latest
-timeout-minutes: 90
-needs: [StoragePlugins]
-steps:
-  - name: To pass or not pass
-run: echo "Just to make the GitHub merge button green"
+  config-file: ${{ matrix.config-file }}
diff --git a/CHANGES.md b/CHANGES.md
index acae23e..0ca4782 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,8 +6,6 @@ Release Notes.
 --
 

[skywalking] branch replace_storage_e2e created (now b5009ca)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch replace_storage_e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at b5009ca  replace log e2e cases to e2e-v2.

This branch includes the following new commits:

 new b5009ca  replace log e2e cases to e2e-v2.

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.

[skywalking] branch master updated: Replace log e2e cases to e2e-v2 (#7856)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new 61d4749  Replace log e2e cases to e2e-v2 (#7856)
61d4749 is described below

commit 61d4749288b3759ba96262e17a6fa940e855aba3
Author: Jared Tan 
AuthorDate: Fri Oct 15 13:26:17 2021 +0800

Replace log e2e cases to e2e-v2 (#7856)

* replace e2e with infra e2e.

* update e2e

* update e2e

* fix fluentbit & es6

* fix fluentbit & es6

* fix rules.

* fix docker compose in h2 case.

* update e2e

* fix e2e log

* fix env in e2e.

* fix case in e2e.

* fix case in e2e.

* Fix and refine matrix

* update fluent mount.

* fix missed provider service and wrong triggers in e2e.

* fix docker compose

* fix typo

* fix endpoints expected.

* fix mysql storage mount mysql driver.

* add ports for provider.

* add oap port for trigger.

* update e2e check

* fix mysql

Co-authored-by: kezhenxu94 
---
 .github/workflows/e2e.log.yaml | 54 +--
 CHANGES.md |  3 +
 test/e2e-v2/cases/log/es/docker-compose.yml| 60 +
 test/e2e-v2/cases/log/es/e2e.yaml  | 64 ++
 test/e2e-v2/cases/log/expected/logs.yml| 39 +++
 .../e2e-v2/cases/log/expected/service-endpoint.yml | 19 ++
 .../e2e-v2/cases/log/expected/service-instance.yml | 40 +++
 test/e2e-v2/cases/log/expected/service.yml | 20 ++
 .../e2e-v2/cases/log/fluent-bit/docker-compose.yml | 77 ++
 test/e2e-v2/cases/log/fluent-bit/e2e.yaml  | 64 ++
 .../cases/log/fluent-bit/fluent-bit-parser.conf| 21 ++
 .../cases/log/fluent-bit/fluent-bit-script.lua | 23 +++
 test/e2e-v2/cases/log/fluent-bit/fluent-bit.conf   | 40 +++
 test/e2e-v2/cases/log/h2/Dockerfile.h2 | 24 +++
 test/e2e-v2/cases/log/h2/docker-compose.yml| 61 +
 test/e2e-v2/cases/log/h2/e2e.yaml  | 64 ++
 test/e2e-v2/cases/log/influxdb/docker-compose.yml  | 59 +
 test/e2e-v2/cases/log/influxdb/e2e.yaml| 64 ++
 test/e2e-v2/cases/log/lal.yaml | 34 ++
 test/e2e-v2/cases/log/log-base-compose.yml | 33 ++
 test/e2e-v2/cases/log/log-mal.yaml | 36 ++
 test/e2e-v2/cases/log/mysql/docker-compose.yml | 64 ++
 test/e2e-v2/cases/log/mysql/e2e.yaml   | 64 ++
 test/e2e-v2/cases/log/postgres/docker-compose.yml  | 60 +
 test/e2e-v2/cases/log/postgres/e2e.yaml| 64 ++
 25 files changed, 1131 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/e2e.log.yaml b/.github/workflows/e2e.log.yaml
index 46f4c95..4cdce4f 100644
--- a/.github/workflows/e2e.log.yaml
+++ b/.github/workflows/e2e.log.yaml
@@ -39,25 +39,37 @@ jobs:
 timeout-minutes: 90
 strategy:
   matrix:
-storage: ['h2', 'mysql', 'es6', 'es7', 'es7.14', 'influxdb']
-env:
-  SW_STORAGE: ${{ matrix.storage }}
-steps:
-  - uses: actions/checkout@v2
-with:
-  submodules: true
-  - name: Set Skip Env Var
-uses: ./.github/actions/skip
-  - name: Run E2E Test
-if: env.SKIP_CI != 'true'
-uses: ./.github/actions/e2e-test
-with:
-  test_class: org.apache.skywalking.e2e.log.LogE2E
+config-file:
+  - log/h2/e2e.yaml
+  - log/mysql/e2e.yaml
+  - log/influxdb/e2e.yaml
+  - log/postgres/e2e.yaml
+include:
+  - es-version: 6.3.2
+config-file: log/es/e2e.yaml
+  - es-version: 7.0.0
+config-file: log/es/e2e.yaml
+  - es-version: 7.8.0
+config-file: log/es/e2e.yaml
+  - es-version: 7.10.1
+config-file: log/es/e2e.yaml
+  - es-version: 7.14.0
+config-file: log/es/e2e.yaml
+  - es-version: 7.15.0
+config-file: log/es/e2e.yaml
 
-  LogFluentBit:
-if: (github.event_name == 'schedule' && github.repository == 
'apache/skywalking') || (github.event_name != 'schedule')
-name: Log (FluentBit)
-runs-on: ubuntu-latest
+  - es-version: 6.3.2
+config-file: log/fluent-bit/e2e.yaml
+  - es-version: 7.0.0
+config-file: log/fluent-bit/e2e.yaml
+  - es-version: 7.8.0
+config-file: log/fluent-bit/e2e.yaml
+  - es-v

[skywalking] 01/01: remove unused defines

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch clean_up
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 55b04589d50ef9f43bf759d488537d1343120bbf
Author: JaredTan95 
AuthorDate: Sun Sep 26 20:18:48 2021 +0800

remove unused defines
---
 .../skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
 
b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
index 52786d2..f022685 100644
--- 
a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
+++ 
b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
@@ -99,7 +99,7 @@ public class MetricServiceGRPCHandler extends 
MetricsServiceGrpc.MetricsServiceI
 if (log.isDebugEnabled()) {
 log.debug("Envoy metrics reported from service[{}]", 
service);
 }
-List metricFamilies = new ArrayList<>();
+
 if (service != null && 
StringUtil.isNotEmpty(service.getServiceName()) && StringUtil.isNotEmpty(
 service.getServiceInstanceName())) {
 List list = 
message.getEnvoyMetricsList();

[skywalking] branch clean_up created (now 55b0458)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch clean_up
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 55b0458  remove unused defines

This branch includes the following new commits:

 new 55b0458  remove unused defines

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.

[skywalking-python] branch master updated: fix broken url (#163)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git


The following commit(s) were added to refs/heads/master by this push:
 new 652d7bd  fix broken url (#163)
652d7bd is described below

commit 652d7bda5185ea3b4ecd590a80526f4808319bcf
Author: Jared Tan 
AuthorDate: Sun Sep 12 13:43:40 2021 +0800

fix broken url (#163)
---
 docs/en/setup/Installation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/setup/Installation.md b/docs/en/setup/Installation.md
index c929e3c..43ca079 100644
--- a/docs/en/setup/Installation.md
+++ b/docs/en/setup/Installation.md
@@ -4,7 +4,7 @@
 
 You can install the SkyWalking Python agent via various ways.
 
-> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources) to build from sources.
+> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources.md) to build from sources.
 
 ### From PyPI
 
@@ -45,4 +45,4 @@ your applications with SkyWalking agent enabled for you. 
Please refer to our
 
 ### From Source Code
 
-Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources).
\ No newline at end of file
+Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources.md).

[skywalking-python] 01/01: fix broken url

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch JaredTan95-patch-1-1
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git

commit d7e3330cd7c925e372bf5f2dd94b92a2b9f0c8cf
Author: Jared Tan 
AuthorDate: Sun Sep 12 12:41:24 2021 +0800

fix broken url
---
 docs/en/setup/Installation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/setup/Installation.md b/docs/en/setup/Installation.md
index c929e3c..43ca079 100644
--- a/docs/en/setup/Installation.md
+++ b/docs/en/setup/Installation.md
@@ -4,7 +4,7 @@
 
 You can install the SkyWalking Python agent via various ways.
 
-> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources) to build from sources.
+> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources.md) to build from sources.
 
 ### From PyPI
 
@@ -45,4 +45,4 @@ your applications with SkyWalking agent enabled for you. 
Please refer to our
 
 ### From Source Code
 
-Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources).
\ No newline at end of file
+Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources.md).

[skywalking-python] branch JaredTan95-patch-1-1 created (now d7e3330)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch JaredTan95-patch-1-1
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git.


  at d7e3330  fix broken url

This branch includes the following new commits:

 new d7e3330  fix broken url

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.

[skywalking-python] branch JaredTan95-patch-1 created (now 6a0c77c)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch JaredTan95-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git.


  at 6a0c77c  fix broken url

This branch includes the following new commits:

 new 6a0c77c  fix broken url

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.

[skywalking-python] 01/01: fix broken url

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch JaredTan95-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git

commit 6a0c77c95321c131e5c7dafa22541bd78fcdc923
Author: Jared Tan 
AuthorDate: Sun Sep 12 12:40:35 2021 +0800

fix broken url
---
 docs/en/setup/Installation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/setup/Installation.md b/docs/en/setup/Installation.md
index c929e3c..aa8372d 100644
--- a/docs/en/setup/Installation.md
+++ b/docs/en/setup/Installation.md
@@ -4,7 +4,7 @@
 
 You can install the SkyWalking Python agent via various ways.
 
-> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources) to build from sources.
+> If you want to try out the latest features that are not released yet, please 
refer to this [guide](faq/How-to-build-from-sources.md) to build from sources.
 
 ### From PyPI
 
@@ -45,4 +45,4 @@ your applications with SkyWalking agent enabled for you. 
Please refer to our
 
 ### From Source Code
 
-Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources).
\ No newline at end of file
+Please refer to the [How-to-build-from-sources 
FAQ](faq/How-to-build-from-sources).

[skywalking] branch master updated: Fix dynamic configuration watch implementation current value not null when the config is deleted. (#7606)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new eb7fae2  Fix dynamic configuration watch implementation current value 
not null when the config is deleted. (#7606)
eb7fae2 is described below

commit eb7fae2ef28096fcb24fbd83e4de90bd542912ef
Author: wankai123 
AuthorDate: Mon Aug 30 18:20:25 2021 +0800

Fix dynamic configuration watch implementation current value not null when 
the config is deleted. (#7606)

* Fix dynamic configuration watch implementation current value not null 
when the config is deleted.

* add changes.md

* fix LoggingConfigWatcher watch.vale, and when value = null ,config not 
reset.

* fix

* fix style

* Update 
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfig.java

Co-authored-by: kezhenxu94 

* use Strings.nullToEmpty

Co-authored-by: 吴晟 Wu Sheng 
Co-authored-by: kezhenxu94 
---
 CHANGES.md  |  9 -
 .../provider/trace/UninstrumentedGatewaysConfig.java|  8 
 .../oap/server/core/alarm/provider/AlarmRulesWatcher.java   |  5 ++---
 .../oap/server/core/analysis/ApdexThresholdConfig.java  |  8 
 .../core/config/group/EndpointNameGroupingRuleWatcher.java  |  2 +-
 .../oap/server/core/logging/LoggingConfigWatcher.java   | 13 +++--
 .../configuration/discovery/AgentConfigurationsWatcher.java |  5 ++---
 7 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c441e9e..26fa18f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,7 +40,14 @@ Release Notes.
 * Fix NPE when OAP nodes synchronize events with each other in cluster mode.
 * Support k8s configmap grouped dynamic configurations.
 * Add desc sort function in H2 and ElasticSearch implementations of 
IBrowserLogQueryDAO
-* Support configure sampling policy by `configuration module` dynamically and 
static configuration file `trace-sampling-policy-settings.yml` for service 
dimension on the backend side. Dynamic configurations 
`agent-analyzer.default.sampleRate` and 
`agent-analyzer.default.slowTraceSegmentThreshold` are replaced by 
`agent-analyzer.default.traceSamplingPolicy`. Static configurations 
`agent-analyzer.default.sampleRate` and 
`agent-analyzer.default.slowTraceSegmentThreshold` are replaced by `ag [...]
+* Support configure sampling policy by `configuration module` dynamically and 
static configuration
+  file `trace-sampling-policy-settings.yml` for service dimension on the 
backend side. Dynamic
+  configurations `agent-analyzer.default.sampleRate` and 
`agent-analyzer.default.slowTraceSegmentThreshold` are replaced
+  by `agent-analyzer.default.traceSamplingPolicy`. Static configurations 
`agent-analyzer.default.sampleRate`
+  and `agent-analyzer.default.slowTraceSegmentThreshold` are replaced
+  by `agent-analyzer.default.traceSamplingPolicySettingsFile`.
+* Fix dynamic configuration watch implementation current value not null when 
the config is deleted.
+* Fix `LoggingConfigWatcher` return `watch.value` would not consistent with 
the real configuration content.
 
  UI
 
diff --git 
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfig.java
 
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfig.java
index 3791d52..7ae50fd 100644
--- 
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfig.java
+++ 
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfig.java
@@ -17,6 +17,7 @@
 
 package org.apache.skywalking.oap.server.analyzer.provider.trace;
 
+import com.google.common.base.Strings;
 import java.io.FileNotFoundException;
 import java.io.Reader;
 import java.util.ArrayList;
@@ -35,7 +36,6 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.skywalking.oap.server.analyzer.module.AnalyzerModule;
 import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher;
-import org.apache.skywalking.oap.server.core.Const;
 import org.apache.skywalking.oap.server.library.module.ModuleProvider;
 import org.apache.skywalking.oap.server.library.util.ResourceUtils;
 import 
org.apache.skywalking.oap.server.library.util.yaml.ClassFilterConstructor;
@@ -51,7 +51,7 @@ public class UninstrumentedGatewaysConfig extends 
ConfigChangeWatcher {
 
 public UninstrumentedGatewaysConfig(ModuleProvider provider) {
 super(AnalyzerModule.NAME, provider

[skywalking] branch fix_browser_nodetype updated (72442eb -> 1f07f60)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 72442eb  fix h2 and influxdb
 add dc05539  DataCarrier changes a `#consume` API to add properties as a 
parameter to initialize consumer (#7452)
 add cf08a2d  refine backend doc (#7451)
 add 4b66f1e  fix: Fix MultiScopesAnalysisListener#setPublicAttrs log warn 
frequently (#7271)
 add ce45397  Fix kafka-reporter-plugin shade package conflict (#7463)
 add 77bf5de  Polish otel receiver doc (#7464)
 add 39d23c1  Remove the duplicated tags to reduce the storage payload. 
(#7469)
 add 6bb4d35  Add all agent config to `agent.conf` file for convenient 
containerization use cases (#7470)
 add 1af2e46  Add a new API to test log analysis language (#7475)
 add 09cc0f9  Harden the security of Groovy-based DSL, MAL and LAL (#7485)
 add c04b4e0  Fix distinct in Service/Instance/Endpoint query is not 
working. (#7482)
 add ad0042f  Add missing property set for new field 
`httpResponseStatusCode` (#7486)
 add cf03304  Simplify GitHub workflows by using `uses` in `composite` 
actions (#7487)
 add 8bd6520  Change the slack joining guidance. (#7512)
 add 8f7d16a  Refine backend doc (#1) (#7522)
 add fb0f2cf  sync ui (#7523)
 add 1e87d2c  sync ui (#7525)
 add c133801  Use skywalking-eyes GHA instead of manually compile (#7524)
 add 6d3a33e  Add doc anchor (#7528)
 add 7b20645  Fix NPE when OAP nodes synchronize events with each other in 
cluster mode (#7531)
 add a2e011f  Kafka extra producer configuration enhancement (#7526)
 add abcd87f  Support collection type in dynamic configuration core and add 
zookeeper implementation  (#7509)
 add db2bc93  Separate agent docs to avoid long single page. (#7537)
 new a56a6af  Merge branch 'master' of https://github.com/apache/skywalking 
into fix_browser_nodetype
 new 1f07f60  update CHANGES.md

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.


Summary of changes:
 .github/actions/e2e-test/action.yml|  17 +-
 .github/actions/plugins-test/action.yml|  17 +-
 .github/workflows/ci-it.yaml   |  10 +-
 .github/workflows/codeql.yaml  |   2 +-
 .github/workflows/e2e.alarm.yaml   |   8 -
 .github/workflows/e2e.cluster.yaml |   8 -
 .github/workflows/e2e.compat.yaml  |   8 -
 .github/workflows/e2e.event.yaml   |   8 -
 .github/workflows/e2e.go.yaml  |   8 -
 .github/workflows/e2e.istio.yaml   |  12 +-
 .github/workflows/e2e.jdk-versions.yaml|   8 -
 .github/workflows/e2e.js.yaml  |  16 -
 .github/workflows/e2e.kafka.yaml   |   8 -
 .github/workflows/e2e.log.yaml |  16 -
 .github/workflows/e2e.nodejs.yaml  |   8 -
 .github/workflows/e2e.php.yaml |   8 -
 .github/workflows/e2e.profiling.yaml   |   8 -
 .github/workflows/e2e.python.yaml  |   8 -
 .github/workflows/e2e.so11y.yaml   |   8 -
 .github/workflows/e2e.storages.yaml|   9 -
 .github/workflows/e2e.ttl.yaml |   8 -
 .github/workflows/e2e.yaml |  16 -
 .github/workflows/plugins-jdk14-test.0.yaml|   7 -
 .github/workflows/plugins-test.0.yaml  |   7 -
 .github/workflows/plugins-test.1.yaml  |   7 -
 .github/workflows/plugins-test.2.yaml  |   7 -
 .github/workflows/plugins-test.3.yaml  |  13 +-
 CHANGES.md |  20 +-
 README.md  |   4 +-
 .../apm/commons/datacarrier/DataCarrier.java   |  11 +-
 .../datacarrier/consumer/ConsumeDriver.java|  22 +-
 .../commons/datacarrier/consumer/IConsumer.java|   3 +-
 .../apm/commons/datacarrier/DataCarrierTest.java   |   3 +-
 .../commons/datacarrier/consumer/ConsumerTest.java |   3 +-
 .../datacarrier/consumer/SampleConsumer.java   |   3 +-
 .../tag/{StringTag.java => IntegerTag.java}|  21 +-
 .../apm/agent/core/context/tag/Tags.java   |   8 +-
 .../agent/core/remote/LogReportServiceClient.java  |   3 +-
 .../core/remote/TraceSegmentServiceClient.java |   3 +-
 .../asynchttpclient/v2/AsyncHandlerWrapper.java|   2 +-
 .../http/v9/DefaultHttpClientInterceptor.java  |   2 +-
 .../http/v9/LoadBalancerHttpClientInterceptor.java |   2 +-
 .../plugin/grpc/v1/client/TracingClientCall.java   |  20 +-
 .../plugin/grpc/v1/server/TracingS

[skywalking] 02/02: update CHANGES.md

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 1f07f6054cd53517bcb469ae580e8384be61e919
Author: JaredTan95 
AuthorDate: Tue Aug 24 11:34:11 2021 +0800

update CHANGES.md
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index a933392..b22961a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,6 +48,7 @@ Release Notes.
 * Support collection type in dynamic configuration core.
 * Support zookeeper grouped dynamic configurations.
 * Fix NPE when OAP nodes synchronize events with each other in cluster mode.
+* Fix browser service not queried in getAllServices method.
 
  UI
 

[skywalking] 01/02: Merge branch 'master' of https://github.com/apache/skywalking into fix_browser_nodetype

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit a56a6af055955b3b259e000db715d1fd1c3f7447
Merge: 72442eb db2bc93
Author: JaredTan95 
AuthorDate: Tue Aug 24 11:33:03 2021 +0800

Merge branch 'master' of https://github.com/apache/skywalking into 
fix_browser_nodetype

 .github/actions/e2e-test/action.yml|  17 +-
 .github/actions/plugins-test/action.yml|  17 +-
 .github/workflows/ci-it.yaml   |  10 +-
 .github/workflows/codeql.yaml  |   2 +-
 .github/workflows/e2e.alarm.yaml   |   8 -
 .github/workflows/e2e.cluster.yaml |   8 -
 .github/workflows/e2e.compat.yaml  |   8 -
 .github/workflows/e2e.event.yaml   |   8 -
 .github/workflows/e2e.go.yaml  |   8 -
 .github/workflows/e2e.istio.yaml   |  12 +-
 .github/workflows/e2e.jdk-versions.yaml|   8 -
 .github/workflows/e2e.js.yaml  |  16 -
 .github/workflows/e2e.kafka.yaml   |   8 -
 .github/workflows/e2e.log.yaml |  16 -
 .github/workflows/e2e.nodejs.yaml  |   8 -
 .github/workflows/e2e.php.yaml |   8 -
 .github/workflows/e2e.profiling.yaml   |   8 -
 .github/workflows/e2e.python.yaml  |   8 -
 .github/workflows/e2e.so11y.yaml   |   8 -
 .github/workflows/e2e.storages.yaml|   9 -
 .github/workflows/e2e.ttl.yaml |   8 -
 .github/workflows/e2e.yaml |  16 -
 .github/workflows/plugins-jdk14-test.0.yaml|   7 -
 .github/workflows/plugins-test.0.yaml  |   7 -
 .github/workflows/plugins-test.1.yaml  |   7 -
 .github/workflows/plugins-test.2.yaml  |   7 -
 .github/workflows/plugins-test.3.yaml  |  13 +-
 CHANGES.md |  19 +-
 README.md  |   4 +-
 .../apm/commons/datacarrier/DataCarrier.java   |  11 +-
 .../datacarrier/consumer/ConsumeDriver.java|  22 +-
 .../commons/datacarrier/consumer/IConsumer.java|   3 +-
 .../apm/commons/datacarrier/DataCarrierTest.java   |   3 +-
 .../commons/datacarrier/consumer/ConsumerTest.java |   3 +-
 .../datacarrier/consumer/SampleConsumer.java   |   3 +-
 .../apm/agent/core/context/tag/IntegerTag.java |  33 +-
 .../apm/agent/core/context/tag/Tags.java   |   8 +-
 .../agent/core/remote/LogReportServiceClient.java  |   3 +-
 .../core/remote/TraceSegmentServiceClient.java |   3 +-
 .../asynchttpclient/v2/AsyncHandlerWrapper.java|   2 +-
 .../http/v9/DefaultHttpClientInterceptor.java  |   2 +-
 .../http/v9/LoadBalancerHttpClientInterceptor.java |   2 +-
 .../plugin/grpc/v1/client/TracingClientCall.java   |  20 +-
 .../plugin/grpc/v1/server/TracingServerCall.java   |   9 +-
 .../v4/HttpClientExecuteInterceptor.java   |   2 +-
 .../wrapper/HttpAsyncResponseConsumerWrapper.java  |   2 +-
 .../v3/HttpClientExecuteInterceptor.java   |   2 +-
 .../plugin/jetty/v9/server/HandleInterceptor.java  |   2 +-
 .../jsonrpc4j/JsonServiceExporterInterceptor.java  |   2 +-
 .../plugin/light4j/HandleRequestInterceptor.java   |   2 +-
 .../nutz/http/sync/SenderSendInterceptor.java  |   2 +-
 .../plugin/nutz/mvc/ActionMethodInterceptor.java   |   2 +-
 .../plugin/okhttp/common/RealCallInterceptor.java  |   2 +-
 .../apm/plugin/play/v2x/TracingFilter.java |   2 +-
 .../server/SynchronousDispatcherInterceptor.java   |   2 +-
 .../ProducerOperationHandlerInterceptor.java   |   2 +-
 .../TransportClientHandlerInterceptor.java |   2 +-
 .../v1/ProducerOperationHandlerInterceptor.java|   2 +-
 .../v1/TransportClientHandlerInterceptor.java  |   2 +-
 .../plugin/spring/mvc/v5/InvokeInterceptor.java|   2 +-
 .../interceptor/AbstractMethodInterceptor.java |   2 +-
 .../resttemplate/sync/RestResponseInterceptor.java |   2 +-
 .../v5/webclient/WebFluxWebClientInterceptor.java  |   2 +-
 .../apm/plugin/struts2/Struts2Interceptor.java |   2 +-
 .../plugin/tomcat78x/TomcatInvokeInterceptor.java  |   2 +-
 .../undertow/v2x/handler/TracingHandler.java   |   2 +-
 ...ClientRequestImplHandleResponseInterceptor.java |   2 +-
 ...tpContextHandleDispatchResponseInterceptor.java |   2 +-
 .../vertx3/HttpServerResponseImplInterceptor.java  |   2 +-
 .../jdk/http/HttpClientParseHttpInterceptor.java   |   2 +-
 apm-sniffer/config/agent.config| 245 +++---
 .../gateway/v20x/HttpClientRequestInterceptor.java |   2 +-
 ...ientFinalizerResponseConnectionInterceptor.java |   2 +-
 ...ientFinalizerResponseConnectionInterceptor.java |   2 +-
 .../DispatcherHandlerHandleMethodInterceptor.java  |  10 +-

[skywalking] branch fix_browser_nodetype created (now 72442eb)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 72442eb  fix h2 and influxdb

This branch includes the following new commits:

 new 3754d0f  fix node type(browser) not queried in API.
 new 72442eb  fix h2 and influxdb

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: fix h2 and influxdb

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 72442eb9a7cb65b030b52fdffc52c76e672bda6f
Author: JaredTan95 
AuthorDate: Tue Aug 24 11:24:32 2021 +0800

fix h2 and influxdb
---
 .../oap/server/storage/plugin/influxdb/query/MetadataQuery.java| 3 ++-
 .../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
 
b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
index d54620b..b7b3563 100644
--- 
a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
+++ 
b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
@@ -71,7 +71,8 @@ public class MetadataQuery implements IMetadataQueryDAO {
 final WhereQueryImpl where = select(
 ID_COLUMN, NAME, ServiceTraffic.GROUP)
 .from(client.getDatabase(), ServiceTraffic.INDEX_NAME)
-.where(eq(TagName.NODE_TYPE, 
String.valueOf(NodeType.Normal.value(;
+.where(eq(TagName.NODE_TYPE, 
String.valueOf(NodeType.Normal.value(
+.or(eq(TagName.NODE_TYPE, 
String.valueOf(NodeType.Browser.value(;
 if (StringUtil.isNotEmpty(group)) {
 where.and(eq(TagName.SERVICE_GROUP, group));
 }
diff --git 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
index 87c2d91..d204a0f 100644
--- 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
@@ -62,6 +62,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
 sql.append("select * from 
").append(ServiceTraffic.INDEX_NAME).append(" where ");
 sql.append(ServiceTraffic.NODE_TYPE).append("=?");
 condition.add(NodeType.Normal.value());
+sql.append(" or ").append(ServiceTraffic.NODE_TYPE).append("=?");
+condition.add(NodeType.Browser.value());
 if (StringUtil.isNotEmpty(group)) {
 sql.append(" and ").append(ServiceTraffic.GROUP).append("=?");
 condition.add(group);

[skywalking] 01/02: fix node type(browser) not queried in API.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 3754d0fe61c7fff299806bc5ce0ff5f379c8ca19
Author: JaredTan95 
AuthorDate: Tue Aug 24 10:58:40 2021 +0800

fix node type(browser) not queried in API.
---
 .../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
index 8464d3b..f1c8811 100644
--- 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -63,7 +63,8 @@ public class MetadataQueryEsDAO extends EsDAO implements 
IMetadataQueryDAO {
 SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
 
 BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
-
boolQueryBuilder.must().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, 
NodeType.Normal.value()));
+
boolQueryBuilder.should().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, 
NodeType.Normal.value()));
+
boolQueryBuilder.should().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, 
NodeType.Browser.value()));
 if (StringUtil.isNotEmpty(group)) {
 
boolQueryBuilder.must().add(QueryBuilders.termQuery(ServiceTraffic.GROUP, 
group));
 }

[skywalking] branch update_docker_jdk updated (f5bfb0a -> 2ef651d)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_docker_jdk
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from f5bfb0a  update jdk 11 and remove unused java_opts.
 add 2ef651d  revert agent image update.

No new revisions were added by this update.

Summary of changes:
 docker/agent/Dockerfile.agent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking] branch update_docker_jdk created (now f5bfb0a)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_docker_jdk
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at f5bfb0a  update jdk 11 and remove unused java_opts.

This branch includes the following new commits:

 new f5bfb0a  update jdk 11 and remove unused java_opts.

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.

[skywalking] 01/01: update jdk 11 and remove unused java_opts.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch update_docker_jdk
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit f5bfb0a15cf600c9b54e41a5a22f592f9b2cdc74
Author: JaredTan95 
AuthorDate: Wed Aug 11 14:41:27 2021 +0800

update jdk 11 and remove unused java_opts.
---
 CHANGES.md  | 1 +
 docker/agent/Dockerfile.agent   | 2 +-
 docker/oap/Dockerfile.oap   | 2 +-
 docker/oap/docker-entrypoint.sh | 4 
 docker/ui/Dockerfile.ui | 2 +-
 docker/ui/docker-entrypoint.sh  | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8f56653..f3eb8e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Release Notes.
 --
 
  Project
+* Upgrade jdk 11 in dockerfile and remove unused java_opts.
 
  Java Agent
 
diff --git a/docker/agent/Dockerfile.agent b/docker/agent/Dockerfile.agent
index a3049c3..251490c 100644
--- a/docker/agent/Dockerfile.agent
+++ b/docker/agent/Dockerfile.agent
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
+ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
 
 FROM alpine as build
 
diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap
index d496477..dd44a66 100644
--- a/docker/oap/Dockerfile.oap
+++ b/docker/oap/Dockerfile.oap
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
+ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
 
 FROM golang:1.14 AS cli
 
diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 827b45a..de60e3d 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -37,10 +37,6 @@ do
 CLASSPATH="$i:$CLASSPATH"
 done
 
-if java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap 
-version; then
-  JAVA_OPTS="${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions 
-XX:+UseCGroupMemoryLimitForHeap"
-fi
-
 set -ex
 
 exec java ${JAVA_OPTS} -classpath ${CLASSPATH} 
org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile.ui
index d8003df..d2f9f54 100644
--- a/docker/ui/Dockerfile.ui
+++ b/docker/ui/Dockerfile.ui
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM adoptopenjdk/openjdk8:alpine
+FROM adoptopenjdk/openjdk11:alpine
 
 ENV DIST_NAME=apache-skywalking-apm-bin \
 JAVA_OPTS=" -Xms256M " \
diff --git a/docker/ui/docker-entrypoint.sh b/docker/ui/docker-entrypoint.sh
index 80b85b7..807bb71 100755
--- a/docker/ui/docker-entrypoint.sh
+++ b/docker/ui/docker-entrypoint.sh
@@ -28,4 +28,4 @@ if [[ ! -z "$SW_OAP_ADDRESS" ]]; then
   done
 fi
 
-exec java  ${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions 
-XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar "$@"
+exec java  ${JAVA_OPTS} -jar webapp/skywalking-webapp.jar "$@"

[skywalking-docker] branch master updated: Improved docker compose file so can be run for ES6 and ES7 (#23)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git


The following commit(s) were added to refs/heads/master by this push:
 new 7295174  Improved docker compose file so can be run for ES6 and ES7 
(#23)
7295174 is described below

commit 729517484643282705d0ac3fc1e289e686636622
Author: andrewgkew 
AuthorDate: Fri Aug 6 14:40:38 2021 +0100

Improved docker compose file so can be run for ES6 and ES7 (#23)

* Improved docker compose file so can be run for ES6 and ES7
1. Updated compose file to include the SW_STORAGE env var otherwise it cant 
be overwritten when which between ES6 and ES7
2. Add missing env var SW_VERSION into env files
3. Updated versions of ES and SW to latest versions for both ES6 and ES7

* Downgrading version of ES 7 due to introduction of SSPL licence to 
version 7.11

* Removing SW_VERSION so that its not hardcoded to a particular version

Co-authored-by: Andrew Kew 
---
 compose/.env.es6   | 4 ++--
 compose/.env.es7   | 4 ++--
 compose/docker-compose.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/.env.es6 b/compose/.env.es6
index a2ba582..b19df53 100644
--- a/compose/.env.es6
+++ b/compose/.env.es6
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ES_VERSION=6.8.8
+ES_VERSION=6.8.18
 SW_STORAGE=elasticsearch
-IMAGE_TAG=es6
+IMAGE_TAG=es6
\ No newline at end of file
diff --git a/compose/.env.es7 b/compose/.env.es7
index d2ffb08..b4824c7 100644
--- a/compose/.env.es7
+++ b/compose/.env.es7
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ES_VERSION=7.5.0
+ES_VERSION=7.10.0
 SW_STORAGE=elasticsearch7
-IMAGE_TAG=es7
+IMAGE_TAG=es7
\ No newline at end of file
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 2eb19a5..a21ea43 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -56,7 +56,7 @@ services:
   retries: 3
   start_period: 40s
 environment:
-  SW_STORAGE: elasticsearch
+  SW_STORAGE: ${SW_STORAGE}
   SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
   SW_HEALTH_CHECKER: default
   SW_TELEMETRY: prometheus

[skywalking-goapi] 01/01: update query protocol commit

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch update_commit
in repository https://gitbox.apache.org/repos/asf/skywalking-goapi.git

commit 46f54262186570a7059cd95637bea87ecb33ff89
Author: JaredTan95 
AuthorDate: Wed Aug 4 14:23:52 2021 +0800

update query protocol commit
---
 dependencies.sh |  2 +-
 query/schema.go | 21 +++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dependencies.sh b/dependencies.sh
index d7120c8..82e308e 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -18,4 +18,4 @@
 # under the License.
 
 export COLLECT_PROTOCOL_SHA=e626ee04850703c220f64b642d2893fa65572943
-export QUERY_PROTOCOL_SHA=42d6783d8c1a0d0d4c2b28e58dc1f47dd554964e
+export QUERY_PROTOCOL_SHA=b827d0d7d95396b9ae87a10eef80a67af843cf3f
diff --git a/query/schema.go b/query/schema.go
index 2cf2d65..e6a6f30 100644
--- a/query/schema.go
+++ b/query/schema.go
@@ -9,10 +9,17 @@ import (
 )
 
 type AlarmMessage struct {
-   StartTime int64  `json:"startTime"`
-   Scope *Scope `json:"scope"`
-   IDstring `json:"id"`
-   Message   string `json:"message"`
+   StartTime int64   `json:"startTime"`
+   Scope *Scope  `json:"scope"`
+   IDstring  `json:"id"`
+   Message   string  `json:"message"`
+   Events[]*Event`json:"events"`
+   Tags  []*KeyValue `json:"tags"`
+}
+
+type AlarmTag struct {
+   Key   string  `json:"key"`
+   Value *string `json:"value"`
 }
 
 type AlarmTrend struct {
@@ -178,7 +185,7 @@ type EventQueryCondition struct {
Type   *EventType   `json:"type"`
Time   *Duration`json:"time"`
Order  *Order   `json:"order"`
-   Size   *int `json:"size"`
+   Paging *Pagination  `json:"paging"`
 }
 
 type Events struct {
@@ -1122,6 +1129,7 @@ const (
TemplateTypeTopologyEndpointTemplateType = 
"TOPOLOGY_ENDPOINT"
TemplateTypeTopologyServiceRelation TemplateType = 
"TOPOLOGY_SERVICE_RELATION"
TemplateTypeTopologyServiceInstanceRelation TemplateType = 
"TOPOLOGY_SERVICE_INSTANCE_RELATION"
+   TemplateTypeTopologyEndpointRelationTemplateType = 
"TOPOLOGY_ENDPOINT_RELATION"
 )
 
 var AllTemplateType = []TemplateType{
@@ -1131,11 +1139,12 @@ var AllTemplateType = []TemplateType{
TemplateTypeTopologyEndpoint,
TemplateTypeTopologyServiceRelation,
TemplateTypeTopologyServiceInstanceRelation,
+   TemplateTypeTopologyEndpointRelation,
 }
 
 func (e TemplateType) IsValid() bool {
switch e {
-   case TemplateTypeDashboard, TemplateTypeTopologyService, 
TemplateTypeTopologyInstance, TemplateTypeTopologyEndpoint, 
TemplateTypeTopologyServiceRelation, 
TemplateTypeTopologyServiceInstanceRelation:
+   case TemplateTypeDashboard, TemplateTypeTopologyService, 
TemplateTypeTopologyInstance, TemplateTypeTopologyEndpoint, 
TemplateTypeTopologyServiceRelation, 
TemplateTypeTopologyServiceInstanceRelation, 
TemplateTypeTopologyEndpointRelation:
return true
}
return false

[skywalking-goapi] branch update_commit created (now 46f5426)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_commit
in repository https://gitbox.apache.org/repos/asf/skywalking-goapi.git.


  at 46f5426  update query protocol commit

This branch includes the following new commits:

 new 46f5426  update query protocol commit

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.

[skywalking] branch master updated: fix not found error when refresh ui. (#7403)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new 9b30d0e  fix not found error when refresh ui. (#7403)
9b30d0e is described below

commit 9b30d0edfd6067a21565f318b3d9bb965b23
Author: Jared Tan 
AuthorDate: Wed Aug 4 08:03:03 2021 +0800

fix not found error when refresh ui. (#7403)

* fix not found error when refresh ui.

* add CHANGES.md

* Update CHANGES.md

Co-authored-by: 吴晟 Wu Sheng 
---
 CHANGES.md |  2 +
 .../apm/webapp/GlobalErrorWebExceptionHandler.java | 54 ++
 2 files changed, 56 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2dd50bd..40a3772 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,8 @@ Release Notes.
 
  UI
 
+* Fix not found error when refresh UI.
+
  Documentation
 
 All issues and pull requests are 
[here](https://github.com/apache/skywalking/milestone/96?closed=1)
diff --git 
a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
 
b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
new file mode 100644
index 000..34e6349
--- /dev/null
+++ 
b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.webapp;
+
+import java.io.IOException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Order(-1)
+@Configuration
+public class GlobalErrorWebExceptionHandler implements 
ErrorWebExceptionHandler {
+
+@Override
+public Mono handle(ServerWebExchange exchange, Throwable ex) {
+ServerHttpResponse response = exchange.getResponse();
+response.getHeaders().setContentType(MediaType.TEXT_HTML);
+return response.writeWith(Mono.fromSupplier(() -> {
+DataBufferFactory bufferFactory = response.bufferFactory();
+try {
+return bufferFactory.wrap(StreamUtils.copyToByteArray(
+new 
ClassPathResource("/public/index.html").getInputStream()));
+} catch (IOException e) {
+log.error("There was an error completing the action.", ex);
+return bufferFactory.wrap(new byte[0]);
+}
+}));
+}
+}
\ No newline at end of file

[skywalking-docker] branch fix_ui_entry_point updated (972ce76 -> 5496354)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


from 972ce76  fix
 add 5496354  update

No new revisions were added by this update.

Summary of changes:
 Makefile   |  2 +-
 compose/.env.es6   |  3 +-
 compose/.env.es7   |  3 +-
 compose/docker-compose.es7.yml | 79 --
 .../{docker-compose.es6.yml => docker-compose.yml} |  2 +-
 5 files changed, 6 insertions(+), 83 deletions(-)
 delete mode 100644 compose/docker-compose.es7.yml
 rename compose/{docker-compose.es6.yml => docker-compose.yml} (97%)

[skywalking-docker] branch fix_ui_entry_point updated (0074236 -> 972ce76)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


from 0074236  parameterize docker compose
 add 972ce76  fix

No new revisions were added by this update.

Summary of changes:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking-docker] branch fix_ui_entry_point updated (c8fd323 -> 0074236)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


from c8fd323  update
 add 0074236  parameterize docker compose

No new revisions were added by this update.

Summary of changes:
 Makefile   | 2 +-
 compose/{docker-compose.yml => docker-compose.es6.yml} | 4 ++--
 compose/{docker-compose.yml => docker-compose.es7.yml} | 4 ++--
 ui/docker-entrypoint.sh| 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 copy compose/{docker-compose.yml => docker-compose.es6.yml} (95%)
 rename compose/{docker-compose.yml => docker-compose.es7.yml} (95%)

[skywalking-docker] branch fix_ui_entry_point updated (ce5a351 -> c8fd323)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


from ce5a351  polish
 add c8fd323  update

No new revisions were added by this update.

Summary of changes:
 ui/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[skywalking-docker] branch fix_ui_entry_point updated (7f6e17a -> ce5a351)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


from 7f6e17a  update ui docker enntry point script.
 add ce5a351  polish

No new revisions were added by this update.

Summary of changes:
 compose/docker-compose.yml |  2 +-
 ui/README.md   | 15 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

[skywalking-docker] branch fix_ui_entry_point created (now 7f6e17a)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


  at 7f6e17a  update ui docker enntry point script.

This branch includes the following new commits:

 new 7f6e17a  update ui docker enntry point script.

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.

[skywalking-docker] 01/01: update ui docker enntry point script.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git

commit 7f6e17aac9105165c71eabe2d03ccc1a4113762f
Author: JaredTan95 
AuthorDate: Tue Aug 3 20:11:27 2021 +0800

update ui docker enntry point script.
---
 ui/docker-entrypoint.sh | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/docker-entrypoint.sh b/ui/docker-entrypoint.sh
index 7d499a4..80b85b7 100644
--- a/ui/docker-entrypoint.sh
+++ b/ui/docker-entrypoint.sh
@@ -20,7 +20,12 @@ set -e
 
 export LOGGING_CONFIG="webapp/logback.xml"
 
-[[ ! -z "$SW_OAP_ADDRESS" ]] && export 
COLLECTOR_RIBBON_LISTOFSERVERS=${SW_OAP_ADDRESS} && echo 
"COLLECTOR_RIBBON_LISTOFSERVERS=$COLLECTOR_RIBBON_LISTOFSERVERS"
-[[ ! -z "$SW_TIMEOUT" ]] && export COLLECTOR_RIBBON_READTIMEOUT=${SW_TIMEOUT} 
&& echo "COLLECTOR_RIBBON_READTIMEOUT=$COLLECTOR_RIBBON_READTIMEOUT"
+if [[ ! -z "$SW_OAP_ADDRESS" ]]; then
+  address_arr=(${SW_OAP_ADDRESS//,/ })
+  for i in "${!address_arr[@]}"
+  do
+  JAVA_OPTS="${JAVA_OPTS} 
-Dspring.cloud.discovery.client.simple.instances.oap-service[$i].uri=${address_arr[$i]}"
+  done
+fi
 
-exec java -jar webapp/skywalking-webapp.jar "$@"
+exec java  ${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions 
-XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar "$@"

[skywalking] branch fix_webapp_refresh updated (ec5c8b7 -> 2c3781c)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_webapp_refresh
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from ec5c8b7  Merge branch 'master' into fix_webapp_refresh
 add 2c3781c  add CHANGES.md

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

[skywalking] branch fix_webapp_refresh updated (9e4c8c3 -> ec5c8b7)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_webapp_refresh
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 9e4c8c3  fix not found error when refresh ui.
 add 0b418bf  Support Multiple DNS period resolving mechanism (#7398)
 add 651f7f1  Fix CVE-2021-35515, CVE-2021-35516, CVE-2021-35517, 
CVE-2021-36090 (#7400)
 add ec5c8b7  Merge branch 'master' into fix_webapp_refresh

No new revisions were added by this update.

Summary of changes:
 CHANGES.md |  6 
 .../apm/agent/core/remote/GRPCChannelManager.java  | 38 ++
 dist-material/release-docs/LICENSE | 15 +
 oap-server-bom/pom.xml |  2 +-
 .../scenarios/rabbitmq-scenario/configuration.yml  |  2 +-
 .../known-oap-backend-dependencies-es7.txt | 19 ++-
 .../known-oap-backend-dependencies.txt | 19 ++-
 7 files changed, 60 insertions(+), 41 deletions(-)

[skywalking] branch fix_webapp_refresh created (now 9e4c8c3)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_webapp_refresh
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 9e4c8c3  fix not found error when refresh ui.

This branch includes the following new commits:

 new 9e4c8c3  fix not found error when refresh ui.

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.

[skywalking] 01/01: fix not found error when refresh ui.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_webapp_refresh
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 9e4c8c3caad59e292e0595dd92f27ad3d0b5eacc
Author: JaredTan95 
AuthorDate: Tue Aug 3 19:53:24 2021 +0800

fix not found error when refresh ui.
---
 .../apm/webapp/GlobalErrorWebExceptionHandler.java | 54 ++
 1 file changed, 54 insertions(+)

diff --git 
a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
 
b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
new file mode 100644
index 000..34e6349
--- /dev/null
+++ 
b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/GlobalErrorWebExceptionHandler.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.webapp;
+
+import java.io.IOException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Order(-1)
+@Configuration
+public class GlobalErrorWebExceptionHandler implements 
ErrorWebExceptionHandler {
+
+@Override
+public Mono handle(ServerWebExchange exchange, Throwable ex) {
+ServerHttpResponse response = exchange.getResponse();
+response.getHeaders().setContentType(MediaType.TEXT_HTML);
+return response.writeWith(Mono.fromSupplier(() -> {
+DataBufferFactory bufferFactory = response.bufferFactory();
+try {
+return bufferFactory.wrap(StreamUtils.copyToByteArray(
+new 
ClassPathResource("/public/index.html").getInputStream()));
+} catch (IOException e) {
+log.error("There was an error completing the action.", ex);
+return bufferFactory.wrap(new byte[0]);
+}
+}));
+}
+}
\ No newline at end of file

[skywalking-nginx-lua] 01/01: change to right listen port.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_wrong_port
in repository https://gitbox.apache.org/repos/asf/skywalking-nginx-lua.git

commit c6265029608bdcf4e4e11ffdeebead809e00180b
Author: JaredTan95 
AuthorDate: Thu Jul 29 22:10:55 2021 +0800

change to right listen port.
---
 examples/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/nginx.conf b/examples/nginx.conf
index 145bebd..c37bf23 100644
--- a/examples/nginx.conf
+++ b/examples/nginx.conf
@@ -74,7 +74,7 @@ http {
 -- skywalking_tracer:start("upstream service", {custom = 
"custom_value"})
 }
 
-proxy_pass http://127.0.0.1:8080/tier2/lb;
+proxy_pass http://127.0.0.1:8090/tier2/lb;
 
 body_filter_by_lua_block {
 if ngx.arg[2] then
@@ -94,7 +94,7 @@ http {
 skywalking_tracer:start("backend service")
 }
 
-proxy_pass http://127.0.0.1:8080/backend;
+proxy_pass http://127.0.0.1:8090/backend;
 
 body_filter_by_lua_block {
 if ngx.arg[2] then

[skywalking-nginx-lua] branch fix_wrong_port created (now c626502)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch fix_wrong_port
in repository https://gitbox.apache.org/repos/asf/skywalking-nginx-lua.git.


  at c626502  change to right listen port.

This branch includes the following new commits:

 new c626502  change to right listen port.

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.

[skywalking] branch envoy_stats_sink_config updated (8c5abd1 -> f0cfb8a)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


from 8c5abd1  update CHANGES.md
 add 8820287  Improve okhttp plugin performance by optimizing 
Class.getDeclaredField(). (#7364)
 add f0cfb8a  Merge branch 'master' into envoy_stats_sink_config

No new revisions were added by this update.

Summary of changes:
 CHANGES.md |  1 +
 .../plugin/okhttp/common/AsyncCallInterceptor.java | 29 --
 .../plugin/okhttp/common/RealCallInterceptor.java  | 28 +++--
 3 files changed, 42 insertions(+), 16 deletions(-)

[skywalking] branch envoy_stats_sink_config updated: update CHANGES.md

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/envoy_stats_sink_config by 
this push:
 new 8c5abd1  update CHANGES.md
8c5abd1 is described below

commit 8c5abd17c6378e879c978c6920f8bdb41dc5de67
Author: JaredTan95 
AuthorDate: Fri Jul 23 21:54:07 2021 +0800

update CHANGES.md
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1f70106..e47b666 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -133,6 +133,7 @@ Release Notes.
 
 * Add FAQ about `Elasticsearch exception 
type=version_conflict_engine_exception since 8.7.0`
 * Add Self Observability service discovery (k8s).
+* Add sending Envoy Metrics to  OAP in envoy 1.19  example and bump up to  
Envoy V3 api.
 
 All issues and pull requests are 
[here](https://github.com/apache/skywalking/milestone/90?closed=1)
 

[skywalking] branch envoy_stats_sink_config updated: update

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/envoy_stats_sink_config by 
this push:
 new 01631fd  update
01631fd is described below

commit 01631fd82dabd1bb5490716397b9a0c79ee26e06
Author: JaredTan95 
AuthorDate: Fri Jul 23 21:46:46 2021 +0800

update
---
 docs/en/setup/envoy/examples/metrics/README.md |  2 ++
 ...mpose.yaml => docker-compose-envoy-v3-api.yaml} |  8 ++---
 .../envoy/examples/metrics/docker-compose.yaml |  6 ++--
 .../metrics/{envoy.yaml => envoy-v1.16.yaml}   | 37 --
 .../metrics/{envoy.yaml => envoy-v1.19.yaml}   |  8 ++---
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/docs/en/setup/envoy/examples/metrics/README.md 
b/docs/en/setup/envoy/examples/metrics/README.md
index 15f6501..9b75236 100644
--- a/docs/en/setup/envoy/examples/metrics/README.md
+++ b/docs/en/setup/envoy/examples/metrics/README.md
@@ -9,6 +9,7 @@ The example requires `docker` and `docker-compose` to be 
installed in your local
 
 Note that in ths setup, we override the [`log4j2.xml`](log4j2.xml) config to 
set the `org.apache.skywalking.oap.server.receiver.envoy` logger level to 
`DEBUG`. This enables us to see the messages sent by Envoy to SkyWalking OAP 
server.
 
+You can also find Envoy Metric Service V3 API example in 
[docker-compose-envoy-v3-api.yaml](./docker-compose-envoy-v3-api.yaml)
 ```
 $ make up
 $ docker-compose logs -f skywalking
@@ -111,3 +112,4 @@ skywalking_1  | }
 $ # To tear down:
 $ make down
 ```
+
diff --git a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml 
b/docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
similarity index 92%
copy from docs/en/setup/envoy/examples/metrics/docker-compose.yaml
copy to docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
index 95482a7..58d0382 100644
--- a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
+++ b/docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
@@ -16,15 +16,15 @@
 
 version: "3"
 services:
-  envoy:
+  envoy19:
 image: envoyproxy/envoy-alpine:v1.19-latest
 command: /usr/local/bin/envoy -c /etc/envoy.yaml --service-cluster 
envoy-proxy
 ports:
-- 1:1
+  - 10001:1
 depends_on:
-- skywalking
+  - skywalking
 volumes:
-- ./envoy.yaml:/etc/envoy.yaml
+  - ./envoy-v1.19.yaml:/etc/envoy.yaml
 
   skywalking:
 image: apache/skywalking-oap-server:latest
diff --git a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml 
b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
index 95482a7..a5873b9 100644
--- a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
+++ b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
@@ -16,15 +16,15 @@
 
 version: "3"
 services:
-  envoy:
-image: envoyproxy/envoy-alpine:v1.19-latest
+  envoy16:
+image: envoyproxy/envoy-alpine:v1.16.2
 command: /usr/local/bin/envoy -c /etc/envoy.yaml --service-cluster 
envoy-proxy
 ports:
 - 1:1
 depends_on:
 - skywalking
 volumes:
-- ./envoy.yaml:/etc/envoy.yaml
+- ./envoy-v1.16.yaml:/etc/envoy.yaml
 
   skywalking:
 image: apache/skywalking-oap-server:latest
diff --git a/docs/en/setup/envoy/examples/metrics/envoy.yaml 
b/docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
similarity index 72%
copy from docs/en/setup/envoy/examples/metrics/envoy.yaml
copy to docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
index 0efb939..9d3caec 100644
--- a/docs/en/setup/envoy/examples/metrics/envoy.yaml
+++ b/docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
@@ -23,17 +23,15 @@ admin:
   port_value: 9901
 
 stats_sinks:
-  - name: envoy.stat_sinks.metrics_service
-typed_config:
-  "@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig
-  transport_api_version: V3
+  - name: envoy.metrics_service
+config:
   grpc_service:
 envoy_grpc:
   cluster_name: service_skywalking
 
 node:
-  id: ingress
-  cluster: card-api-cluster
+  id: ingress-v1
+  cluster: card-api-cluster-v1
   locality:
 region: ap-southeast-1
 zone: zone1
@@ -42,8 +40,8 @@ node:
 skywalking: iscool
 envoy: isawesome
 LABELS:
-  app: test-app
-NAME: service-instance-name
+  app: test-app-v1
+NAME: service-instance-name-v1
 
 static_resources:
   listeners:
@@ -55,10 +53,9 @@ static_resources:
   port_value: 1
   filter_chains:
 - filters:
-- name: envoy.filters.network.http_connection_manager
+- name: envoy.http_connection_manager
   typed_config:
-"@type": 
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpCo

[skywalking] 01/01: bump up envoy metrics service sinks version. and update envoy.yaml config for demo.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 35ce622028dad2015ffb28ed1b0274adcf6a081c
Author: JaredTan95 
AuthorDate: Fri Jul 23 21:31:57 2021 +0800

bump up envoy metrics service sinks version.
and update envoy.yaml config for demo.
---
 docs/en/setup/envoy/examples/metrics/README.md | 71 +++---
 .../envoy/examples/metrics/docker-compose.yaml |  2 +-
 docs/en/setup/envoy/examples/metrics/envoy.yaml| 29 ++---
 3 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/docs/en/setup/envoy/examples/metrics/README.md 
b/docs/en/setup/envoy/examples/metrics/README.md
index 2c5..15f6501 100644
--- a/docs/en/setup/envoy/examples/metrics/README.md
+++ b/docs/en/setup/envoy/examples/metrics/README.md
@@ -13,15 +13,28 @@ Note that in ths setup, we override the 
[`log4j2.xml`](log4j2.xml) config to set
 $ make up
 $ docker-compose logs -f skywalking
 $ # Please wait for a moment until SkyWalking is ready and Envoy starts 
sending the stats. You will see similar messages like the following:
-skywalking_1  | 2019-08-31 23:57:40,672 - 
org.apache.skywalking.oap.server.receiver.envoy.MetricServiceGRPCHandler -26870 
[grpc-default-executor-0] DEBUG [] - Received msg identifier {
+skywalking_1  | 2021-07-23 13:25:30,683 - 
org.apache.skywalking.oap.server.receiver.envoy.MetricServiceGRPCHandler -19437 
[grpcServerPool-1-thread-2] DEBUG [] - Received msg identifier {
 skywalking_1  |   node {
 skywalking_1  | id: "ingress"
 skywalking_1  | cluster: "envoy-proxy"
 skywalking_1  | metadata {
 skywalking_1  |   fields {
-skywalking_1  | key: "skywalking"
+skywalking_1  | key: "LABELS"
 skywalking_1  | value {
-skywalking_1  |   string_value: "iscool"
+skywalking_1  |   struct_value {
+skywalking_1  | fields {
+skywalking_1  |   key: "app"
+skywalking_1  |   value {
+skywalking_1  | string_value: "test-app"
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  |   }
+skywalking_1  |   fields {
+skywalking_1  | key: "NAME"
+skywalking_1  | value {
+skywalking_1  |   string_value: "service-instance-name"
 skywalking_1  | }
 skywalking_1  |   }
 skywalking_1  |   fields {
@@ -30,24 +43,68 @@ skywalking_1  | value {
 skywalking_1  |   string_value: "isawesome"
 skywalking_1  | }
 skywalking_1  |   }
+skywalking_1  |   fields {
+skywalking_1  | key: "skywalking"
+skywalking_1  | value {
+skywalking_1  |   string_value: "iscool"
+skywalking_1  | }
+skywalking_1  |   }
 skywalking_1  | }
 skywalking_1  | locality {
 skywalking_1  |   region: "ap-southeast-1"
 skywalking_1  |   zone: "zone1"
 skywalking_1  |   sub_zone: "subzone1"
 skywalking_1  | }
-skywalking_1  | build_version: 
"e349fb6139e4b7a59a9a359be0ea45dd61e589c5/1.11.1/Clean/RELEASE/BoringSSL"
+skywalking_1  | user_agent_name: "envoy"
+skywalking_1  | user_agent_build_version {
+skywalking_1  |   version {
+skywalking_1  | major_number: 1
+skywalking_1  | minor_number: 19
+skywalking_1  |   }
+skywalking_1  |   metadata {
+skywalking_1  | fields {
+skywalking_1  |   key: "build.type"
+skywalking_1  |   value {
+skywalking_1  | string_value: "RELEASE"
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  | fields {
+skywalking_1  |   key: "revision.sha"
+skywalking_1  |   value {
+skywalking_1  | string_value: 
"68fe53a889416fd8570506232052b06f5a531541"
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  | fields {
+skywalking_1  |   key: "revision.status"
+skywalking_1  |   value {
+skywalking_1  | string_value: "Clean"
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  | fields {
+skywalking_1  |   key: "ssl.version"
+skywalking_1  |   value {
+skywalking_1  | string_value: "BoringSSL"
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  |   }
+skywalking_1  | }
+skywalking_1  | extensions {
+skywalking_1  |   name: "composite-action"
+skywalking_1  |   category: "envoy.matching.action"
+skywalking_1  | }
+..
 skywalking_1  |   }
 skywalking_1  | }
 skywalking_1  | envoy_me

[skywalking] branch envoy_stats_sink_config created (now 35ce622)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


  at 35ce622  bump up envoy metrics service sinks version. and update 
envoy.yaml config for demo.

This branch includes the following new commits:

 new 35ce622  bump up envoy metrics service sinks version. and update 
envoy.yaml config for demo.

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.

[skywalking] branch master updated: Revert "Adjust the project structure of the alarm module" (#7342)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new bd23f26  Revert "Adjust the project structure of the alarm module" 
(#7342)
bd23f26 is described below

commit bd23f263e69097e0cb185be6d08c9ee82e83815f
Author: 吴晟 Wu Sheng 
AuthorDate: Tue Jul 20 19:47:22 2021 +0800

Revert "Adjust the project structure of the alarm module" (#7342)

This reverts commit 62411964a46aa22d47319ca863feed3a39169548.
---
 CHANGES.md |  1 -
 .../alarm-default-plugin/pom.xml   | 86 --
 oap-server/server-alarm-plugin/pom.xml | 59 ++-
 .../oap/server/core/alarm/provider/AlarmCore.java  |  0
 .../core/alarm/provider/AlarmMessageFormatter.java |  0
 .../core/alarm/provider/AlarmModuleProvider.java   |  0
 .../oap/server/core/alarm/provider/AlarmRule.java  |  0
 .../core/alarm/provider/AlarmRulesWatcher.java |  0
 .../server/core/alarm/provider/AlarmSettings.java  |  0
 .../core/alarm/provider/CompositeAlarmRule.java|  0
 .../alarm/provider/CompositeRuleEvaluator.java |  0
 .../core/alarm/provider/EventHookCallback.java |  0
 .../core/alarm/provider/MetricsValueType.java  |  0
 .../server/core/alarm/provider/NotifyHandler.java  |  0
 .../oap/server/core/alarm/provider/OP.java |  0
 .../oap/server/core/alarm/provider/Rules.java  |  0
 .../server/core/alarm/provider/RulesReader.java|  0
 .../server/core/alarm/provider/RunningRule.java|  0
 .../oap/server/core/alarm/provider/Threshold.java  |  0
 .../core/alarm/provider/WebhookCallback.java   |  0
 .../provider/dingtalk/DingtalkHookCallback.java|  0
 .../alarm/provider/dingtalk/DingtalkSettings.java  |  0
 .../core/alarm/provider/expression/Expression.java |  0
 .../provider/expression/ExpressionContext.java |  0
 .../alarm/provider/feishu/FeishuHookCallback.java  |  0
 .../core/alarm/provider/feishu/FeishuSettings.java |  0
 .../core/alarm/provider/grpc/GRPCAlarmSetting.java |  0
 .../core/alarm/provider/grpc/GRPCCallback.java |  0
 .../core/alarm/provider/slack/SlackSettings.java   |  0
 .../alarm/provider/slack/SlackhookCallback.java|  0
 .../alarm/provider/wechat/WechatHookCallback.java  |  0
 .../core/alarm/provider/wechat/WechatSettings.java |  0
 .../alarm/provider/welink/WeLinkHookCallback.java  |  0
 .../core/alarm/provider/welink/WeLinkSettings.java |  0
 .../src/main/proto/alarm-hook.proto|  0
 ...alking.oap.server.library.module.ModuleProvider |  0
 .../server/core/alarm/provider/AlarmCoreTest.java  |  0
 .../alarm/provider/AlarmMessageFormatterTest.java  |  0
 .../alarm/provider/AlarmModuleProviderTest.java|  0
 .../core/alarm/provider/AlarmRulesWatcherTest.java |  0
 .../alarm/provider/CompositeRuleEvaluatorTest.java |  0
 .../core/alarm/provider/EventHookCallbackTest.java |  0
 .../core/alarm/provider/NotifyHandlerTest.java |  0
 .../oap/server/core/alarm/provider/OPTest.java |  0
 .../core/alarm/provider/RulesReaderTest.java   |  0
 .../core/alarm/provider/RunningRuleTest.java   |  0
 .../server/core/alarm/provider/ThresholdTest.java  |  0
 .../core/alarm/provider/WebhookCallbackTest.java   |  0
 .../dingtalk/DingtalkHookCallbackTest.java |  0
 .../provider/expression/ExpressionContextTest.java |  0
 .../alarm/provider/expression/ExpressionTest.java  |  0
 .../provider/feishu/FeishuHookCallbackTest.java|  0
 .../alarm/provider/grpc/AlarmMockReceiver.java |  0
 .../alarm/provider/grpc/GRPChookCallbackTest.java  |  0
 .../provider/wechat/WechatHookCallbackTest.java|  0
 .../provider/welink/WeLinkHookCallbackTest.java|  0
 .../src/test/resources/alarm-settings.yml  |  0
 .../src/test/resources/log4j2-test.xml |  0
 oap-server/server-bootstrap/pom.xml|  2 +-
 59 files changed, 56 insertions(+), 92 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c04f34d..80da753 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,6 @@ Release Notes.
   consume.
 * Build and push snapshot Docker images to GitHub Container Registry, this is 
only for people who want to help to test
   the master branch codes, please don't use in production environments.
-* Adjust the project structure of the alarm module for convenient the user to 
add their own implementation.
 
  Java Agent
 
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml 
b/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
deleted file mode 100644
index e0f91fb..000
--- a/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation=

[skywalking] branch master updated: update (#7340)

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
 new 6241196  update (#7340)
6241196 is described below

commit 62411964a46aa22d47319ca863feed3a39169548
Author: Jared Tan 
AuthorDate: Tue Jul 20 16:27:26 2021 +0800

update (#7340)
---
 CHANGES.md |  1 +
 .../{ => alarm-default-plugin}/pom.xml |  4 +-
 .../oap/server/core/alarm/provider/AlarmCore.java  |  0
 .../core/alarm/provider/AlarmMessageFormatter.java |  0
 .../core/alarm/provider/AlarmModuleProvider.java   |  0
 .../oap/server/core/alarm/provider/AlarmRule.java  |  0
 .../core/alarm/provider/AlarmRulesWatcher.java |  0
 .../server/core/alarm/provider/AlarmSettings.java  |  0
 .../core/alarm/provider/CompositeAlarmRule.java|  0
 .../alarm/provider/CompositeRuleEvaluator.java |  0
 .../core/alarm/provider/EventHookCallback.java |  0
 .../core/alarm/provider/MetricsValueType.java  |  0
 .../server/core/alarm/provider/NotifyHandler.java  |  0
 .../oap/server/core/alarm/provider/OP.java |  0
 .../oap/server/core/alarm/provider/Rules.java  |  0
 .../server/core/alarm/provider/RulesReader.java|  0
 .../server/core/alarm/provider/RunningRule.java|  0
 .../oap/server/core/alarm/provider/Threshold.java  |  0
 .../core/alarm/provider/WebhookCallback.java   |  0
 .../provider/dingtalk/DingtalkHookCallback.java|  0
 .../alarm/provider/dingtalk/DingtalkSettings.java  |  0
 .../core/alarm/provider/expression/Expression.java |  0
 .../provider/expression/ExpressionContext.java |  0
 .../alarm/provider/feishu/FeishuHookCallback.java  |  0
 .../core/alarm/provider/feishu/FeishuSettings.java |  0
 .../core/alarm/provider/grpc/GRPCAlarmSetting.java |  0
 .../core/alarm/provider/grpc/GRPCCallback.java |  0
 .../core/alarm/provider/slack/SlackSettings.java   |  0
 .../alarm/provider/slack/SlackhookCallback.java|  0
 .../alarm/provider/wechat/WechatHookCallback.java  |  0
 .../core/alarm/provider/wechat/WechatSettings.java |  0
 .../alarm/provider/welink/WeLinkHookCallback.java  |  0
 .../core/alarm/provider/welink/WeLinkSettings.java |  0
 .../src/main/proto/alarm-hook.proto|  0
 ...alking.oap.server.library.module.ModuleProvider |  0
 .../server/core/alarm/provider/AlarmCoreTest.java  |  0
 .../alarm/provider/AlarmMessageFormatterTest.java  |  0
 .../alarm/provider/AlarmModuleProviderTest.java|  0
 .../core/alarm/provider/AlarmRulesWatcherTest.java |  0
 .../alarm/provider/CompositeRuleEvaluatorTest.java |  0
 .../core/alarm/provider/EventHookCallbackTest.java |  0
 .../core/alarm/provider/NotifyHandlerTest.java |  0
 .../oap/server/core/alarm/provider/OPTest.java |  0
 .../core/alarm/provider/RulesReaderTest.java   |  0
 .../core/alarm/provider/RunningRuleTest.java   |  0
 .../server/core/alarm/provider/ThresholdTest.java  |  0
 .../core/alarm/provider/WebhookCallbackTest.java   |  0
 .../dingtalk/DingtalkHookCallbackTest.java |  0
 .../provider/expression/ExpressionContextTest.java |  0
 .../alarm/provider/expression/ExpressionTest.java  |  0
 .../provider/feishu/FeishuHookCallbackTest.java|  0
 .../alarm/provider/grpc/AlarmMockReceiver.java |  0
 .../alarm/provider/grpc/GRPChookCallbackTest.java  |  0
 .../provider/wechat/WechatHookCallbackTest.java|  0
 .../provider/welink/WeLinkHookCallbackTest.java|  0
 .../src/test/resources/alarm-settings.yml  |  0
 .../src/test/resources/log4j2-test.xml |  0
 oap-server/server-alarm-plugin/pom.xml | 59 ++
 oap-server/server-bootstrap/pom.xml|  2 +-
 59 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f32f398..58cd48a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Release Notes.
   consume.
 * Build and push snapshot Docker images to GitHub Container Registry, this is 
only for people who want to help to test
   the master branch codes, please don't use in production environments.
+* Adjust the project structure of the alarm module for convenient the user to 
add their own implementation.
 
  Java Agent
 
diff --git a/oap-server/server-alarm-plugin/pom.xml 
b/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
similarity index 96%
copy from oap-server/server-alarm-plugin/pom.xml
copy to oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
index 9564d7e..e0f91fb 100644
--- a/oap-server/server-alarm-plugin/pom.xml
+++ b/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
@@ -19,13 +19,13 @@
 
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd&