提交 14c4734f 编写于 作者: wu-sheng's avatar wu-sheng

Update more license.

上级 526c50d4
...@@ -18,7 +18,7 @@ Apache SkyWalking | [中文](README_ZH.md) ...@@ -18,7 +18,7 @@ Apache SkyWalking | [中文](README_ZH.md)
* Use **@Trace** annotation for any methods you want to trace. * Use **@Trace** annotation for any methods you want to trace.
* Integrate traceId into logs for log4j, log4j2 and logback. * Integrate traceId into logs for log4j, log4j2 and logback.
* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs.
* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui) * The UI released on [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
# Architecture # Architecture
* Architecture graph for 3.2.5+ * Architecture graph for 3.2.5+
......
...@@ -20,7 +20,7 @@ Apache SkyWalking | [English](README.md) ...@@ -20,7 +20,7 @@ Apache SkyWalking | [English](README.md)
* 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中 * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
* 纯Java后端Collector实现,提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 * 纯Java后端Collector实现,提供RESTful和gRPC接口。兼容接受其他语言探针发送数据
* [如何将探针的Metric和Trace数据上传到Collector?](/docs/cn/How-to-communicate-with-the-collector-CN.md) * [如何将探针的Metric和Trace数据上传到Collector?](/docs/cn/How-to-communicate-with-the-collector-CN.md)
* UI工程请查看 [skywalking-ui](https://github.com/OpenSkywalking/skywalking-ui) * UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
* 中文QQ群:392443393 * 中文QQ群:392443393
# Architecture # Architecture
......
#
# Copyright 2017, OpenSkywalking Organization All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Project repository: https://github.com/OpenSkywalking/skywalking
#
ComputingModule org.apache.skywalking.apm.collector.baseline.computing.ComputingModule
# #
# Copyright 2017, OpenSkywalking Organization All rights reserved. # Licensed to the Apache Software Foundation (ASF) under one or more
# # contributor license agreements. See the NOTICE file distributed with
# Licensed under the Apache License, Version 2.0 (the "License"); # this work for additional information regarding copyright ownership.
# you may not use this file except in compliance with the License. # The ASF licenses this file to You under the Apache License, Version 2.0
# You may obtain a copy of the License at # (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
...@@ -13,7 +14,6 @@ ...@@ -13,7 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# Project repository: https://github.com/OpenSkywalking/skywalking
# #
ComputingProvider org.apache.skywalking.collector.baseline.computing.provider.ComputingProvider
...@@ -16,59 +16,6 @@ ...@@ -16,59 +16,6 @@
# #
# #
#
# Copyright 2017, OpenSkywalking Organization All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Repositories: https://github.com/OpenSkywalking/skywalking
#
#
# Copyright 2017, Skywalking Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# /*
# * Copyright 2017, Skywalking Authors All rights reserved.
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# */
#
org.apache.skywalking.apm.agent.core.remote.TraceSegmentServiceClient org.apache.skywalking.apm.agent.core.remote.TraceSegmentServiceClient
org.apache.skywalking.apm.agent.core.context.ContextManager org.apache.skywalking.apm.agent.core.context.ContextManager
org.apache.skywalking.apm.agent.core.remote.CollectorDiscoveryService org.apache.skywalking.apm.agent.core.remote.CollectorDiscoveryService
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- Zookeeper 3.4.10 - Zookeeper 3.4.10
## 下载发布版本 ## 下载发布版本
- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases) - 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## 部署Elasticsearch ## 部署Elasticsearch
- 修改`elasticsearch.yml`文件 - 修改`elasticsearch.yml`文件
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- JDK8+ - JDK8+
## 下载发布版本 ## 下载发布版本
- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases) - 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## Quick Start ## Quick Start
Collector单机模拟启动简单,提供和集群模式相同的功能,单机模式下除端口被占用的情况下,直接启动即可。 Collector单机模拟启动简单,提供和集群模式相同的功能,单机模式下除端口被占用的情况下,直接启动即可。
......
- [下载Source code](https://github.com/OpenSkywalking/skywalking/releases)并解压,进入解压目录,执行以下命令: - [下载Source code](https://github.com/apache/incubator-skywalking/releases)并解压,进入解压目录,执行以下命令:
```shell ```shell
> docker-compose pull > docker-compose pull
......
## 下载skywalking探针发布版本 ## 下载skywalking探针发布版本
- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases) - 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## 部署探针 ## 部署探针
1. 拷贝skywalking-agent目录到所需位置,探针包含整个目录,请不要改变目录结构 1. 拷贝skywalking-agent目录到所需位置,探针包含整个目录,请不要改变目录结构
......
...@@ -33,7 +33,7 @@ JSON数组,数组的每个元素,为一个有效的gRPC服务地址。 ...@@ -33,7 +33,7 @@ JSON数组,数组的每个元素,为一个有效的gRPC服务地址。
gRPC服务 gRPC服务
### 协议内容 ### 协议内容
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/ApplicationRegisterService.proto https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/ApplicationRegisterService.proto
```proto ```proto
syntax = "proto3"; syntax = "proto3";
...@@ -71,7 +71,7 @@ message ApplicationMapping { ...@@ -71,7 +71,7 @@ message ApplicationMapping {
gRPC服务 gRPC服务
### 实例注册服务 ### 实例注册服务
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L11-L12 https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L11-L12
```proto ```proto
service InstanceDiscoveryService { service InstanceDiscoveryService {
rpc register (ApplicationInstance) returns (ApplicationInstanceMapping) { rpc register (ApplicationInstance) returns (ApplicationInstanceMapping) {
...@@ -102,7 +102,7 @@ message ApplicationInstanceMapping { ...@@ -102,7 +102,7 @@ message ApplicationInstanceMapping {
- 服务端返回应用实例id,applicationInstanceId 。后续上报服务使用实例id标识。 - 服务端返回应用实例id,applicationInstanceId 。后续上报服务使用实例id标识。
### 实例心跳服务 ### 实例心跳服务
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L14-L15 https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L14-L15
```proto ```proto
service InstanceDiscoveryService { service InstanceDiscoveryService {
rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) { rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) {
...@@ -118,7 +118,7 @@ message ApplicationInstanceHeartbeat { ...@@ -118,7 +118,7 @@ message ApplicationInstanceHeartbeat {
- 如一分钟内有segment数据上报,则可不必上报心跳。 - 如一分钟内有segment数据上报,则可不必上报心跳。
### 实例注册重连服务 ### 实例注册重连服务
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L17-L18 https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L17-L18
```proto ```proto
service InstanceDiscoveryService { service InstanceDiscoveryService {
rpc registerRecover (ApplicationInstanceRecover) returns (Downstream) { rpc registerRecover (ApplicationInstanceRecover) returns (Downstream) {
...@@ -142,7 +142,7 @@ message ApplicationInstanceRecover { ...@@ -142,7 +142,7 @@ message ApplicationInstanceRecover {
gRPC服务 gRPC服务
### 协议内容 ### 协议内容
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L53-L74 https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L53-L74
```proto ```proto
//discovery service for ServiceName by Network address or application code //discovery service for ServiceName by Network address or application code
service ServiceNameDiscoveryService { service ServiceNameDiscoveryService {
...@@ -179,7 +179,7 @@ message ServiceNameElement { ...@@ -179,7 +179,7 @@ message ServiceNameElement {
gRPC服务 gRPC服务
### 协议内容 ### 协议内容
https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/JVMMetricsService.proto https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/JVMMetricsService.proto
```proto ```proto
syntax = "proto3"; syntax = "proto3";
...@@ -342,11 +342,11 @@ message LogMessage { ...@@ -342,11 +342,11 @@ message LogMessage {
} }
``` ```
- UniqueId为segment或者globalTraceId的数字表示。由3个long组成,1)applicationInstanceId,2)当前线程id,3)当前时间戳*10000 + seq(0-10000自循环) - UniqueId为segment或者globalTraceId的数字表示。由3个long组成,1)applicationInstanceId,2)当前线程id,3)当前时间戳*10000 + seq(0-10000自循环)
- Span的数据,请参考[插件开发规范](https://github.com/OpenSkywalking/skywalking/wiki/Plugin-Development-Guide) - Span的数据,请参考[插件开发规范](https://github.com/apache/incubator-skywalking/wiki/Plugin-Development-Guide)
- 以下id和名称根据注册返回结果,优先上报id,无法获取id时,再上传name。参考之前的应用和服务注册章节。 - 以下id和名称根据注册返回结果,优先上报id,无法获取id时,再上传name。参考之前的应用和服务注册章节。
- operationNameId/operationName - operationNameId/operationName
- networkAddress/networkAddressId - networkAddress/networkAddressId
- entryServiceName/entryServiceId - entryServiceName/entryServiceId
- parentServiceName/parentServiceId - parentServiceName/parentServiceId
- peerId/peer - peerId/peer
- componentId为默认支持的插件id,非官方支持,需传输名称或修改服务端源代码。[官方组件列表](https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/java/org.apache.skywalking.apm/network/trace/component/ComponentsDefine.java) - componentId为默认支持的插件id,非官方支持,需传输名称或修改服务端源代码。[官方组件列表](https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/java/org.apache.skywalking.apm/network/trace/component/ComponentsDefine.java)
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
1. 部署 Collector 1. 部署 Collector
1. [单机模式](Deploy-collector-in-standalone-mode-CN.md) 1. [单机模式](Deploy-collector-in-standalone-mode-CN.md)
1. [集群模式](Deploy-collector-in-cluster-mode-CN.md) 1. [集群模式](Deploy-collector-in-cluster-mode-CN.md)
1. 部署 webui server, [doc](https://github.com/OpenSkywalking/skywalking-ui#quickstart) 1. 部署 webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. 部署 Java Agent,[doc](Deploy-skywalking-agent-CN.md) 1. 部署 Java Agent,[doc](Deploy-skywalking-agent-CN.md)
1. 重启并访问系统功能,查看UI即可。 1. 重启并访问系统功能,查看UI即可。
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- Zookeeper 3.4.10 - Zookeeper 3.4.10
## Download released version ## Download released version
- Go to [released page](https://github.com/OpenSkywalking/skywalking/releases) - Go to [released page](https://github.com/apache/incubator-skywalking/releases)
## Deploy Elasticsearch server ## Deploy Elasticsearch server
- Modify `elasticsearch.yml` - Modify `elasticsearch.yml`
......
...@@ -7,7 +7,7 @@ If you are using skywalking in a low throughputs monitoring scenario, and don't ...@@ -7,7 +7,7 @@ If you are using skywalking in a low throughputs monitoring scenario, and don't
* JDK 8+ * JDK 8+
## Download ## Download
* [Releases](https://github.com/OpenSkywalking/skywalking/releases) * [Releases](https://github.com/apache/incubator-skywalking/releases)
## Quick start ## Quick start
You can simplely tar/unzip and startup if ports 10800, 11800, 12800 are free. You can simplely tar/unzip and startup if ports 10800, 11800, 12800 are free.
......
- [Download source code](https://github.com/OpenSkywalking/skywalking/releases) and unzip source package. Execute following command under the unzipped directory. - [Download source code](https://github.com/apache/incubator-skywalking/releases) and unzip source package. Execute following command under the unzipped directory.
```shell ```shell
> docker-compose pull > docker-compose pull
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
1. Deploy Collector 1. Deploy Collector
1. [Standalone Mode](Deploy-collector-in-standalone-mode.md) 1. [Standalone Mode](Deploy-collector-in-standalone-mode.md)
1. [Cluster Mode](Deploy-collector-in-cluster-mode.md) 1. [Cluster Mode](Deploy-collector-in-cluster-mode.md)
1. Deploy webui server, [doc](https://github.com/OpenSkywalking/skywalking-ui#quickstart) 1. Deploy webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. Doploy Java Agent,[doc](Deploy-skywalking-agent.md) 1. Doploy Java Agent,[doc](Deploy-skywalking-agent.md)
1. Reboot your applications, and open UI. 1. Reboot your applications, and open UI.
\ No newline at end of file
...@@ -61,11 +61,11 @@ ...@@ -61,11 +61,11 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>apm</name> <name>apm</name>
<url>https://github.com/OpenSkywalking/skywalking</url> <url>https://github.com/apache/incubator-skywalking</url>
<issueManagement> <issueManagement>
<system>GitHub</system> <system>GitHub</system>
<url>https://github.com/OpenSkywalking/skywalking/issues</url> <url>https://github.com/apache/incubator-skywalking/issues</url>
</issueManagement> </issueManagement>
<ciManagement> <ciManagement>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册