From 2dcf27b79940d60a2e2f19cc7ba9eb9730a463a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E6=99=BA=E5=86=AC?= Date: Sun, 28 Apr 2019 15:47:14 +0800 Subject: [PATCH] Update all "incubator-skywalking" to "skywalking" ,"incubator-servicecomb-java-chassis" to "servicecomb-java-chassis" correctly, and ".gitmodules" will update at #2531 (#2548) --- CHANGES.md | 10 +++++----- README.md | 6 +++--- apm-dist/release-docs/README.txt | 8 ++++---- .../interceptor/AbstractMethodInterceptor.java | 4 ++-- .../webflux/v5/AbstractMethodInterceptor.java | 4 ++-- docs/README.md | 2 +- docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md | 2 +- docs/en/guides/How-to-build.md | 6 +++--- docs/en/guides/README.md | 10 +++++----- docs/en/protocols/JVM-Protocol.md | 2 +- docs/en/protocols/Trace-Data-Protocol-v1.md | 14 +++++++------- docs/en/protocols/Trace-Data-Protocol-v2.md | 4 ++-- docs/en/setup/backend/backend-k8s.md | 2 +- docs/en/setup/backend/backend-ui-setup.md | 2 +- docs/en/setup/istio/README.md | 2 +- .../java-agent/Customize-enhance-trace.md | 2 +- .../service-agent/java-agent/Supported-list.md | 2 +- .../util/PropertyPlaceholderHelperTest.java | 2 +- .../src/test/resources/application.yml | 2 +- tools/releasing/create_source_release.sh | 2 +- 20 files changed, 44 insertions(+), 44 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ca36a736d1..38d86fabe3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -70,7 +70,7 @@ Significantly cost less CPU in low payload.** - 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 @@ -111,7 +111,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw - User wall updated. - 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 ------------------ @@ -170,7 +170,7 @@ All issues and pull requests are [here](https://github.com/apache/incubator-skyw - 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) +All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/31?closed=1) 6.0.0-alpha ------------------ @@ -187,8 +187,8 @@ provided in this release. 1. UI topology is better now. 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 ------------------ -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) diff --git a/README.md b/README.md index 20d3162cde..1ec1df35fc 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Apache SkyWalking **SkyWalking**: an APM(application performance monitor) system, especially designed for 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) [![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 **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 Follow this [document](docs/en/guides/How-to-build.md). # 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. * Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk) * QQ Group: 392443393 diff --git a/apm-dist/release-docs/README.txt b/apm-dist/release-docs/README.txt index 0fc7799bc6..6366696495 100644 --- a/apm-dist/release-docs/README.txt +++ b/apm-dist/release-docs/README.txt @@ -20,16 +20,16 @@ Getting Started To help you get started, try the following links: 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 - 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 - 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 - https://github.com/apache/incubator-skywalking/issues + https://github.com/apache/skywalking/issues Please help us make Apache SkyWalking better - we appreciate any feedback you may have. diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java index 0561ff8474..5c82ae2606 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java @@ -53,7 +53,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * 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) { return; @@ -96,7 +96,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * 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) { return ret; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/AbstractMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/AbstractMethodInterceptor.java index 43baad9ed3..1efefc20c4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/AbstractMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/AbstractMethodInterceptor.java @@ -48,7 +48,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * 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) { return; @@ -85,7 +85,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * 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) { return ret; diff --git a/docs/README.md b/docs/README.md index e7a55b6813..a3575ff3c6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -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). - 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. -- 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. Or better yet, submit your own contributions through pull request to help make them better. diff --git a/docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md b/docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md index 9e10ea7d05..bbf12cd3b4 100644 --- a/docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md +++ b/docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md @@ -1,7 +1,7 @@ ### Problem - 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 diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md index 2a1b483f6d..8739de1077 100644 --- a/docs/en/guides/How-to-build.md +++ b/docs/en/guides/How-to-build.md @@ -6,8 +6,8 @@ This document helps people to compile and build the project in your maven and se ### Build from GitHub 1. Prepare git, JDK8 and maven3 -1. `git clone https://github.com/apache/incubator-skywalking.git` -1. `cd incubator-skywalking/` +1. `git clone https://github.com/apache/skywalking.git` +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. `git submodule init` 1. `git submodule update` @@ -48,7 +48,7 @@ If you just want to recompile part of the project, you have following options ## Setup your Eclipse IDE 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: ``` org.codehaus.mojo diff --git a/docs/en/guides/README.md b/docs/en/guides/README.md index 72d68fff1a..320545bfe3 100644 --- a/docs/en/guides/README.md +++ b/docs/en/guides/README.md @@ -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 what you think. - 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 [help wanted issues](https://github.com/apache/incubator-skywalking/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22), +- Find some bugs, [submit issue](https://github.com/apache/skywalking/issues), and try to fix it. +- 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. -- 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). If you are a SkyWalking committer, could login and use the mail list in browser mode. Otherwise, follow the next step to subscribe. @@ -18,7 +18,7 @@ Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the ## Contact Us 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. * [Gitter](https://gitter.im/openskywalking/Lobby) * QQ Group: 392443393 @@ -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. - **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. -- [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. ## For release diff --git a/docs/en/protocols/JVM-Protocol.md b/docs/en/protocols/JVM-Protocol.md index 3e0bc23a46..48a3063fb5 100644 --- a/docs/en/protocols/JVM-Protocol.md +++ b/docs/en/protocols/JVM-Protocol.md @@ -2,4 +2,4 @@ ## Abstract 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) \ No newline at end of file +[gRPC service define](https://github.com/apache/skywalking-data-collect-protocol/blob/v2.0/JVMMetricsService.proto) \ No newline at end of file diff --git a/docs/en/protocols/Trace-Data-Protocol-v1.md b/docs/en/protocols/Trace-Data-Protocol-v1.md index 43f6954f14..e6875122fa 100644 --- a/docs/en/protocols/Trace-Data-Protocol-v1.md +++ b/docs/en/protocols/Trace-Data-Protocol-v1.md @@ -11,11 +11,11 @@ uplink data to the SkyWalking backend. v1 #### 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 -[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) ) - 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 ### Abstract 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`. - 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 **Deprecated services** ### ~~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. - **ApplicationInstanceId** will be used in further data uplink. @@ -156,7 +156,7 @@ Output: ``` ### ~~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. - Java agent don't use this, because JVM metrics upstream replace the capabilities of this. @@ -176,7 +176,7 @@ Input: ### Abstract 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. @@ -207,7 +207,7 @@ Output： ### Abstract 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. diff --git a/docs/en/protocols/Trace-Data-Protocol-v2.md b/docs/en/protocols/Trace-Data-Protocol-v2.md index 62756058b0..b574c54d26 100644 --- a/docs/en/protocols/Trace-Data-Protocol-v2.md +++ b/docs/en/protocols/Trace-Data-Protocol-v2.md @@ -2,13 +2,13 @@ Trace Data Protocol describes the data format between SkyWalking agent/sniffer and backend. ## 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 or metric data. ### 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`. 1. First of all, do `doServiceRegister`, input is **serviceName**, which could be declared by any UTF-8 String. The return diff --git a/docs/en/setup/backend/backend-k8s.md b/docs/en/setup/backend/backend-k8s.md index f7a2b9f4e1..35f0b3837a 100644 --- a/docs/en/setup/backend/backend-k8s.md +++ b/docs/en/setup/backend/backend-k8s.md @@ -1,5 +1,5 @@ # 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. \ No newline at end of file diff --git a/docs/en/setup/backend/backend-ui-setup.md b/docs/en/setup/backend/backend-ui-setup.md index df3d5a19a0..7c2f8e5487 100644 --- a/docs/en/setup/backend/backend-ui-setup.md +++ b/docs/en/setup/backend/backend-ui-setup.md @@ -38,4 +38,4 @@ Now, let's continue with the backend and UI setting documents. - [Backend setup document](backend-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. diff --git a/docs/en/setup/istio/README.md b/docs/en/setup/istio/README.md index b9576aef60..6981caefed 100644 --- a/docs/en/setup/istio/README.md +++ b/docs/en/setup/istio/README.md @@ -13,6 +13,6 @@ Follow the [deploying backend in kubernetes](../backend/backend-k8s.md) to insta ## 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. \ No newline at end of file diff --git a/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md b/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md index 36cf31e891..4faf3d2b22 100644 --- a/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md +++ b/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md @@ -2,7 +2,7 @@ Here is an optional plugin `apm-customize-enhance-plugin` ## 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. diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md b/docs/en/setup/service-agent/java-agent/Supported-list.md index d8c01c0ac6..6621fbd941 100644 --- a/docs/en/setup/service-agent/java-agent/Supported-list.md +++ b/docs/en/setup/service-agent/java-agent/Supported-list.md @@ -31,7 +31,7 @@ * [Apache Dubbo](https://github.com/apache/incubator-dubbo) 2.7.0 * [Motan](https://github.com/weibocom/motan) 0.2.x -> 1.1.0 * [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 * MQ * [RocketMQ](https://github.com/apache/rocketmq) 4.x diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java index bd88be2d1a..53bcc55f1b 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java @@ -68,7 +68,7 @@ public class PropertyPlaceholderHelperTest { @Test public void testDataType() { //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))); //tests that use ${REST_HOST:0.0.0.0} but not set REST_HOST in environmentVariables. diff --git a/oap-server/server-library/library-util/src/test/resources/application.yml b/oap-server/server-library/library-util/src/test/resources/application.yml index aa1855a72e..96c0de81a7 100644 --- a/oap-server/server-library/library-util/src/test/resources/application.yml +++ b/oap-server/server-library/library-util/src/test/resources/application.yml @@ -31,7 +31,7 @@ core: restHost: ${REST_HOST:0.0.0.0} restPort: ${REST_PORT:12800} restContextPath: ${REST_CONTEXT_PATH:/} - gRPCHost: grpc.skywalking.incubator.apache.org + gRPCHost: grpc.skywalking.apache.org gRPCPort: ${GRPC_PORT:11800} downsampling: - Hour diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh index 00a94e7915..28cc967301 100755 --- a/tools/releasing/create_source_release.sh +++ b/tools/releasing/create_source_release.sh @@ -43,7 +43,7 @@ PRODUCT_NAME=${PRODUCT_NAME}-${RELEASE_VERSION} rm -rf ${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} TAG_EXIST=`git tag -l ${TAG_NAME} | wc -l` -- GitLab