[GitHub] coveralls edited a comment on issue #1993: Support webflux and spring mvc 5 plugin
coveralls edited a comment on issue #1993: Support webflux and spring mvc 5 plugin URL: https://github.com/apache/incubator-skywalking/pull/1993#issuecomment-443575488 [![Coverage Status](https://coveralls.io/builds/20588319/badge)](https://coveralls.io/builds/20588319) Coverage decreased (-0.002%) to 14.425% when pulling **e76430789d5a8ea9abd3d7131e336dd03b1a9c63 on ascrutae:support/webflux** into **97ae8a0bc4003ac3f7b8429fa4c27893fce98097 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #1993: Support webflux and spring mvc 5 plugin
wu-sheng closed pull request #1993: Support webflux and spring mvc 5 plugin URL: https://github.com/apache/incubator-skywalking/pull/1993 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java index f1b95a3ca1..ae7380939e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java @@ -23,6 +23,7 @@ public static String[] NEED_PROPAGATE_CONTEXT_KEY = new String[] { "SW_REQUEST", -"SW_RESPONSE" +"SW_RESPONSE", +"SW_WEBFLUX_REQUEST_KEY" }; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java index 1d66adff7a..bf891d53f3 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java @@ -22,10 +22,10 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; public abstract class AbstractSpring4Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { -public static final String WITHNESS_CLASSES = "org.springframework.web.servlet.tags.ArgumentTag"; +public static final String WITHNESS_CLASSES = "org.springframework.cache.interceptor.SimpleKey"; @Override protected final String[] witnessClasses() { -return new String[] {WITHNESS_CLASSES}; +return new String[] {WITHNESS_CLASSES, "org.springframework.cache.interceptor.DefaultKeyGenerator"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml new file mode 100644 index 00..9f94946861 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml @@ -0,0 +1,64 @@ + + +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";> + +spring-plugins +org.apache.skywalking +6.0.0-beta-SNAPSHOT + +4.0.0 + +apm-springmvc-annotation-5.x-plugin +jar + +mvc-annotation-5.x-plugin +http://maven.apache.org + + +5.0.0.RELEASE +5.0.0.RELEASE +3.0.1 + + + + +org.springframework +spring-core +${spring-core.version} +provided + + +org.springframework +spring-webmvc +${spring-webmvc.version} +provided + + +javax.servlet +javax.servlet-api +${javax-servlet-api.version} +provided + + +org.apache.skywalking +apm-springmvc-annotation-commons +${project.version} +provided + + + diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java new file mode 100644 index 00..f32ca40638 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java @@ -0,0 +1,58 @@ +/* + * 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 Li
[incubator-skywalking] branch master updated: Support webflux and spring mvc 5 plugin (#1993)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git The following commit(s) were added to refs/heads/master by this push: new 2a566bb Support webflux and spring mvc 5 plugin (#1993) 2a566bb is described below commit 2a566bb7a33f979b2c6f3f71f66c1975213e1b63 Author: Xin,Zhang AuthorDate: Wed Dec 12 16:10:55 2018 +0800 Support webflux and spring mvc 5 plugin (#1993) * Support webflux and spring mvc 5 plugin * Change instrumentation * Change instrumentation * fix check style * Add support 2.1.x instrumentation --- .../core/conf/RuntimeContextConfiguration.java | 3 +- .../v4/define/AbstractSpring4Instrumentation.java | 4 +- .../mvc-annotation-5.x-plugin/pom.xml | 64 .../mvc/v5/ControllerConstructorInterceptor.java | 58 +++ .../plugin/spring/mvc/v5/GetBeanInterceptor.java | 59 +++ .../define/AbstractControllerInstrumentation.java | 113 .../v5/define/AbstractSpring5Instrumentation.java} | 13 ++- .../mvc/v5/define/ControllerInstrumentation.java} | 22 ++-- .../v5/define/HandlerMethodInstrumentation.java| 71 + .../v5/define/RestControllerInstrumentation.java} | 17 +-- .../src/main/resources/skywalking-plugin.def | 19 .../apm/plugin/spring/mvc/commons/Constants.java | 2 + apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 + .../spring-plugins/webflux-5.x-plugin/pom.xml | 59 +++ .../webflux/v5/AbstractMethodInterceptor.java | 102 ++ .../spring/webflux/v5/ConstructorInterceptor.java | 33 ++ .../v5/ConstructorWithHttpRequestInterceptor.java | 33 ++ .../v5/ControllerConstructorInterceptor.java | 57 +++ .../webflux/v5/OnInboundNextInterceptor.java | 66 .../webflux/v5/OnOutboundCompleteInterceptor.java | 50 + .../webflux/v5/OnOutboundErrorInterceptor.java | 51 + .../v5/RequestMappingMethodInterceptor.java| 42 .../webflux/v5/RestMappingMethodInterceptor.java | 77 ++ .../spring/webflux/v5/StatusInterceptor.java | 50 + .../define/AbstractControllerInstrumentation.java | 114 + .../AbstractSpringWebflux5Instrumentation.java}| 13 ++- .../v5/define/ControllerInstrumentation.java} | 22 ++-- .../HttpServerOperations20xInstrumentation.java| 107 +++ .../HttpServerOperations21xInstrumentation.java| 107 +++ .../v5/define/RestControllerInstrumentation.java} | 22 ++-- .../src/main/resources/skywalking-plugin.def | 20 .../service-agent/java-agent/Supported-list.md | 3 +- 32 files changed, 1416 insertions(+), 59 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java index f1b95a3..ae73809 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RuntimeContextConfiguration.java @@ -23,6 +23,7 @@ public class RuntimeContextConfiguration { public static String[] NEED_PROPAGATE_CONTEXT_KEY = new String[] { "SW_REQUEST", -"SW_RESPONSE" +"SW_RESPONSE", +"SW_WEBFLUX_REQUEST_KEY" }; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java index 1d66adf..bf891d5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java @@ -22,10 +22,10 @@ package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; public abstract class AbstractSpring4Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { -public static final String WITHNESS_CLASSES = "org.springframework.web.servlet.tags.ArgumentTag"; +public static final String WITHNESS_CLASSES = "org.springframework.cache.interceptor.SimpleKey"; @Override protected
[GitHub] wu-sheng closed issue #1865: Agent5.0GA not support SpringCloud2.x?
wu-sheng closed issue #1865: Agent5.0GA not support SpringCloud2.x? URL: https://github.com/apache/incubator-skywalking/issues/1865 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1865: Agent5.0GA not support SpringCloud2.x?
wu-sheng commented on issue #1865: Agent5.0GA not support SpringCloud2.x? URL: https://github.com/apache/incubator-skywalking/issues/1865#issuecomment-446498958 New Spring MVC 5 should be supported in beta release. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on a change in pull request #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin
wu-sheng commented on a change in pull request #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin URL: https://github.com/apache/incubator-skywalking/pull/2036#discussion_r240916891 ## File path: oap-server/pom.xml ## @@ -153,6 +154,11 @@ gson ${gson.version} + +com.squareup.okhttp3 +okhttp Review comment: okhttp should be in release license. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin
coveralls commented on issue #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin URL: https://github.com/apache/incubator-skywalking/pull/2036#issuecomment-446509144 [![Coverage Status](https://coveralls.io/builds/20588806/badge)](https://coveralls.io/builds/20588806) Coverage decreased (-0.1%) to 14.323% when pulling **95ea070e4d8a2a1a3c66c78e50743390face3427 on peng-yongsheng:feature/clust_consul** into **2a566bb7a33f979b2c6f3f71f66c1975213e1b63 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #2035: Support canal plugin
coveralls commented on issue #2035: Support canal plugin URL: https://github.com/apache/incubator-skywalking/pull/2035#issuecomment-446514058 [![Coverage Status](https://coveralls.io/builds/20589007/badge)](https://coveralls.io/builds/20589007) Coverage increased (+0.03%) to 14.461% when pulling **52a30e42b84452688477866f09459f1a4ff09e01 on WithLin:master** into **97ae8a0bc4003ac3f7b8429fa4c27893fce98097 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coki230 opened a new issue #2037: 少包
coki230 opened a new issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037 ### Bug - Which version of SkyWalking, OS and JRE? 最新版本SkyWalking - Which company or project? oap-server - What happen? 少包,lack the packege of "org.apache.skywalking.oap.server.core.remote.grpc" This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] xiaoni157 opened a new issue #2038: Connection es failed NoNodeAvailableException
xiaoni157 opened a new issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038 - Why do you submit this issue? - [ ✅] Question or discussion ___ ### Question - What do you want to know? Why is the connection abnormal ___ ### Bug - Which version of SkyWalking, OS and JRE? skywalking :5.0.0-GA ElasticSearch version: 5.5 aliyun es server jdk :1.8.0_171 OS:linux aliyun Ecs server - What happen? If possible, provide a way for reproducing the error. e.g. demo application, component version. The error i am getting in collector.log: https://user-images.githubusercontent.com/24448049/49859809-6ff64d80-fe33-11e8-9d6f-547d28acf4b0.png";> Here is my skywalking configuration file application.yml: ![firsh](https://user-images.githubusercontent.com/24448049/49859741-46d5bd00-fe33-11e8-9c62-aa36d17e62e7.jpeg) https://user-images.githubusercontent.com/24448049/49859745-49d0ad80-fe33-11e8-9914-d8250ade1fe6.png";> elasticsearch.yml is the default configuration of es server This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls edited a comment on issue #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin
coveralls edited a comment on issue #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin URL: https://github.com/apache/incubator-skywalking/pull/2036#issuecomment-446509144 [![Coverage Status](https://coveralls.io/builds/20595929/badge)](https://coveralls.io/builds/20595929) Coverage decreased (-0.1%) to 14.323% when pulling **070d3575e865e38116ddcbbcd7ac8be63c616703 on peng-yongsheng:feature/clust_consul** into **2a566bb7a33f979b2c6f3f71f66c1975213e1b63 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin
wu-sheng closed pull request #2036: [OAP Server][Cluster Plugin] Provide consul cluster plugin URL: https://github.com/apache/incubator-skywalking/pull/2036 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/CHANGES.md b/CHANGES.md index 990205e7cb..51f2329f31 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,6 +37,7 @@ Release Notes. - Support Zipkin format again. - Support init mode. - Support namespace in Zookeeper cluster management. +- Support consul plugin in cluster module. - OAL generate tool has been integrated into main repo, in the maven `compile` stage. - Optimize trace paging query. - Fix trace query don't use fuzzy query in ElasticSearch storage. @@ -46,7 +47,6 @@ Release Notes. - Fix `Remote clients selector error: / by zero `. - Fix segment TTL is not working. - UI - Support service throughput(cpm), successful rate(sla), avg response time and p99/p95/p90/p75/p50 response time. - Fix TopN endpoint link doesn't work right. @@ -59,7 +59,6 @@ Release Notes. - Update user wall and powered-by page. - Add RocketBot UI project link in document. - All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/31?closed=1) 6.0.0-alpha diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE index 410208ce46..78f03f8a19 100644 --- a/apm-dist/release-docs/LICENSE +++ b/apm-dist/release-docs/LICENSE @@ -304,6 +304,8 @@ The text of each license is the standard Apache 2.0 license. kubernetes-client 2.0.0: https://github.com/kubernetes-client/java, Apache 2.0 proto files from istio/istio: https://github.com/istio/istio Apache 2.0 proto files from istio/api: https://github.com/istio/api Apache 2.0 +consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0 +okhttp 3.9.0: https://github.com/square/okhttp, Apache 2.0 MIT licenses diff --git a/apm-dist/release-docs/licenses/LICENSE-consul-client.txt b/apm-dist/release-docs/licenses/LICENSE-consul-client.txt new file mode 100644 index 00..51a126479e --- /dev/null +++ b/apm-dist/release-docs/licenses/LICENSE-consul-client.txt @@ -0,0 +1,13 @@ +Copyright 2014 Orbitz + +Licensed 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. \ No newline at end of file diff --git a/apm-dist/release-docs/licenses/LICENSE-okhttp.txt b/apm-dist/release-docs/licenses/LICENSE-okhttp.txt new file mode 100644 index 00..7a4a3ea242 --- /dev/null +++ b/apm-dist/release-docs/licenses/LICENSE-okhttp.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or +
[incubator-skywalking] branch master updated: [OAP Server][Cluster Plugin] Provide consul cluster plugin (#2036)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git The following commit(s) were added to refs/heads/master by this push: new dfe2b08 [OAP Server][Cluster Plugin] Provide consul cluster plugin (#2036) dfe2b08 is described below commit dfe2b08599d37f4f6fb0fdd53763565c9918ca2c Author: 彭勇升 pengys <8082...@qq.com> AuthorDate: Thu Dec 13 00:14:41 2018 +0800 [OAP Server][Cluster Plugin] Provide consul cluster plugin (#2036) * Provide consul cluster plugin. * Change log and application config file. * Add consul's config item into the docker's application.yml. * Fixed bug. * Add consul description into readme. * Add okhttp component license. --- CHANGES.md | 3 +- apm-dist/release-docs/LICENSE | 2 + .../licenses/LICENSE-consul-client.txt | 13 ++ apm-dist/release-docs/licenses/LICENSE-okhttp.txt | 202 + docker/config/application.yml | 5 + docs/en/setup/backend/backend-cluster.md | 16 +- oap-server/pom.xml | 6 + .../zookeeper/ClusterModuleZookeeperConfig.java| 4 +- .../cluster_consul_plugin}/pom.xml | 41 +++-- .../plugin/consul/ClusterModuleConsulConfig.java} | 23 +-- .../plugin/consul/ClusterModuleConsulProvider.java | 92 ++ .../cluster/plugin/consul/ConsulCoordinator.java | 85 + ...alking.oap.server.library.module.ModuleProvider | 19 ++ oap-server/server-cluster-plugin/pom.xml | 1 + .../oap/server/core/CoreModuleProvider.java| 2 + .../core/cache/NetworkAddressInventoryCache.java | 5 +- .../server/core/query/TopologyQueryService.java| 7 +- .../server/core/register/EndpointInventory.java| 4 +- .../core/register/NetworkAddressInventory.java | 4 +- .../core/register/ServiceInstanceInventory.java| 12 +- .../oap/server/core/register/ServiceInventory.java | 13 +- .../remote/health/HealthCheckServiceHandler.java | 52 ++ .../src/main/proto/HealthCheckService.proto} | 33 ++-- .../oap/server/library/server/grpc/GRPCServer.java | 1 + oap-server/server-library/library-util/pom.xml | 5 +- .../util/{StringUtils.java => Address.java}| 22 +-- ...Utils.java => ConnectStringParseException.java} | 18 +- .../oap/server/library/util/ConnectUtils.java | 66 +++ .../server/library/util/ConnectUtilTestCase.java | 77 .../oap/query/graphql/resolver/TraceQuery.java | 5 +- .../v5/grpc/InstanceDiscoveryServiceHandler.java | 10 +- .../v5/rest/InstanceDiscoveryServletHandler.java | 7 +- .../handler/v6/grpc/RegisterServiceHandler.java| 37 +--- .../v5/ApplicationRegisterHandlerTestCase.java | 5 + .../standardization/ReferenceIdExchanger.java | 8 +- .../parser/standardization/SpanIdExchanger.java| 8 +- .../receiver/zipkin/transform/SegmentBuilder.java | 43 ++--- oap-server/server-starter/pom.xml | 5 + .../src/main/assembly/application.yml | 21 ++- .../src/main/resources/application.yml | 22 ++- .../elasticsearch/query/AlarmQueryEsDAO.java | 4 +- .../elasticsearch/query/MetadataQueryEsDAO.java| 11 +- .../elasticsearch/query/TraceQueryEsDAO.java | 22 +-- .../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java| 14 +- .../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 29 +-- .../plugin/jdbc/h2/dao/H2TraceQueryDAO.java| 21 +-- .../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 14 +- .../plugin/jdbc/mysql/MySQLTraceQueryDAO.java | 20 +- 48 files changed, 849 insertions(+), 290 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 990205e..51f2329 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,6 +37,7 @@ Release Notes. - Support Zipkin format again. - Support init mode. - Support namespace in Zookeeper cluster management. +- Support consul plugin in cluster module. - OAL generate tool has been integrated into main repo, in the maven `compile` stage. - Optimize trace paging query. - Fix trace query don't use fuzzy query in ElasticSearch storage. @@ -46,7 +47,6 @@ Release Notes. - Fix `Remote clients selector error: / by zero `. - Fix segment TTL is not working. - UI - Support service throughput(cpm), successful rate(sla), avg response time and p99/p95/p90/p75/p50 response time. - Fix TopN endpoint link doesn't work right. @@ -59,7 +59,6 @@ Release Notes. - Update user wall and powered-by page. - Add RocketBot UI project link in document. - All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/31?closed=1) 6.0.0-alpha diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE index 410208c.
[incubator-skywalking] branch 6-beta-release created (now dfe2b08)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 6-beta-release in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git. at dfe2b08 [OAP Server][Cluster Plugin] Provide consul cluster plugin (#2036) No new revisions were added by this update.
[GitHub] wu-sheng closed issue #2037: 少包
wu-sheng closed issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2037: 少包
wu-sheng commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446741377 English only. And follow document https://github.com/apache/incubator-skywalking/blob/master/docs/en/guides/How-to-build.md This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed issue #2038: Connection es failed NoNodeAvailableException
wu-sheng closed issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2038: Connection es failed NoNodeAvailableException
wu-sheng commented on issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038#issuecomment-446741630 Version 5.x asked for ElasticSearch TCP ports, default in 9200. Follow document please. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed issue #1139: Look for contributors to rebuild our website
wu-sheng closed issue #1139: Look for contributors to rebuild our website URL: https://github.com/apache/incubator-skywalking/issues/1139 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1139: Look for contributors to rebuild our website
wu-sheng commented on issue #1139: Look for contributors to rebuild our website URL: https://github.com/apache/incubator-skywalking/issues/1139#issuecomment-44674 Super cool. This has been done by PR https://github.com/apache/incubator-skywalking-website/pull/3 . Appreciate @TinyAllen continues contributions. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed issue #1031: Links missing from website
wu-sheng closed issue #1031: Links missing from website URL: https://github.com/apache/incubator-skywalking/issues/1031 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1031: Links missing from website
wu-sheng commented on issue #1031: Links missing from website URL: https://github.com/apache/incubator-skywalking/issues/1031#issuecomment-446750379 Through the PR #1139 ( link to https://github.com/apache/incubator-skywalking-website/pull/3 ). Now the website has that too. See http://skywalking.apache.org/ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] TinyAllen opened a new pull request #4: Update: add clean script
TinyAllen opened a new pull request #4: Update: add clean script URL: https://github.com/apache/incubator-skywalking-website/pull/4 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] TinyAllen opened a new pull request #5: Updata: update README
TinyAllen opened a new pull request #5: Updata: update README URL: https://github.com/apache/incubator-skywalking-website/pull/5 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-skywalking-website] branch asf-site updated: Update: add clean script (#4)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 3faf31a Update: add clean script (#4) 3faf31a is described below commit 3faf31ae34e17db2e666a6ad71d1caf0b3114e86 Author: Allen Wang AuthorDate: Thu Dec 13 07:43:36 2018 +0800 Update: add clean script (#4) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43e053c..b1df766 100755 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Fing ", "repository": "https://github.com/mtobeiyf/vuepress-homepage.git";, "scripts": { -"clean": "rimraf dist/*", +"clean": "rimraf dist/* assets blog downloads events zh team", "dev": "vuepress dev docs", "build": "vuepress build docs && mv dist/* ." },
[GitHub] JaredTan95 closed pull request #4: Update: add clean script
JaredTan95 closed pull request #4: Update: add clean script URL: https://github.com/apache/incubator-skywalking-website/pull/4 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/package.json b/package.json index 43e053c..b1df766 100755 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Fing ", "repository": "https://github.com/mtobeiyf/vuepress-homepage.git";, "scripts": { -"clean": "rimraf dist/*", +"clean": "rimraf dist/* assets blog downloads events zh team", "dev": "vuepress dev docs", "build": "vuepress build docs && mv dist/* ." }, This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] JaredTan95 commented on a change in pull request #5: Updata: update README
JaredTan95 commented on a change in pull request #5: Updata: update README URL: https://github.com/apache/incubator-skywalking-website/pull/5#discussion_r241227804 ## File path: README.md ## @@ -15,8 +15,9 @@ Note, branch `asf-site` don't accept pull request, all `asf-site` branch HTMLs s Usage: 1. Git pull branch `asf-site` -2. Run `npm run build` -3. Push files and send pull request if necessary. +2. Run `npm run clean` Review comment: How about add **`npm run dev` in your local env to check if it works fine.And then,** This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on a change in pull request #5: Updata: update README
wu-sheng commented on a change in pull request #5: Updata: update README URL: https://github.com/apache/incubator-skywalking-website/pull/5#discussion_r241234628 ## File path: README.md ## @@ -15,8 +15,9 @@ Note, branch `asf-site` don't accept pull request, all `asf-site` branch HTMLs s Usage: 1. Git pull branch `asf-site` -2. Run `npm run build` -3. Push files and send pull request if necessary. +2. Run `npm run clean` Review comment: I will do this in my update. Thanks for pointing this out. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #5: Updata: update README
wu-sheng closed pull request #5: Updata: update README URL: https://github.com/apache/incubator-skywalking-website/pull/5 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index f6c0961..f798287 100755 --- a/README.md +++ b/README.md @@ -15,8 +15,9 @@ Note, branch `asf-site` don't accept pull request, all `asf-site` branch HTMLs s Usage: 1. Git pull branch `asf-site` -2. Run `npm run build` -3. Push files and send pull request if necessary. +2. Run `npm run clean` +3. Run `npm run build` +4. Push files and send pull request if necessary. ## How to add document in the site This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-skywalking-website] branch asf-site updated: Updata: update README (#5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 21dc2c7 Updata: update README (#5) 21dc2c7 is described below commit 21dc2c7b5a2f067f088d6f36b31a006d20a10022 Author: Allen Wang AuthorDate: Thu Dec 13 08:25:47 2018 +0800 Updata: update README (#5) --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6c0961..f798287 100755 --- a/README.md +++ b/README.md @@ -15,8 +15,9 @@ Note, branch `asf-site` don't accept pull request, all `asf-site` branch HTMLs s Usage: 1. Git pull branch `asf-site` -2. Run `npm run build` -3. Push files and send pull request if necessary. +2. Run `npm run clean` +3. Run `npm run build` +4. Push files and send pull request if necessary. ## How to add document in the site
[incubator-skywalking-website] 03/03: website update with new blog.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git commit 5e19fbc4733ebfc21ecc9b07a7c553c0b2e68ebd Author: Wu Sheng AuthorDate: Wed Dec 12 16:32:50 2018 -0800 website update with new blog. --- 404.html | 6 +-- README.md | 21 +++- assets/js/{11.c74c9c2d.js => 10.17169b0b.js} | 2 +- assets/js/{10.63805c0f.js => 11.1c2306fe.js} | 2 +- assets/js/{11.c74c9c2d.js => 12.211c44b0.js} | 2 +- assets/js/{12.8f35b9ed.js => 13.eb34db86.js} | 2 +- assets/js/{13.0fa86b92.js => 14.1939533e.js} | 2 +- assets/js/{14.7d492527.js => 15.73ee1123.js} | 2 +- assets/js/16.0d75f3ff.js | 1 - assets/js/{15.bf276cb7.js => 16.d63afe3d.js} | 2 +- assets/js/17.53b0bfaf.js | 1 + assets/js/{2.4792c3f6.js => 2.6ccfead1.js} | 2 +- assets/js/{3.1dbf0cac.js => 3.b63edb1b.js} | 2 +- assets/js/{4.239592f9.js => 4.afc0ddeb.js} | 2 +- assets/js/5.02eb5062.js| 1 + assets/js/{5.d4bf4756.js => 6.878a8dd9.js} | 2 +- assets/js/{6.cb71e4c6.js => 7.a4a0ddba.js} | 2 +- assets/js/{7.cb536fc4.js => 8.628296db.js} | 2 +- assets/js/{8.1f551c34.js => 9.80629824.js} | 2 +- assets/js/9.961ff215.js| 1 - assets/js/{app.2ef205d1.js => app.54feb5fd.js} | 6 +-- blog/2018-05-24-skywalking-net.html| 4 +- blog/2018-12-12-skywalking-service-mesh-ready.html | 62 ++ blog/index.html| 6 +-- downloads/index.html | 4 +- events/index.html | 4 +- index.html | 4 +- team/index.html| 4 +- zh/blog/2018-05-24-skywalking-net.html | 4 +- zh/blog/index.html | 4 +- zh/doc/index.html | 4 +- zh/downloads/index.html| 4 +- zh/events/index.html | 4 +- zh/index.html | 4 +- zh/team/index.html | 4 +- 35 files changed, 118 insertions(+), 63 deletions(-) diff --git a/404.html b/404.html index 54bebfc..625f7fc 100644 --- a/404.html +++ b/404.html @@ -7,11 +7,11 @@ - -404 Looks like we've got some broken links. Take me home. - +404 That's a Four-Oh-Four. Take me home. + diff --git a/README.md b/README.md index f798287..ed7ec57 100755 --- a/README.md +++ b/README.md @@ -1,23 +1,16 @@ # Apache SkyWalking webpage -This is the repository including all source codes of `http://skywalking.incubator.apache.org` and `http://skywalking.io`. +This is the repository including all source codes of `http://skywalking.incubator.apache.org`. -Apache Infra deploys the webpage in branch `asf-site`, SkyWalking team governs sourse in branch `master`. - -## Contribution - -Please contribute the website to branch `master` - -## How to generate HTMLs in asf-site - -Note, branch `asf-site` don't accept pull request, all `asf-site` branch HTMLs should be generated by SkyWalking PPMC members or Robot. +## Compile, preview and generate static files Usage: 1. Git pull branch `asf-site` -2. Run `npm run clean` -3. Run `npm run build` -4. Push files and send pull request if necessary. +1. Run `npm run clean` +1. Run `npm run dev` in your local env, open `http://localhost:8080` in browser, check whether it works fine +1. Run `npm run build` to generate static files. +1. Push files and send pull request if necessary, with screenshots showing how you would change. ## How to add document in the site @@ -41,7 +34,7 @@ Usage: | | |-- README.md // team's markdown | |-- zh // Chinese version | | |-- README.md // homepage's markdown -| | |-- blog +| | |-- blog | | | |-- xxx.md // other blog markdowns | | | |-- README.md // blog's markdown | | |-- downloads diff --git a/assets/js/11.c74c9c2d.js b/assets/js/10.17169b0b.js similarity index 65% copy from assets/js/11.c74c9c2d.js copy to assets/js/10.17169b0b.js index 7ba319f..f99ffb4 100644 --- a/assets/js/11.c74c9c2d.js +++ b/assets/js/10.17169b0b.js @@ -1 +1 @@ -(window.webpackJsonp=window.webpackJsonp||[]).push([[11],{172:function(t,n,e){"use strict";e.r(n);var s=e(0),i=Object(s.a)({},function(){var t=this.$createElement;return(this._self._c||t)("div",{staticClass:"content"})},[],!1,null,null,null);i.options.__file="README.md";n.default=i.exports}}]); \ No newline at end of file +(window.webpackJsonp=window.webpackJsonp
[incubator-skywalking-website] branch asf-site updated (21dc2c7 -> 5e19fbc)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git. from 21dc2c7 Updata: update README (#5) new 7312b2b Post the blog of SkyWalking v6 new 9b2c2fc Merge branch 'asf-site' of https://github.com/apache/incubator-skywalking-website into asf-site new 5e19fbc website update with new blog. 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. Summary of changes: 404.html | 6 +- README.md | 21 ++-- assets/js/{11.c74c9c2d.js => 10.17169b0b.js} | 2 +- assets/js/{10.63805c0f.js => 11.1c2306fe.js} | 2 +- assets/js/{11.c74c9c2d.js => 12.211c44b0.js} | 2 +- assets/js/{12.8f35b9ed.js => 13.eb34db86.js} | 2 +- assets/js/{13.0fa86b92.js => 14.1939533e.js} | 2 +- assets/js/{14.7d492527.js => 15.73ee1123.js} | 2 +- assets/js/16.0d75f3ff.js | 1 - assets/js/{15.bf276cb7.js => 16.d63afe3d.js} | 2 +- assets/js/17.53b0bfaf.js | 1 + assets/js/{2.4792c3f6.js => 2.6ccfead1.js} | 2 +- assets/js/{3.1dbf0cac.js => 3.b63edb1b.js} | 2 +- assets/js/{4.239592f9.js => 4.afc0ddeb.js} | 2 +- assets/js/5.02eb5062.js| 1 + assets/js/{5.d4bf4756.js => 6.878a8dd9.js} | 2 +- assets/js/{6.cb71e4c6.js => 7.a4a0ddba.js} | 2 +- assets/js/{7.cb536fc4.js => 8.628296db.js} | 2 +- assets/js/{8.1f551c34.js => 9.80629824.js} | 2 +- assets/js/9.961ff215.js| 1 - assets/js/{app.2ef205d1.js => app.54feb5fd.js} | 6 +- blog/2018-05-24-skywalking-net.html| 4 +- blog/2018-12-12-skywalking-service-mesh-ready.html | 62 +++ blog/index.html| 6 +- .../2018-12-12-skywalking-service-mesh-ready.md| 113 + docs/blog/README.md| 7 +- downloads/index.html | 4 +- events/index.html | 4 +- index.html | 4 +- team/index.html| 4 +- zh/blog/2018-05-24-skywalking-net.html | 4 +- zh/blog/index.html | 4 +- zh/doc/index.html | 4 +- zh/downloads/index.html| 4 +- zh/events/index.html | 4 +- zh/index.html | 4 +- zh/team/index.html | 4 +- 37 files changed, 236 insertions(+), 65 deletions(-) copy assets/js/{11.c74c9c2d.js => 10.17169b0b.js} (65%) rename assets/js/{10.63805c0f.js => 11.1c2306fe.js} (97%) rename assets/js/{11.c74c9c2d.js => 12.211c44b0.js} (65%) rename assets/js/{12.8f35b9ed.js => 13.eb34db86.js} (75%) rename assets/js/{13.0fa86b92.js => 14.1939533e.js} (99%) rename assets/js/{14.7d492527.js => 15.73ee1123.js} (97%) delete mode 100644 assets/js/16.0d75f3ff.js rename assets/js/{15.bf276cb7.js => 16.d63afe3d.js} (98%) create mode 100644 assets/js/17.53b0bfaf.js rename assets/js/{2.4792c3f6.js => 2.6ccfead1.js} (84%) rename assets/js/{3.1dbf0cac.js => 3.b63edb1b.js} (65%) rename assets/js/{4.239592f9.js => 4.afc0ddeb.js} (97%) create mode 100644 assets/js/5.02eb5062.js rename assets/js/{5.d4bf4756.js => 6.878a8dd9.js} (65%) rename assets/js/{6.cb71e4c6.js => 7.a4a0ddba.js} (99%) rename assets/js/{7.cb536fc4.js => 8.628296db.js} (97%) rename assets/js/{8.1f551c34.js => 9.80629824.js} (98%) delete mode 100644 assets/js/9.961ff215.js rename assets/js/{app.2ef205d1.js => app.54feb5fd.js} (82%) create mode 100644 blog/2018-12-12-skywalking-service-mesh-ready.html create mode 100644 docs/blog/2018-12-12-skywalking-service-mesh-ready.md
[incubator-skywalking-website] 02/03: Merge branch 'asf-site' of https://github.com/apache/incubator-skywalking-website into asf-site
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git commit 9b2c2fcc89da9badfe690778a2f00c26af229fd8 Merge: 7312b2b 21dc2c7 Author: Wu Sheng AuthorDate: Wed Dec 12 16:28:20 2018 -0800 Merge branch 'asf-site' of https://github.com/apache/incubator-skywalking-website into asf-site README.md| 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
[incubator-skywalking-website] 01/03: Post the blog of SkyWalking v6
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git commit 7312b2b389a142f1dd3281f5181edfe16fc7545e Author: Wu Sheng AuthorDate: Wed Dec 12 16:27:16 2018 -0800 Post the blog of SkyWalking v6 --- .../2018-12-12-skywalking-service-mesh-ready.md| 113 + docs/blog/README.md| 7 +- 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/docs/blog/2018-12-12-skywalking-service-mesh-ready.md b/docs/blog/2018-12-12-skywalking-service-mesh-ready.md new file mode 100644 index 000..4b99e76 --- /dev/null +++ b/docs/blog/2018-12-12-skywalking-service-mesh-ready.md @@ -0,0 +1,113 @@ +# SkyWalking v6 is Service Mesh ready + +- Auther: Wu Sheng, tetrate +- Original link, [Tetrate.io blog](https://www.tetrate.io/blog/apache-skywalking-v6/) +- Dec. 5th, 2018 + +# Context +The integration of SkyWalking and Istio Service Mesh yields an essential open-source tool for resolving the chaos created by the proliferation of siloed, cloud-based services. + +Apache SkyWalking is an open, modern performance management tool for distributed services, designed especially for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures. We at Tetrate believe it is going to be an important project for understanding the performance of microservices. The recently released v6 integrates with Istio Service Mesh and focuses on metrics and tracing. It natively understands the most common language runtimes (Java, .Net, and NodeJS). [...] + +SkyWalking has evolved into an Observability Analysis Platform that enables observation and monitoring of hundreds of services all at once. It promises solutions for some of the trickiest problems faced by system administrators using complex arrays of abundant services: Identifying why and where a request is slow, distinguishing normal from deviant system performance, comparing apples-to-apples metrics across apps regardless of programming language, and attaining a complete and meaningfu [...] + +https://skywalkingtest.github.io/page-resources/6-alpha-overview.png"/> + +# SkyWalking History +Launched in China by Wu Sheng in 2015, SkyWalking started as just a distributed tracing system, like Zipkin, but with auto instrumentation from a Java agent. This enabled JVM users to see distributed traces without any change to their source code. In the last two years, it has been used for research and production by more than [50 companies] (https://github.com/apache/incubator-skywalking/blob/master/docs/powered-by.md). With its expanded capabilities, we expect to see it adopted more globally. + + +# What's new +## Service Mesh Integration +Istio has picked up a lot of steam as the framework of choice for distributed services. Based on all the interest in the Istio project, and community feedback, some SkyWalking (P)PMC members decided to integrate with Istio Service Mesh to move SkyWalking to a higher level. + +So now you can use Skywalking to get metrics and understand the topology of your applications. This works not just for Java, .NET and Node using our language agents, but also for microservices running under the Istio service mesh. You can get a full topology of both kinds of applications. + +https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Topology.png"/> + +## Observability analysis platform +With its roots in tracing, SkyWalking is now transitioning into an open-standards based **Observability Analysis Platform**, which means the following: + +* It can accept different kinds and formats of telemetry data from mesh like Istio telemetry. +* Its agents support various popular software technologies and frameworks like Tomcat, Spring, Kafka. The whole supported framework list is [here](https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/service-agent/java-agent/Supported-list.md). +* It can accept data from other compliant sources like Zipkin-formatted traces reported from Zipkin, Jaeger, or OpenCensus clients. + + +https://skywalkingtest.github.io/page-resources/6-alpha-overview.png"/> + +SkyWalking is logically split into four parts: Probes, Platform Backend, Storage and UI: + +There are two kinds of **probes**: +* Language agents or SDKs following SkyWalking across-thread propagation formats and trace formats, run in the user’s application process. +* The Istio mixer adaptor, which collects telemetry from the Service Mesh. + +The platform **backend** provides gRPC and RESTful HTTP endpoints for all SkyWalking-supported trace and metric telemetry data. For example, you can stream these metrics into an analysis system. + +**Storage** supports multiple implementations such as ElasticSearch, H2 (alpha), MySQL, and Apache ShardingSphere for MySQL Cluster. TiDB will be supported in next release. + +SkyW
[GitHub] AloneJiang opened a new issue #208: open skywalking website 404
AloneJiang opened a new issue #208: open skywalking website 404 URL: https://github.com/apache/incubator-skywalking-ui/issues/208 version:5.0.0-GA,Pictured: ![qq 20181213083804](https://user-images.githubusercontent.com/2296441/49907744-80014200-feb2-11e8-887c-9307e221dd7e.png) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #208: open skywalking website 404
wu-sheng commented on issue #208: open skywalking website 404 URL: https://github.com/apache/incubator-skywalking-ui/issues/208#issuecomment-446801060 @TinyAllen When you have time, help on fix this? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coki230 commented on issue #2037: 少包
coki230 commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446802779 I follow document https://github.com/apache/incubator-skywalking/blob/master/docs/en/guides/How-to-build.md. and download the source form http://mirrors.hust.edu.cn/apache/incubator/skywalking/6.0.0-alpha/apache-skywalking-apm-incubating-6.0.0-alpha-src.tgz but i can't find the packege of "org.apache.skywalking.apm.network.language" and "org.apache.skywalking.oap.server.core.remote.grpc", please check it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng edited a comment on issue #2037: 少包
wu-sheng edited a comment on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446803343 This image have been checked by PPMC, committer and Apache team before we do the release. So it can't miss any package from my understanding. These packages will be placed in generated folders after you run`./mvnw compile`. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2037: 少包
wu-sheng commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446803343 This image have been checked by PPMC, committer and Apache team before we do the release. So it can't miss any package from my understanding. These package will be placed in generated folders after you run`./mvnw compile`. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2037: 少包
wu-sheng commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446803610 See `Setup your IntelliJ IDEA` section, you will find the introductions. And at the same time, `./mvnw compile` or `./mvnw package` requires nothing to do. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coki230 commented on issue #2037: 少包
coki230 commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446809375 thank you. i will try. you gets up earlier today, and have a nice day. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2037: 少包
wu-sheng commented on issue #2037: 少包 URL: https://github.com/apache/incubator-skywalking/issues/2037#issuecomment-446809714 > thank you. i will try. you gets up earlier today, and have a nice day. Actually, I am at Seattle, so, just regular work time. Have a good day, too. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] xiaoni157 commented on issue #2038: Connection es failed NoNodeAvailableException
xiaoni157 commented on issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038#issuecomment-446821316 Oh, i found this error in the skywalking-collector-server.log ![error](https://user-images.githubusercontent.com/24448049/49911328-f60ca580-fec0-11e8-9189-41e9050a3d3a.jpeg) I see these two problems #1395 and #1944 .Does this mean that skywalking5.0.0-ga does not support xpack parameter configuration and can only modify the code This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng commented on issue #2038: Connection es failed NoNodeAvailableException
peng-yongsheng commented on issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038#issuecomment-446824775 @wu-sheng 5.x is transport client, default is 9300 port, not 9200, 6.x is rest client, default is 9200. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng commented on issue #2038: Connection es failed NoNodeAvailableException
peng-yongsheng commented on issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038#issuecomment-446825622 @xiaoni157 From you logs, I see a missing authentication exception. Our elasticsearch client not support authentication. This is a feature of XPack and XPack is not opensource license. So, you must change the dependency of the elasticsearch client from transport to XPack and setting the username and password by XPack client by yourself. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] xiaoni157 commented on issue #2038: Connection es failed NoNodeAvailableException
xiaoni157 commented on issue #2038: Connection es failed NoNodeAvailableException URL: https://github.com/apache/incubator-skywalking/issues/2038#issuecomment-446829228 ok, i see. thank you. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng opened a new issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families.
peng-yongsheng opened a new issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families. URL: https://github.com/apache/incubator-skywalking/issues/2039 Please answer these questions before submitting your issue. - Why do you submit this issue? - [ ] Question or discussion - [ ] Bug - [ ] Requirement - [X] Feature or performance improvement ___ ### Requirement or improvement - Please describe about your requirements or improvement suggestions. ### Reason From our community, I seen different users prefer different Elasticsearch version. The demand for 5.x and 6.x is the greatest. But the startup mechanism of the storage plugin is not by independent class loader. So, we can't put the multiple Elasticsearch client version into single release package. ### Solution I think we can develop a rest client by ourself base on the docs provided by Elasticsearch team. * [2.x](https://www.elastic.co/guide/en/elasticsearch/reference/2.4/index.html) * [5.x](https://www.elastic.co/guide/en/elasticsearch/reference/5.6/index.html) * [6.x](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html) By my experience, we just use a little client api. So, the workload is not too much and no need to worry about the compatibility of this new client. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng commented on issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families.
peng-yongsheng commented on issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families. URL: https://github.com/apache/incubator-skywalking/issues/2039#issuecomment-446832690 I will try to implement the authentication of the Elasticsearch. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families.
wu-sheng commented on issue #2039: [OAP Server][Storage] A new Elasticsearch client supports 2.x, 5.x and 6.x version families. URL: https://github.com/apache/incubator-skywalking/issues/2039#issuecomment-446836945 Good plan to do this. Try to implement a prototype version in GA version, and let's take at least 3-4 months to make sure it could work well in production env. Then mark it production ready and default storage client, in SkyWalking 6.2 or 6.3. If anything goes well. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] RyouZhang commented on issue #1706: Netty Client跨线程 ContextManager.continued出现空指针
RyouZhang commented on issue #1706: Netty Client跨线程 ContextManager.continued出现空指针 URL: https://github.com/apache/incubator-skywalking/issues/1706#issuecomment-446837381 > English only accepted here. so please replay this question This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1706: Netty Client跨线程 ContextManager.continued出现空指针
wu-sheng commented on issue #1706: Netty Client跨线程 ContextManager.continued出现空指针 URL: https://github.com/apache/incubator-skywalking/issues/1706#issuecomment-446838237 You should easy to find this reason by your self. `capture/continued` require running when active span exists, which in your case, clearly don't exist. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1708: Design for web performance's data structure.
wu-sheng commented on issue #1708: Design for web performance's data structure. URL: https://github.com/apache/incubator-skywalking/issues/1708#issuecomment-446839175 Any update for this? @kkroy-zs If still don't have an update in next two weeks, I will remove the milestone. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed issue #1791: NullPointException
wu-sheng closed issue #1791: NullPointException URL: https://github.com/apache/incubator-skywalking/issues/1791 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #1791: NullPointException
wu-sheng commented on issue #1791: NullPointException URL: https://github.com/apache/incubator-skywalking/issues/1791#issuecomment-446852356 No update in a whole month. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ASCE1885 opened a new pull request #2040: enabled log4j2 to print traceId both in sync and async mode
ASCE1885 opened a new pull request #2040: enabled log4j2 to print traceId both in sync and async mode URL: https://github.com/apache/incubator-skywalking/pull/2040 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [x] New feature provided - [ ] Improve performance - Related issues [Print traceId to log4j2 failed](https://github.com/apache/incubator-skywalking/issues/1997) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode
wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode URL: https://github.com/apache/incubator-skywalking/pull/2040#issuecomment-446861250 @candyleer Please review this PR. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode
wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode URL: https://github.com/apache/incubator-skywalking/pull/2040#issuecomment-446861368 Approve(not merge) this PR when you think it is ready. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode
wu-sheng commented on issue #2040: enabled log4j2 to print traceId both in sync and async mode URL: https://github.com/apache/incubator-skywalking/pull/2040#issuecomment-446866368 @ASCE1885 Before people begin to review, please fix your CI first. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services