提交 2dcf27b7 编写于 作者: kzd666's avatar kzd666 提交者: wu-sheng

Update all "incubator-skywalking" to "skywalking"...

Update all "incubator-skywalking" to "skywalking" ,"incubator-servicecomb-java-chassis" to "servicecomb-java-chassis" correctly, and ".gitmodules" will update at #2531 (#2548)
上级 4862c4fb
...@@ -70,7 +70,7 @@ Significantly cost less CPU in low payload.** ...@@ -70,7 +70,7 @@ Significantly cost less CPU in low payload.**
- CN documents removed, only consider to provide by volunteer out of Apache. - CN documents removed, only consider to provide by volunteer out of Apache.
All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/32?closed=1) All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/32?closed=1)
6.0.0-GA 6.0.0-GA
...@@ -111,7 +111,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw ...@@ -111,7 +111,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw
- User wall updated. - User wall updated.
- Fix a wrong description in `how-to-build` doc. - Fix a wrong description in `how-to-build` doc.
All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/30?closed=1) All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/30?closed=1)
6.0.0-beta 6.0.0-beta
------------------ ------------------
...@@ -170,7 +170,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw ...@@ -170,7 +170,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw
- Update user wall and powered-by page. - Update user wall and powered-by page.
- Add RocketBot UI project link in document. - Add RocketBot UI project link in document.
All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/31?closed=1) All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/31?closed=1)
6.0.0-alpha 6.0.0-alpha
------------------ ------------------
...@@ -187,8 +187,8 @@ provided in this release. ...@@ -187,8 +187,8 @@ provided in this release.
1. UI topology is better now. 1. UI topology is better now.
1. New alarm core provided. In alpha, only on service related metric. 1. New alarm core provided. In alpha, only on service related metric.
All issues and pull requests are [here](https://github.com/apache/incubator-skywalking/milestone/29?closed=1) All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/29?closed=1)
5.x releases 5.x releases
------------------ ------------------
You could find all CHANGES of 5.x at [here](https://github.com/apache/incubator-skywalking/blob/5.x/CHANGES.md) You could find all CHANGES of 5.x at [here](https://github.com/apache/skywalking/blob/5.x/CHANGES.md)
...@@ -6,12 +6,12 @@ Apache SkyWalking ...@@ -6,12 +6,12 @@ Apache SkyWalking
**SkyWalking**: an APM(application performance monitor) system, especially designed for **SkyWalking**: an APM(application performance monitor) system, especially designed for
microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures.
[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/incubator-skywalking) [![GitHub stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
[![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking) [![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.skywalking/apache-skywalking-apm-incubating.svg)](http://skywalking.apache.org/downloads/) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.skywalking/apache-skywalking-apm-incubating.svg)](http://skywalking.apache.org/downloads/)
[![Build Status](https://travis-ci.org/apache/skywalking.svg?branch=master)](https://travis-ci.org/apache/incubator-skywalking) [![Build Status](https://travis-ci.org/apache/skywalking.svg?branch=master)](https://travis-ci.org/apache/skywalking)
# Abstract # Abstract
**SkyWalking** is an open source APM system, including monitoring, tracing, diagnosing capabilities for distributed system **SkyWalking** is an open source APM system, including monitoring, tracing, diagnosing capabilities for distributed system
...@@ -81,7 +81,7 @@ Please follow the [REPORTING GUIDELINES](CODE_OF_CONDUCT.md#reporting-guidelines ...@@ -81,7 +81,7 @@ Please follow the [REPORTING GUIDELINES](CODE_OF_CONDUCT.md#reporting-guidelines
Follow this [document](docs/en/guides/How-to-build.md). Follow this [document](docs/en/guides/How-to-build.md).
# Contact Us # Contact Us
* Submit an [issue](https://github.com/apache/incubator-skywalking/issues) * Submit an [issue](https://github.com/apache/skywalking/issues)
* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list. * Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
* Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk) * Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk)
* QQ Group: 392443393 * QQ Group: 392443393
......
...@@ -20,16 +20,16 @@ Getting Started ...@@ -20,16 +20,16 @@ Getting Started
To help you get started, try the following links: To help you get started, try the following links:
Getting Started Getting Started
https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/README.md https://github.com/apache/skywalking/blob/master/docs/en/setup/README.md
Building Building
https://github.com/apache/incubator-skywalking/blob/master/docs/en/guides/How-to-build.md https://github.com/apache/skywalking/blob/master/docs/en/guides/How-to-build.md
We welcome contributions of all kinds, for details of how you can help We welcome contributions of all kinds, for details of how you can help
https://github.com/apache/incubator-skywalking/blob/master/CONTRIBUTING.md https://github.com/apache/skywalking/blob/master/CONTRIBUTING.md
Find the issue tracker from here Find the issue tracker from here
https://github.com/apache/incubator-skywalking/issues https://github.com/apache/skywalking/issues
Please help us make Apache SkyWalking better - we appreciate any feedback Please help us make Apache SkyWalking better - we appreciate any feedback
you may have. you may have.
......
...@@ -53,7 +53,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround ...@@ -53,7 +53,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround
Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG);
/** /**
* Spring MVC plugin do nothing if current request is forward request. * Spring MVC plugin do nothing if current request is forward request.
* Ref: https://github.com/apache/incubator-skywalking/pull/1325 * Ref: https://github.com/apache/skywalking/pull/1325
*/ */
if (forwardRequestFlag != null && forwardRequestFlag) { if (forwardRequestFlag != null && forwardRequestFlag) {
return; return;
...@@ -96,7 +96,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround ...@@ -96,7 +96,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround
Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG);
/** /**
* Spring MVC plugin do nothing if current request is forward request. * Spring MVC plugin do nothing if current request is forward request.
* Ref: https://github.com/apache/incubator-skywalking/pull/1325 * Ref: https://github.com/apache/skywalking/pull/1325
*/ */
if (forwardRequestFlag != null && forwardRequestFlag) { if (forwardRequestFlag != null && forwardRequestFlag) {
return ret; return ret;
......
...@@ -48,7 +48,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround ...@@ -48,7 +48,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround
Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG);
/** /**
* Spring MVC plugin do nothing if current request is forward request. * Spring MVC plugin do nothing if current request is forward request.
* Ref: https://github.com/apache/incubator-skywalking/pull/1325 * Ref: https://github.com/apache/skywalking/pull/1325
*/ */
if (forwardRequestFlag != null && forwardRequestFlag) { if (forwardRequestFlag != null && forwardRequestFlag) {
return; return;
...@@ -85,7 +85,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround ...@@ -85,7 +85,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround
Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG);
/** /**
* Spring MVC plugin do nothing if current request is forward request. * Spring MVC plugin do nothing if current request is forward request.
* Ref: https://github.com/apache/incubator-skywalking/pull/1325 * Ref: https://github.com/apache/skywalking/pull/1325
*/ */
if (forwardRequestFlag != null && forwardRequestFlag) { if (forwardRequestFlag != null && forwardRequestFlag) {
return ret; return ret;
......
...@@ -19,7 +19,7 @@ In addition, you might find these links interesting: ...@@ -19,7 +19,7 @@ In addition, you might find these links interesting:
- The latest and old releases are all available at [Apache SkyWalking release page](http://skywalking.apache.org/downloads/). The change logs are [here](../CHANGES.md). - The latest and old releases are all available at [Apache SkyWalking release page](http://skywalking.apache.org/downloads/). The change logs are [here](../CHANGES.md).
- You can find the speaking schedules at Conf, online videos and articles about SkyWalking in [Community resource catalog](https://github.com/OpenSkywalking/Community). - You can find the speaking schedules at Conf, online videos and articles about SkyWalking in [Community resource catalog](https://github.com/OpenSkywalking/Community).
Also, if you have some related to us, welcome to submit a pull request to add. Also, if you have some related to us, welcome to submit a pull request to add.
- We’re always looking for help improving our documentation and codes, so please don’t hesitate to [file an issue](https://github.com/apache/incubator-skywalking/issues/new) - We’re always looking for help improving our documentation and codes, so please don’t hesitate to [file an issue](https://github.com/apache/skywalking/issues/new)
if you see some problem. if you see some problem.
Or better yet, submit your own contributions through pull request to help make them better. Or better yet, submit your own contributions through pull request to help make them better.
......
### Problem ### Problem
- In maven build, the protoc-plugin occurs error: - In maven build, the protoc-plugin occurs error:
``` ```
[ERROR] Failed to execute goal org.xolstice.maven.plugins:protobuf-maven-plugin:0.5.0:compile-custom (default) on project apm-network: Unable to copy the file to \incubator-skywalking\apm-network\target\protoc-plugins: \incubator-skywalking\apm-network\target\protoc-plugins\protoc-3.3.0-linux-x86_64.exe (The process cannot access the file because it is being used by another process) -> [Help 1] [ERROR] Failed to execute goal org.xolstice.maven.plugins:protobuf-maven-plugin:0.5.0:compile-custom (default) on project apm-network: Unable to copy the file to \skywalking\apm-network\target\protoc-plugins: \skywalking\apm-network\target\protoc-plugins\protoc-3.3.0-linux-x86_64.exe (The process cannot access the file because it is being used by another process) -> [Help 1]
``` ```
### Reason ### Reason
......
...@@ -6,8 +6,8 @@ This document helps people to compile and build the project in your maven and se ...@@ -6,8 +6,8 @@ This document helps people to compile and build the project in your maven and se
### Build from GitHub ### Build from GitHub
1. Prepare git, JDK8 and maven3 1. Prepare git, JDK8 and maven3
1. `git clone https://github.com/apache/incubator-skywalking.git` 1. `git clone https://github.com/apache/skywalking.git`
1. `cd incubator-skywalking/` 1. `cd skywalking/`
1. Switch to the tag by using `git checkout [tagname]` (Optional, switch if want to build a release from source codes) 1. Switch to the tag by using `git checkout [tagname]` (Optional, switch if want to build a release from source codes)
1. `git submodule init` 1. `git submodule init`
1. `git submodule update` 1. `git submodule update`
...@@ -48,7 +48,7 @@ If you just want to recompile part of the project, you have following options ...@@ -48,7 +48,7 @@ If you just want to recompile part of the project, you have following options
## Setup your Eclipse IDE ## Setup your Eclipse IDE
1. Import the project as a maven project 1. Import the project as a maven project
2. For supporting multiple source directories, you need to add the following configuration in `incubator-skywalking/pom.xml` file: 2. For supporting multiple source directories, you need to add the following configuration in `skywalking/pom.xml` file:
``` ```
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
......
...@@ -5,10 +5,10 @@ There are many ways that you can help the SkyWalking community. ...@@ -5,10 +5,10 @@ There are many ways that you can help the SkyWalking community.
- Download our [releases](http://skywalking.apache.org/downloads/), try to monitor your applications, and feedback to us about - Download our [releases](http://skywalking.apache.org/downloads/), try to monitor your applications, and feedback to us about
what you think. what you think.
- Read our source codes, Ask questions for details. - Read our source codes, Ask questions for details.
- Find some bugs, [submit issue](https://github.com/apache/incubator-skywalking/issues), and try to fix it. - Find some bugs, [submit issue](https://github.com/apache/skywalking/issues), and try to fix it.
- Find [help wanted issues](https://github.com/apache/incubator-skywalking/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22), - Find [help wanted issues](https://github.com/apache/skywalking/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22),
which are good for you to start. which are good for you to start.
- Submit issue or start discussion through [GitHub issue](https://github.com/apache/incubator-skywalking/issues/new). - Submit issue or start discussion through [GitHub issue](https://github.com/apache/skywalking/issues/new).
- See all mail list discussion through [website list review](https://lists.apache.org/list.html?dev@skywalking.apache.org). - See all mail list discussion through [website list review](https://lists.apache.org/list.html?dev@skywalking.apache.org).
If you are a SkyWalking committer, could login and use the mail list in browser mode. Otherwise, If you are a SkyWalking committer, could login and use the mail list in browser mode. Otherwise,
follow the next step to subscribe. follow the next step to subscribe.
...@@ -18,7 +18,7 @@ Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the ...@@ -18,7 +18,7 @@ Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the
## Contact Us ## Contact Us
All the following channels are open to the community, you could choose the way you like. All the following channels are open to the community, you could choose the way you like.
* Submit an [issue](https://github.com/apache/incubator-skywalking/issues) * Submit an [issue](https://github.com/apache/skywalking/issues)
* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list. * Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
* [Gitter](https://gitter.im/openskywalking/Lobby) * [Gitter](https://gitter.im/openskywalking/Lobby)
* QQ Group: 392443393 * QQ Group: 392443393
...@@ -52,7 +52,7 @@ Our UI is constituted by static pages and web container. ...@@ -52,7 +52,7 @@ Our UI is constituted by static pages and web container.
It is built with vue + typescript. You could know more at the rocketbot repository. It is built with vue + typescript. You could know more at the rocketbot repository.
- **Web container** source codes are in `apm-webapp` module. This is a just an easy zuul proxy to host - **Web container** source codes are in `apm-webapp` module. This is a just an easy zuul proxy to host
static resources and send GraphQL query requests to backend. static resources and send GraphQL query requests to backend.
- [Legacy UI repository](https://github.com/apache/incubator-skywalking-ui) is still there, but not included - [Legacy UI repository](https://github.com/apache/skywalking-ui) is still there, but not included
in SkyWalking release, after 6.0.0-GA. in SkyWalking release, after 6.0.0-GA.
## For release ## For release
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
## Abstract ## Abstract
Uplink the JVM metrics, including PermSize, HeapSize, CPU, Memory, etc., every second. Uplink the JVM metrics, including PermSize, HeapSize, CPU, Memory, etc., every second.
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/JVMMetricsService.proto) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/JVMMetricsService.proto)
\ No newline at end of file \ No newline at end of file
...@@ -11,11 +11,11 @@ uplink data to the SkyWalking backend. ...@@ -11,11 +11,11 @@ uplink data to the SkyWalking backend.
v1 v1
#### gRPC proto files #### gRPC proto files
[gRPC proto files](https://github.com/apache/incubator-skywalking-data-collect-protocol/tree/v2.0) [gRPC proto files](https://github.com/apache/skywalking-data-collect-protocol/tree/v2.0)
## Trace Segment Service ## Trace Segment Service
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/TraceSegmentService.proto) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/TraceSegmentService.proto)
- UniqueId represents segmentId and globalTraceId. It have 3 parts(Longs), 1) applicationInstanceId, 2) ThreadId, 3) Timestamp + 10000 + seq(seq is in [0, 100000) ) - UniqueId represents segmentId and globalTraceId. It have 3 parts(Longs), 1) applicationInstanceId, 2) ThreadId, 3) Timestamp + 10000 + seq(seq is in [0, 100000) )
- Span data please refs to [Plugin Development Guide](../guides/Java-Plugin-Development-Guide.md) - Span data please refs to [Plugin Development Guide](../guides/Java-Plugin-Development-Guide.md)
...@@ -121,7 +121,7 @@ Although there services are still supported at this moment, but it will keep in ...@@ -121,7 +121,7 @@ Although there services are still supported at this moment, but it will keep in
### Abstract ### Abstract
Register Application Code to the backend, and receive an integer represents the application. Register Application Code to the backend, and receive an integer represents the application.
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/ApplicationRegisterService.proto) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/ApplicationRegisterService.proto)
- applicationCode is the config in your `agent.config`. - applicationCode is the config in your `agent.config`.
- The return id is **ApplicationId** as the value in `KeyWithIntegerValue`, which will be used in further data uplink. - The return id is **ApplicationId** as the value in `KeyWithIntegerValue`, which will be used in further data uplink.
...@@ -130,7 +130,7 @@ Register Application Code to the backend, and receive an integer represents the ...@@ -130,7 +130,7 @@ Register Application Code to the backend, and receive an integer represents the
**Deprecated services** **Deprecated services**
### ~~Register Instance Service~~ ### ~~Register Instance Service~~
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L29) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L29)
- agentUUID generated by agent, should be unique. Stay same before reboot, at least. - agentUUID generated by agent, should be unique. Stay same before reboot, at least.
- **ApplicationInstanceId** will be used in further data uplink. - **ApplicationInstanceId** will be used in further data uplink.
...@@ -156,7 +156,7 @@ Output: ...@@ -156,7 +156,7 @@ Output:
``` ```
### ~~Heart beat service~~ ### ~~Heart beat service~~
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L32) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L32)
- Recommend to report heart beat every 20-60 seconds. - Recommend to report heart beat every 20-60 seconds.
- Java agent don't use this, because JVM metrics upstream replace the capabilities of this. - Java agent don't use this, because JVM metrics upstream replace the capabilities of this.
...@@ -176,7 +176,7 @@ Input: ...@@ -176,7 +176,7 @@ Input:
### Abstract ### Abstract
Replace the literal String service(operation) name by an id(integer) Replace the literal String service(operation) name by an id(integer)
[gRPC service define](.https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L70) [gRPC service define](.https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/DiscoveryService.proto#L70)
- Optional service, reduce the network cost but use more memory as a buffer mapping. - Optional service, reduce the network cost but use more memory as a buffer mapping.
...@@ -207,7 +207,7 @@ Output: ...@@ -207,7 +207,7 @@ Output:
### Abstract ### Abstract
Network Address includes all remove service address, includes ip, port, hostname, etc., which used in RPC framework, MQ, DB, etc. Network Address includes all remove service address, includes ip, port, hostname, etc., which used in RPC framework, MQ, DB, etc.
[gRPC service define](https://github.com/apache/incubator-skywalking-data-collect-protocol/blob/v2.0/NetworkAddressRegisterService.proto) [gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/NetworkAddressRegisterService.proto)
- Optional service, reduce the network cost but use more memory as a buffer mapping. - Optional service, reduce the network cost but use more memory as a buffer mapping.
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
Trace Data Protocol describes the data format between SkyWalking agent/sniffer and backend. Trace Data Protocol describes the data format between SkyWalking agent/sniffer and backend.
## Overview ## Overview
Trace data protocol is defined and provided in [gRPC format](https://github.com/apache/incubator-skywalking-data-collect-protocol). Trace data protocol is defined and provided in [gRPC format](https://github.com/apache/skywalking-data-collect-protocol).
For each agent/SDK, it needs to register service id and service instance id before reporting any kind of trace For each agent/SDK, it needs to register service id and service instance id before reporting any kind of trace
or metric data. or metric data.
### Step 1. Do register ### Step 1. Do register
[Register service](https://github.com/apache/incubator-skywalking-data-collect-protocol/tree/master/register/Register.proto) takes charge of [Register service](https://github.com/apache/skywalking-data-collect-protocol/tree/master/register/Register.proto) takes charge of
all register methods. At step 1, we need `doServiceRegister`, then `doServiceInstanceRegister`. all register methods. At step 1, we need `doServiceRegister`, then `doServiceInstanceRegister`.
1. First of all, do `doServiceRegister`, input is **serviceName**, which could be declared by any UTF-8 String. The return 1. First of all, do `doServiceRegister`, input is **serviceName**, which could be declared by any UTF-8 String. The return
......
# Deploy backend in kubernetes # Deploy backend in kubernetes
Follow instructions in the [deploying SkyWalking backend to Kubernetes cluster](https://github.com/apache/incubator-skywalking-kubernetes#deploy-skywalking-backend-to-kubernetes-cluster) Follow instructions in the [deploying SkyWalking backend to Kubernetes cluster](https://github.com/apache/skywalking-kubernetes#deploy-skywalking-backend-to-kubernetes-cluster)
to deploy oap and ui to a kubernetes cluster. to deploy oap and ui to a kubernetes cluster.
\ No newline at end of file
...@@ -38,4 +38,4 @@ Now, let's continue with the backend and UI setting documents. ...@@ -38,4 +38,4 @@ Now, let's continue with the backend and UI setting documents.
- [Backend setup document](backend-setup.md) - [Backend setup document](backend-setup.md)
- [UI setup document](ui-setup.md) - [UI setup document](ui-setup.md)
Also, we provide [k8s settings](https://github.com/apache/incubator-skywalking-kubernetes#deploy-skywalking-backend-to-kubernetes-cluster) for convenience. Also, we provide [k8s settings](https://github.com/apache/skywalking-kubernetes#deploy-skywalking-backend-to-kubernetes-cluster) for convenience.
...@@ -13,6 +13,6 @@ Follow the [deploying backend in kubernetes](../backend/backend-k8s.md) to insta ...@@ -13,6 +13,6 @@ Follow the [deploying backend in kubernetes](../backend/backend-k8s.md) to insta
## Setup Istio to send metrics to oap ## Setup Istio to send metrics to oap
Follow instructions in the [setup Istio to send metric to oap](https://github.com/apache/incubator-skywalking-kubernetes#setup-istio-to-send-metric-to-oap) Follow instructions in the [setup Istio to send metric to oap](https://github.com/apache/skywalking-kubernetes#setup-istio-to-send-metric-to-oap)
to setup Istio with oap. to setup Istio with oap.
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Here is an optional plugin `apm-customize-enhance-plugin` Here is an optional plugin `apm-customize-enhance-plugin`
## Introduce ## Introduce
SkyWalking has provided [Java agent plugin development guide](https://github.com/apache/incubator-skywalking/blob/master/docs/en/guides/Java-Plugin-Development-Guide.md) to help developers to build new plugin. SkyWalking has provided [Java agent plugin development guide](https://github.com/apache/skywalking/blob/master/docs/en/guides/Java-Plugin-Development-Guide.md) to help developers to build new plugin.
This plugin is not designed for replacement but for user convenience. The behaviour is very similar with [@Trace toolkit](Application-toolkit-trace.md), but without code change requirement, and more powerful, such as provide tag and log. This plugin is not designed for replacement but for user convenience. The behaviour is very similar with [@Trace toolkit](Application-toolkit-trace.md), but without code change requirement, and more powerful, such as provide tag and log.
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* [Apache Dubbo](https://github.com/apache/incubator-dubbo) 2.7.0 * [Apache Dubbo](https://github.com/apache/incubator-dubbo) 2.7.0
* [Motan](https://github.com/weibocom/motan) 0.2.x -> 1.1.0 * [Motan](https://github.com/weibocom/motan) 0.2.x -> 1.1.0
* [gRPC](https://github.com/grpc/grpc-java) 1.x * [gRPC](https://github.com/grpc/grpc-java) 1.x
* [Apache ServiceComb Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) 0.1 -> 0.5,1.0.x * [Apache ServiceComb Java Chassis](https://github.com/apache/servicecomb-java-chassis) 0.1 -> 0.5,1.0.x
* [SOFARPC](https://github.com/alipay/sofa-rpc) 5.4.0 * [SOFARPC](https://github.com/alipay/sofa-rpc) 5.4.0
* MQ * MQ
* [RocketMQ](https://github.com/apache/rocketmq) 4.x * [RocketMQ](https://github.com/apache/rocketmq) 4.x
......
...@@ -68,7 +68,7 @@ public class PropertyPlaceholderHelperTest { ...@@ -68,7 +68,7 @@ public class PropertyPlaceholderHelperTest {
@Test @Test
public void testDataType() { public void testDataType() {
//tests that do not use ${name} to set config. //tests that do not use ${name} to set config.
Assert.assertEquals("grpc.skywalking.incubator.apache.org", Assert.assertEquals("grpc.skywalking.apache.org",
yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("gRPCHost"), properties))); yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("gRPCHost"), properties)));
//tests that use ${REST_HOST:0.0.0.0} but not set REST_HOST in environmentVariables. //tests that use ${REST_HOST:0.0.0.0} but not set REST_HOST in environmentVariables.
......
...@@ -31,7 +31,7 @@ core: ...@@ -31,7 +31,7 @@ core:
restHost: ${REST_HOST:0.0.0.0} restHost: ${REST_HOST:0.0.0.0}
restPort: ${REST_PORT:12800} restPort: ${REST_PORT:12800}
restContextPath: ${REST_CONTEXT_PATH:/} restContextPath: ${REST_CONTEXT_PATH:/}
gRPCHost: grpc.skywalking.incubator.apache.org gRPCHost: grpc.skywalking.apache.org
gRPCPort: ${GRPC_PORT:11800} gRPCPort: ${GRPC_PORT:11800}
downsampling: downsampling:
- Hour - Hour
......
...@@ -43,7 +43,7 @@ PRODUCT_NAME=${PRODUCT_NAME}-${RELEASE_VERSION} ...@@ -43,7 +43,7 @@ PRODUCT_NAME=${PRODUCT_NAME}-${RELEASE_VERSION}
rm -rf ${PRODUCT_NAME} rm -rf ${PRODUCT_NAME}
mkdir ${PRODUCT_NAME} mkdir ${PRODUCT_NAME}
git clone https://github.com/apache/incubator-skywalking.git ./${PRODUCT_NAME} git clone https://github.com/apache/skywalking.git ./${PRODUCT_NAME}
cd ${PRODUCT_NAME} cd ${PRODUCT_NAME}
TAG_EXIST=`git tag -l ${TAG_NAME} | wc -l` TAG_EXIST=`git tag -l ${TAG_NAME} | wc -l`
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册