[GitHub] hanahmily commented on a change in pull request #2237: Update docker-compose.yml
hanahmily commented on a change in pull request #2237: Update docker-compose.yml URL: https://github.com/apache/incubator-skywalking/pull/2237#discussion_r255400328 ## File path: docker/docker-compose.yml ## @@ -37,7 +37,7 @@ services: - 11800:11800 - 12800:12800 volumes: - - ./config:/apache-skywalking-apm-incubating/config:ro + - ./config:/skywalking/config:ro Review comment: should be `./config:/apache-skywalking-apm-incubating-bin/config:ro` according to [OAP Dockerfile](https://github.com/apache/incubator-skywalking/blob/master/docker/oap/Dockerfile) 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 #2237: Update docker-compose.yml
coveralls edited a comment on issue #2237: Update docker-compose.yml URL: https://github.com/apache/incubator-skywalking/pull/2237#issuecomment-462234461 [](https://coveralls.io/builds/21562684) Coverage increased (+0.002%) to 14.339% when pulling **d11253badb139979eeb697d2ace7e86a2022 on YoKv:patch-1** into **4b15c713b5a2bad607e0efeccc26f3ba3ee97fc6 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 commented on issue #2234: No trace been recorded in Dashboard
wu-sheng commented on issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234#issuecomment-462237141 Meanwhile, you could submit a new issue for `support resteasy`. Maybe others have interests to contribute 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] wu-sheng commented on issue #2234: No trace been recorded in Dashboard
wu-sheng commented on issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234#issuecomment-462236940 resteasy templete is not in our supported list yet. You could follow [develop guide](https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/service-agent/java-agent/README.md#plugin-development-guide) to build a new plugin, and contribute to us. Then you could dive in the trace. 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 #2234: No trace been recorded in Dashboard
wu-sheng closed issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234 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] sattishv commented on issue #2234: No trace been recorded in Dashboard
sattishv commented on issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234#issuecomment-462235772 Hi we are calling another remote REST API service. I believe they use resteasy template 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 #2237: Update docker-compose.yml
coveralls commented on issue #2237: Update docker-compose.yml URL: https://github.com/apache/incubator-skywalking/pull/2237#issuecomment-462234461 [](https://coveralls.io/builds/21562310) Coverage decreased (-0.004%) to 14.337% when pulling **9284ded8e78c19593d759ea2fb7033e145c547c8 on YoKv:patch-1** into **496bde92fb55407f545f34d444b9801f9f40fb2b 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 commented on issue #2234: No trace been recorded in Dashboard
wu-sheng commented on issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234#issuecomment-462233614 What do you have in this HTTP request? Calling another RPC or database? Please read https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/service-agent/java-agent/README.md#supported-middlewares-frameworks-and-libraries to find out whether your RPC framework or db driver is supported? If just Spring java bean, consider to use `Trace Spring beans` in [optional plugin](https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/service-agent/java-agent/README.md#optional-plugins) 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] sattishv commented on issue #2234: No trace been recorded in Dashboard
sattishv commented on issue #2234: No trace been recorded in Dashboard URL: https://github.com/apache/incubator-skywalking/issues/2234#issuecomment-462232672 Hi Wu, Thanks for the response. I could see few traces when i move ahead of time. But i am not able to drill down from the root transaction. It displays HTTP request took 1280 ms but not able to drill down from there. Have attached the snapshot. Is any config been not set in our agent Sattish.  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 #2236: Make sure all document images ref from our Apache website.
coveralls commented on issue #2236: Make sure all document images ref from our Apache website. URL: https://github.com/apache/incubator-skywalking/pull/2236#issuecomment-462232488 [](https://coveralls.io/builds/21562177) Coverage decreased (-0.004%) to 14.337% when pulling **d60da42d6d29a0e2fd41664cc213cfe2189bea9c on doc** into **496bde92fb55407f545f34d444b9801f9f40fb2b on 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
[incubator-skywalking] branch master updated: Make sure all document images ref from our Apache website. (#2236)
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 4b15c71 Make sure all document images ref from our Apache website. (#2236) 4b15c71 is described below commit 4b15c713b5a2bad607e0efeccc26f3ba3ee97fc6 Author: 吴晟 Wu Sheng AuthorDate: Mon Feb 11 14:52:52 2019 +0800 Make sure all document images ref from our Apache website. (#2236) * Make sure all document images ref from our Apache website. * Change the statement. --- README.md| 8 docs/Screenshots.md | 26 docs/en/guides/Java-Plugin-Development-Guide.md | 2 -- docs/en/setup/README.md | 12 +-- docs/en/setup/backend/backend-ui-setup.md| 2 +- docs/en/setup/service-agent/java-agent/README.md | 4 ++-- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 6114f87..747646c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Apache SkyWalking == -https://skywalkingtest.github.io/page-resources/logo/sw-big-dark-1200.png; alt="Sky Walking logo" height="90px" align="right" /> +http://skywalking.apache.org/assets/logo.svg; alt="Sky Walking logo" height="90px" align="right" /> **SkyWalking**: an APM(application performance monitor) system, especially designed for microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. @@ -30,7 +30,7 @@ The core features are following. - Alarm -https://skywalkingtest.github.io/page-resources/6-beta-overview.png"/> +http://skywalking.apache.org/assets/frame.jpeg"/> SkyWalking supports to collect telemetry (traces and metrics) data from multiple sources and multiple formats, @@ -64,9 +64,9 @@ Please report unacceptable behavior to d...@skywalking.apache.org . Observe on Istio -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Topology.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Topology.png"/> -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Topology.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Istio/Topology.png"/> More screenshots diff --git a/docs/Screenshots.md b/docs/Screenshots.md index 2ada58b..829c332 100644 --- a/docs/Screenshots.md +++ b/docs/Screenshots.md @@ -1,40 +1,40 @@ # Agent - Overview dashboard -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Dashboard.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Dashboard.png"/> - Discovery topological graph of application clusters automatically. -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Topology.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Topology.png"/> - Service overview -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/service.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/service.png"/> - Process(VM) metrics -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Service_instance_info.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Service_instance_info.png"/> - Endpoint metrics -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/endpoint.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/endpoint.png"/> - Trace -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/trace.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/trace.png"/> -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Trace-detail.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Trace-detail.png"/> - Alarm -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/service-alarm.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/service-alarm.png"/> # Istio - Overview dashboard -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Dashboard.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Istio/Dashboard.png"/> - Discovery topological graph of application clusters automatically. -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Topology.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Istio/Topology.png"/> - Service overview -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Service.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Istio/Service.png"/> - Service instance metrics -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/Service-instance-info.png"/> +http://skywalking.apache.org/screenshots/6.0.0-alpha/Istio/Service-instance-info.png"/> - Endpoint metrics -https://skywalkingtest.github.io/page-resources/6.0.0-alpha/Istio/endpoint.png"/>
[incubator-skywalking] branch doc deleted (was d60da42)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch doc in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git. was d60da42 Change the statement. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] wu-sheng merged pull request #2236: Make sure all document images ref from our Apache website.
wu-sheng merged pull request #2236: Make sure all document images ref from our Apache website. URL: https://github.com/apache/incubator-skywalking/pull/2236 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] YoKv opened a new pull request #2237: Update docker-compose.yml
YoKv opened a new pull request #2237: Update docker-compose.yml URL: https://github.com/apache/incubator-skywalking/pull/2237 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix ___ ### Bug fix - config folder error 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] branch doc updated: Change the statement.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch doc in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git The following commit(s) were added to refs/heads/doc by this push: new d60da42 Change the statement. d60da42 is described below commit d60da42d6d29a0e2fd41664cc213cfe2189bea9c Author: Wu Sheng AuthorDate: Mon Feb 11 14:19:19 2019 +0800 Change the statement. --- docs/en/setup/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/setup/README.md b/docs/en/setup/README.md index c0f3cd8..4fa79a5 100644 --- a/docs/en/setup/README.md +++ b/docs/en/setup/README.md @@ -12,8 +12,8 @@ Setup based on which kind of probes are you going to use. If you don't understan - [Java agent](service-agent/java-agent/README.md). Introduce how to install java agent to your service, without change any codes. -The following agents and SDKs are maintained by the 3rd-party. They are not part of Apache SkyWalking, but compatible -with the SkyWalking's formats and protocols. +The following agents and SDKs are compatible with the SkyWalking's formats and protocols, but maintained by the 3rd-party. +You could go to their project repositories to find out the releases and how to use them. - [SkyAPM .NET Core agent](https://github.com/SkyAPM/SkyAPM-dotnet). See .NET Core agent project document for more details. - [SkyAPM Node.js agent](https://github.com/SkyAPM/SkyAPM-nodejs). See Node.js server side agent project document for more details. - [SkyAPM PHP SDK](https://github.com/SkyAPM/SkyAPM-php-sdk). See PHP agent project document for more details.
[GitHub] wu-sheng opened a new pull request #2236: Make sure all document images ref from our Apache website.
wu-sheng opened a new pull request #2236: Make sure all document images ref from our Apache website. URL: https://github.com/apache/incubator-skywalking/pull/2236 CC @liuhaoyang @ascrutae @heyanlong 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 (f7109ae -> b3cece2)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git.
discard f7109ae Update asf-site
new b3cece2 Update asf-site
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f7109ae)
\
N -- N -- N refs/heads/asf-site (b3cece2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
404.html | 6 +++---
assets/js/{app.70109cbf.js => app.78f574c3.js} | 2 +-
blog/2018-05-24-skywalking-net.html| 4 ++--
blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++--
blog/2019-01-01-Understand-Trace.html | 4 ++--
blog/2019-01-25-mesh-loadtest.html | 4 ++--
blog/index.html| 4 ++--
doc-graph/communication-net.png| Bin 0 -> 134832 bytes
downloads/index.html | 4 ++--
events/index.html | 4 ++--
index.html | 4 ++--
screenshots/6.0.0-alpha/Dashboard.png | Bin 0 -> 163680 bytes
screenshots/6.0.0-alpha/Istio/Dashboard.png| Bin 0 -> 137679 bytes
.../6.0.0-alpha/Istio/Service-instance-info.png| Bin 0 -> 85755 bytes
screenshots/6.0.0-alpha/Istio/Service.png | Bin 0 -> 151883 bytes
screenshots/6.0.0-alpha/Istio/Topology.png | Bin 0 -> 204349 bytes
screenshots/6.0.0-alpha/Istio/endpoint.png | Bin 0 -> 77060 bytes
screenshots/6.0.0-alpha/Service-instance-info.png | Bin 0 -> 111451 bytes
screenshots/6.0.0-alpha/Service_instance_info.png | Bin 0 -> 162310 bytes
screenshots/6.0.0-alpha/Topology.png | Bin 0 -> 142783 bytes
screenshots/6.0.0-alpha/Trace-detail.png | Bin 0 -> 89149 bytes
screenshots/6.0.0-alpha/cluster_management.png | Bin 0 -> 156869 bytes
screenshots/6.0.0-alpha/endpoint.png | Bin 0 -> 382597 bytes
screenshots/6.0.0-alpha/service-alarm.png | Bin 0 -> 51608 bytes
screenshots/6.0.0-alpha/service.png| Bin 0 -> 128948 bytes
screenshots/6.0.0-alpha/trace.png | Bin 0 -> 373573 bytes
team/index.html| 4 ++--
zh/blog/2018-05-24-skywalking-net.html | 4 ++--
.../2018-12-18-Apache-SkyWalking-5-0-UserGuide.html| 4 ++--
.../2018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++--
zh/blog/2018-12-21-SkyWalking-source-code-read.html| 4 ++--
zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++--
zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++--
zh/blog/2019-01-03-monitor-microservice.html | 4 ++--
zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++--
zh/blog/2019-01-24-skywalking-remote-debug.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 ++--
42 files changed, 52 insertions(+), 52 deletions(-)
rename assets/js/{app.70109cbf.js => app.78f574c3.js} (84%)
create mode 100644 doc-graph/communication-net.png
create mode 100644 screenshots/6.0.0-alpha/Dashboard.png
create mode 100644 screenshots/6.0.0-alpha/Istio/Dashboard.png
create mode 100644 screenshots/6.0.0-alpha/Istio/Service-instance-info.png
create mode 100644 screenshots/6.0.0-alpha/Istio/Service.png
create mode 100644 screenshots/6.0.0-alpha/Istio/Topology.png
create mode 100644 screenshots/6.0.0-alpha/Istio/endpoint.png
create mode 100644 screenshots/6.0.0-alpha/Service-instance-info.png
create mode 100644 screenshots/6.0.0-alpha/Service_instance_info.png
create mode 100644 screenshots/6.0.0-alpha/Topology.png
create mode
[incubator-skywalking-website] branch master updated: Move images to Apache repo.
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-website.git The following commit(s) were added to refs/heads/master by this push: new 739a85c Move images to Apache repo. 739a85c is described below commit 739a85c5d4f123ee1b7eed6f7366457c64aa73fc Author: Wu Sheng AuthorDate: Mon Feb 11 13:38:42 2019 +0800 Move images to Apache repo. --- docs/.vuepress/public/doc-graph/communication-net.png | Bin 0 -> 134832 bytes .../public/screenshots/6.0.0-alpha/Dashboard.png | Bin 0 -> 163680 bytes .../public/screenshots/6.0.0-alpha/Istio/Dashboard.png | Bin 0 -> 137679 bytes .../6.0.0-alpha/Istio/Service-instance-info.png| Bin 0 -> 85755 bytes .../public/screenshots/6.0.0-alpha/Istio/Service.png | Bin 0 -> 151883 bytes .../public/screenshots/6.0.0-alpha/Istio/Topology.png | Bin 0 -> 204349 bytes .../public/screenshots/6.0.0-alpha/Istio/endpoint.png | Bin 0 -> 77060 bytes .../screenshots/6.0.0-alpha/Service-instance-info.png | Bin 0 -> 111451 bytes .../screenshots/6.0.0-alpha/Service_instance_info.png | Bin 0 -> 162310 bytes .../public/screenshots/6.0.0-alpha/Topology.png| Bin 0 -> 142783 bytes .../public/screenshots/6.0.0-alpha/Trace-detail.png| Bin 0 -> 89149 bytes .../screenshots/6.0.0-alpha/cluster_management.png | Bin 0 -> 156869 bytes .../public/screenshots/6.0.0-alpha/endpoint.png| Bin 0 -> 382597 bytes .../public/screenshots/6.0.0-alpha/service-alarm.png | Bin 0 -> 51608 bytes .../public/screenshots/6.0.0-alpha/service.png | Bin 0 -> 128948 bytes .../.vuepress/public/screenshots/6.0.0-alpha/trace.png | Bin 0 -> 373573 bytes 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/.vuepress/public/doc-graph/communication-net.png b/docs/.vuepress/public/doc-graph/communication-net.png new file mode 100644 index 000..3b9b8d4 Binary files /dev/null and b/docs/.vuepress/public/doc-graph/communication-net.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Dashboard.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Dashboard.png new file mode 100644 index 000..4461303 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Dashboard.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Dashboard.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Dashboard.png new file mode 100644 index 000..6b30dc1 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Dashboard.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service-instance-info.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service-instance-info.png new file mode 100644 index 000..943cd59 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service-instance-info.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service.png new file mode 100644 index 000..ef02f91 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Service.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Topology.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Topology.png new file mode 100644 index 000..b1d20b6 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/Topology.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/endpoint.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/endpoint.png new file mode 100644 index 000..c0faed4 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Istio/endpoint.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Service-instance-info.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Service-instance-info.png new file mode 100644 index 000..2cc827d Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Service-instance-info.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Service_instance_info.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Service_instance_info.png new file mode 100644 index 000..46a906a Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Service_instance_info.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Topology.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Topology.png new file mode 100644 index 000..7252b70 Binary files /dev/null and b/docs/.vuepress/public/screenshots/6.0.0-alpha/Topology.png differ diff --git a/docs/.vuepress/public/screenshots/6.0.0-alpha/Trace-detail.png b/docs/.vuepress/public/screenshots/6.0.0-alpha/Trace-detail.png new file mode 100644 index 000..f5248f7 Binary files /dev/null and
[GitHub] coveralls edited a comment on issue #2211: [WIP]Support Zookeeper plugin
coveralls edited a comment on issue #2211: [WIP]Support Zookeeper plugin URL: https://github.com/apache/incubator-skywalking/pull/2211#issuecomment-457813236 [](https://coveralls.io/builds/21560628) Coverage increased (+0.07%) to 14.411% when pulling **23374d833a4e32015c89ce7e856aff66b6801031 on zhaoyuguang:local_plugin_zookeeper** into **496bde92fb55407f545f34d444b9801f9f40fb2b 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
[incubator-skywalking] branch top-sql updated: Support different slow thresholds for different db types.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch top-sql
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/top-sql by this push:
new 4dd07b2 Support different slow thresholds for different db types.
4dd07b2 is described below
commit 4dd07b2ed735d9378db5449deb6366acaace4325
Author: Wu Sheng
AuthorDate: Sun Feb 10 23:58:03 2019 +0800
Support different slow thresholds for different db types.
---
docker/config/application.yml | 1 +
...eModuleConfig.java => DBLatencyThresholds.java} | 44 +-
.../trace/provider/TraceModuleProvider.java| 17 +++--
.../trace/provider/TraceServiceModuleConfig.java | 9 ++---
.../receiver/trace/provider/parser/SpanTags.java | 2 +
.../listener/endpoint/MultiScopesSpanListener.java | 20 +++---
.../src/main/assembly/application.yml | 1 +
.../src/main/resources/application.yml | 1 +
8 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/docker/config/application.yml b/docker/config/application.yml
index 1a13b4c..f9b645f 100644
--- a/docker/config/application.yml
+++ b/docker/config/application.yml
@@ -75,6 +75,7 @@ receiver-trace:
bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit
is MB
bufferFileCleanWhenRestart:
${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
sampleRate: ${SW_TRACE_SAMPLE_RATE:1} # The sample rate precision is
1/1. 1 means 100% sample in default.
+slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,redis:50} # The
slow database access thresholds. Unit ms.
receiver-jvm:
default:
service-mesh:
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
similarity index 50%
copy from
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java
copy to
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
index fec00e2..55aab89 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
@@ -18,26 +18,34 @@
package org.apache.skywalking.oap.server.receiver.trace.provider;
-import lombok.*;
-import org.apache.skywalking.oap.server.library.module.ModuleConfig;
+import java.util.*;
/**
- * @author peng-yongsheng
+ * @author wusheng
*/
-public class TraceServiceModuleConfig extends ModuleConfig {
-@Setter @Getter private String bufferPath;
-@Setter @Getter private int bufferOffsetMaxFileSize;
-@Setter @Getter private int bufferDataMaxFileSize;
-@Setter @Getter private boolean bufferFileCleanWhenRestart;
-/**
- * The sample rate precision is 1/1.
- * 1 means 100% sample in default.
- */
-@Setter @Getter private int sampleRate = 1;
+public class DBLatencyThresholds {
+private Map thresholds;
-/**
- * The threshold used to check the slow database access.
- * Unit, millisecond.
- */
-@Setter @Getter private int slowDBAccessThreshold = 200;
+DBLatencyThresholds(String config) {
+thresholds = new HashMap<>();
+String[] settings = config.split(",");
+for (String setting : settings) {
+String[] typeValue = setting.split(":");
+if (typeValue.length == 2) {
+thresholds.put(typeValue[0].toLowerCase(),
Integer.parseInt(typeValue[1]));
+}
+}
+if (thresholds.containsKey("default")) {
+thresholds.put("default", 1);
+}
+}
+
+public int getThreshold(String type) {
+type = type.toLowerCase();
+if (thresholds.containsKey(type)) {
+return thresholds.get(type);
+} else {
+return thresholds.get("default");
+}
+}
}
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java
index 65c9179..367702d 100644
---
[incubator-skywalking] branch top-sql updated: Finish the top n database statement persistent.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch top-sql
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/top-sql by this push:
new 4f2a82a Finish the top n database statement persistent.
4f2a82a is described below
commit 4f2a82acfafe85908c3144c80d7736c973e435cf
Author: Wu Sheng
AuthorDate: Sun Feb 10 22:27:39 2019 +0800
Finish the top n database statement persistent.
---
.../core/analysis/data/LimitedSizeDataCache.java | 12 ++-
.../analysis/data/LimitedSizeDataCollection.java | 1 +
.../oap/server/core/analysis/data/Window.java | 10 +
.../database/DatabaseStatementDispatcher.java | 1 +
.../manual/database/TopNDatabaseStatement.java | 5 +++--
.../server/core/analysis/worker/TopNWorker.java| 24 ++
.../server/core/source/DatabaseSlowStatement.java | 1 +
.../listener/endpoint/MultiScopesSpanListener.java | 5 -
8 files changed, 47 insertions(+), 12 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java
index d64d3e7..33cfe1d 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java
@@ -22,11 +22,13 @@ import org.apache.skywalking.oap.server.core.storage.*;
public class LimitedSizeDataCache
extends Window implements DataCache {
-private SWCollection lockedMergeDataCollection;
+private SWCollection limitedSizeDataCollection;
private final int limitSize;
public LimitedSizeDataCache(int limitSize) {
+super(false);
this.limitSize = limitSize;
+init();
}
@Override public SWCollection collectionInstance() {
@@ -34,16 +36,16 @@ public class LimitedSizeDataCache ex
}
public void add(STORAGE_DATA data) {
-lockedMergeDataCollection.put(data);
+limitedSizeDataCollection.put(data);
}
@Override public void writing() {
-lockedMergeDataCollection = getCurrentAndWriting();
+limitedSizeDataCollection = getCurrentAndWriting();
}
@Override public void finishWriting() {
-lockedMergeDataCollection.finishWriting();
-lockedMergeDataCollection = null;
+limitedSizeDataCollection.finishWriting();
+limitedSizeDataCollection = null;
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
index b330a4e..70b7966 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
@@ -104,6 +104,7 @@ public class LimitedSizeDataCollection collection() {
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java
index 6f9486d..ff2ca6d 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java
@@ -33,6 +33,16 @@ public abstract class Window {
private SWCollection windowDataB;
Window() {
+this(true);
+}
+
+Window(boolean autoInit) {
+if (autoInit) {
+init();
+}
+}
+
+protected void init() {
this.windowDataA = collectionInstance();
this.windowDataB = collectionInstance();
this.pointer = windowDataA;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
index a94d370..628751a 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
@@ -28,6 +28,7 @@ import
org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement;
public class DatabaseStatementDispatcher implements
SourceDispatcher {
@Override public
[incubator-skywalking] branch top-sql updated: Finish topN persistence codes. Not test yet. And query have not added.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch top-sql
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/top-sql by this push:
new e7e7bcb Finish topN persistence codes. Not test yet. And query have
not added.
e7e7bcb is described below
commit e7e7bcb4313017fe413833c0a94b157ff12e713e
Author: Wu Sheng
AuthorDate: Sun Feb 10 20:30:16 2019 +0800
Finish topN persistence codes. Not test yet. And query have not added.
---
.../server/core/analysis/DispatcherManager.java| 4 ++
.../database/DatabaseStatementDispatcher.java | 2 +-
.../manual/database/TopNDatabaseStatement.java | 4 +-
.../oap/server/core/analysis/topn/TopN.java| 6 +--
.../server/core/analysis/worker/TopNWorker.java| 11
.../server/core/source/DatabaseSlowStatement.java | 2 +-
.../trace/provider/TraceModuleProvider.java| 4 +-
.../trace/provider/TraceServiceModuleConfig.java | 6 +++
.../trace/provider/parser/SegmentParse.java| 17 +--
.../trace/provider/parser/SegmentParseV2.java | 15 --
.../SpanListenerFactory.java => SpanTags.java} | 11 ++--
.../parser/listener/SpanListenerFactory.java | 3 +-
.../listener/endpoint/MultiScopesSpanListener.java | 58 +-
.../listener/segment/SegmentSpanListener.java | 3 +-
.../service/ServiceMappingSpanListener.java| 3 +-
.../server/receiver/trace/mock/ServiceBMock.java | 3 +-
16 files changed, 98 insertions(+), 54 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
index 4697792..61602a6 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
@@ -47,6 +47,10 @@ public class DispatcherManager {
}
public void forward(Source source) {
+if (source == null) {
+return;
+}
+
for (SourceDispatcher dispatcher : dispatcherMap.get(source.scope())) {
dispatcher.dispatch(source);
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
index 8e8037e..a94d370 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java
@@ -29,7 +29,7 @@ public class DatabaseStatementDispatcher implements
SourceDispatcher map = new HashMap<>();
map.put(STATEMENT, storageData.getStatement());
map.put(TRACE_ID, storageData.getTraceId());
-map.put(DURATION, storageData.getDuration());
+map.put(LATENCY, storageData.getLatency());
map.put(DATABASE_SERVICE_ID, storageData.getDatabaseServiceId());
return map;
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
index 125ac71..1071203 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
@@ -30,15 +30,15 @@ import
org.apache.skywalking.oap.server.core.storage.annotation.Column;
*/
public abstract class TopN extends Record implements ComparableStorageData {
public static final String STATEMENT = "statement";
-public static final String DURATION = "duration";
+public static final String LATENCY = "latency";
public static final String TRACE_ID = "trace_id";
@Getter @Setter @Column(columnName = STATEMENT) private String statement;
-@Getter @Setter @Column(columnName = DURATION) private long duration;
+@Getter @Setter @Column(columnName = LATENCY) private long latency;
@Getter @Setter @Column(columnName = TRACE_ID) private String traceId;
@Override public int compareTo(Object o) {
TopN target = (TopN)o;
-return (int)(duration - target.duration);
+return (int)(latency - target.latency);
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNWorker.java
