You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/02/21 23:40:57 UTC
[skywalking] branch master updated: Fix spelling (#6418)
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/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 85fc4f8 Fix spelling (#6418)
85fc4f8 is described below
commit 85fc4f827c7b8ef32f17aefbecd202c01d9048e1
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Mon Feb 22 09:40:35 2021 +1000
Fix spelling (#6418)
---
.github/workflows/docker-ci.yaml | 2 +-
.github/workflows/e2e.compat.yaml | 4 ++--
.github/workflows/e2e.istio.yaml | 4 ++--
CHANGES.md | 2 +-
.../apm/plugin/finagle/ClientDestTracingFilterInterceptor.java | 2 +-
.../spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java | 2 +-
changes/changes-5.x.md | 4 ++--
changes/changes-8.0.0.md | 2 +-
docs/en/FAQ/maven-compile-npm-failure.md | 2 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 2 +-
docs/en/guides/README.md | 2 +-
docs/en/setup/backend/backend-fetcher.md | 2 +-
test/plugin/agent-test-tools/bin/fetch-code.sh | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
index 1080029..3cf37bd 100644
--- a/.github/workflows/docker-ci.yaml
+++ b/.github/workflows/docker-ci.yaml
@@ -64,7 +64,7 @@ jobs:
export TAG=${{ matrix.es }}
cd ${DOCKER_DIR} && docker-compose up -d
- - name: Check port avaliable
+ - name: Check port available
run: |
source ./test/scripts/env.sh
echo "Waiting for OAP ready"
diff --git a/.github/workflows/e2e.compat.yaml b/.github/workflows/e2e.compat.yaml
index e1b7362..0fa4a98 100644
--- a/.github/workflows/e2e.compat.yaml
+++ b/.github/workflows/e2e.compat.yaml
@@ -22,8 +22,8 @@ on:
- cron: '0 18 * * *'
jobs:
- Compatability:
- name: Compatability
+ Compatibility:
+ name: Compatibility
runs-on: ubuntu-latest
timeout-minutes: 30
env:
diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml
index c465c8e..3175eca 100644
--- a/.github/workflows/e2e.istio.yaml
+++ b/.github/workflows/e2e.istio.yaml
@@ -73,7 +73,7 @@ jobs:
if: env.SKIP_CI != 'true'
run: make docker
- - name: Prepare envrionment
+ - name: Prepare environment
if: env.SKIP_CI != 'true'
run: bash ${SCRIPTS_DIR}/pre.sh
@@ -203,7 +203,7 @@ jobs:
if: env.SKIP_CI != 'true'
run: make docker
- - name: Prepare envrionment
+ - name: Prepare environment
if: env.SKIP_CI != 'true'
run: bash ${SCRIPTS_DIR}/pre.sh
diff --git a/CHANGES.md b/CHANGES.md
index 61ee529..40f7c03 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,7 @@ Release Notes.
------------------
#### Project
* Update frontend-maven-plugin to 1.11.0, for Download node x64 binary on Apple Silicon.
-* Add E2E test for VM monitoring that metrics from Promethues node-exporter.
+* Add E2E test for VM monitoring that metrics from Prometheus node-exporter.
#### Java Agent
* Remove invalid mysql configuration in agent.config.
diff --git a/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/finagle/ClientDestTracingFilterInterceptor.java b/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/finagle/ClientDestTracingFilterInterceptor.java
index a343343..08ef8fa 100644
--- a/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/finagle/ClientDestTracingFilterInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/finagle/ClientDestTracingFilterInterceptor.java
@@ -33,7 +33,7 @@ import static org.apache.skywalking.apm.plugin.finagle.FinagleCtxs.getSpan;
/**
* When we create exitspan in ClientTracingFilter, we can't know the remote address because the ClientTracingFilter
* is above the loadbalancefilter in the rpc call stack. However by intercept the ClientDestTracingFilter, we can get
- * the remote adress and set it to exitspan and contextCarrier.
+ * the remote address and set it to exitspan and contextCarrier.
*/
public class ClientDestTracingFilterInterceptor extends AbstractInterceptor {
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java
index 1674c48..39a8978 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java
@@ -54,7 +54,7 @@ public class WebFluxWebClientInterceptor implements InstanceMethodsAroundInterce
final String remotePeer = getIPAndPort(uri);
AbstractSpan span = ContextManager.createExitSpan(operationName, contextCarrier, remotePeer);
- //set componet name
+ //set components name
span.setComponent(ComponentsDefine.SPRING_WEBCLIENT);
Tags.URL.set(span, uri.toString());
Tags.HTTP.METHOD.set(span, request.method().toString());
diff --git a/changes/changes-5.x.md b/changes/changes-5.x.md
index f675699..c9131a9 100644
--- a/changes/changes-5.x.md
+++ b/changes/changes-5.x.md
@@ -135,7 +135,7 @@
------------------
#### UI -> Collector GraphQL query protocol
- - Replace all tps to throughtput/cpm(calls per min)
+ - Replace all tps to throughput/cpm(calls per min)
- Add `getThermodynamic` service
- Update version to beta
@@ -157,7 +157,7 @@
- Support TLS.
- Support namespace.
- Support token auth.
- - Group and aggregate requests based on reponse time and timeline, support Thermodynamic chart query
+ - Group and aggregate requests based on response time and timeline, support Thermodynamic chart query
- Support component librariy setting through yml file for better extendibility.
- Optimize performance.
- Support short column name in ES or other storage implementor.
diff --git a/changes/changes-8.0.0.md b/changes/changes-8.0.0.md
index 68fbbb3..c2816a3 100644
--- a/changes/changes-8.0.0.md
+++ b/changes/changes-8.0.0.md
@@ -4,7 +4,7 @@
#### Project
* v3 protocol is added and implemented. All previous releases are incompatible with 8.x releases.
* Service, Instance, Endpoint register mechanism and inventory storage entities are removed.
-* New GraphQL query protocol is provided, the legacy procotol is still supported(plan to remove at the end of this year).
+* New GraphQL query protocol is provided, the legacy protocol is still supported(plan to remove at the end of this year).
* Support Prometheus network protocol. Metrics in Prometheus format could be transferred into SkyWalking.
* Python agent provided.
* All inventory caches have been removed.
diff --git a/docs/en/FAQ/maven-compile-npm-failure.md b/docs/en/FAQ/maven-compile-npm-failure.md
index b9194ba..d3d097c 100644
--- a/docs/en/FAQ/maven-compile-npm-failure.md
+++ b/docs/en/FAQ/maven-compile-npm-failure.md
@@ -1,5 +1,5 @@
### Problem： Maven compilation failure with error like `Error: not found: python2`
-When you compile the project via maven, it failed at module `apm-webapp` and the following error occured.
+When you compile the project via maven, it failed at module `apm-webapp` and the following error occurred.
Pay attention to key words such as `node-sass` and `Error: not found: python2`.
diff --git a/docs/en/guides/Java-Plugin-Development-Guide.md b/docs/en/guides/Java-Plugin-Development-Guide.md
index d6c27ed..325f9de 100644
--- a/docs/en/guides/Java-Plugin-Development-Guide.md
+++ b/docs/en/guides/Java-Plugin-Development-Guide.md
@@ -3,7 +3,7 @@ This document describe how to understand, develop and contribute plugin.
There are 2 kinds of plugin
1. [Tracing plugin](#tracing-plugin). Follow the distributed tracing concept to collect spans with tags and logs.
-1. [Meter plugin](#meter-plugin). Collect numeric metrics in Counter, Guage, and Histogram formats.
+1. [Meter plugin](#meter-plugin). Collect numeric metrics in Counter, Gauge, and Histogram formats.
We also provide the [plugin test tool](#plugin-test-tool) to verify the data collected and reported by the plugin. If you plan to contribute any plugin to our main repo, the data would be verified by this tool too.
diff --git a/docs/en/guides/README.md b/docs/en/guides/README.md
index 098b1e4..a08294f 100755
--- a/docs/en/guides/README.md
+++ b/docs/en/guides/README.md
@@ -150,7 +150,7 @@ miss any newly-added dependency:
## Profile
The performance profile is an enhancement feature in the APM system. We are using the thread dump to estimate the method execution time, rather than adding many local spans. In this way, the resource cost would be much less than using distributed tracing to locate slow method. This feature is suitable in the production environment. The following documents are important for developers to understand the key parts of this feature
-- [Profile data report procotol](https://github.com/apache/skywalking-data-collect-protocol/tree/master/profile) is provided like other trace, JVM data through gRPC.
+- [Profile data report protocol](https://github.com/apache/skywalking-data-collect-protocol/tree/master/profile) is provided like other trace, JVM data through gRPC.
- [Thread dump merging mechanism](backend-profile.md) introduces the merging mechanism, which helps the end users to understand the profile report.
- [Exporter tool of profile raw data](backend-profile-export.md) introduces when the visualization doesn't work well through the official UI, how to package the original profile data, which helps the users report the issue.
diff --git a/docs/en/setup/backend/backend-fetcher.md b/docs/en/setup/backend/backend-fetcher.md
index 10686c5..cce8c2b 100644
--- a/docs/en/setup/backend/backend-fetcher.md
+++ b/docs/en/setup/backend/backend-fetcher.md
@@ -4,7 +4,7 @@ read the data from the target systems. This mode is typically in some metrics SD
## Prometheus Fetcher
Suppose you want to enable some `metric-custom.yaml` files stored at `fetcher-prom-rules`, append its name to `enabledRules` of
- `promethues-fetcher` as below:
+ `prometheus-fetcher` as below:
```yaml
prometheus-fetcher:
diff --git a/test/plugin/agent-test-tools/bin/fetch-code.sh b/test/plugin/agent-test-tools/bin/fetch-code.sh
index b7e16f2..463e658 100644
--- a/test/plugin/agent-test-tools/bin/fetch-code.sh
+++ b/test/plugin/agent-test-tools/bin/fetch-code.sh
@@ -17,13 +17,13 @@
# limitations under the License.
WORK_DIRECTORY=$1
-RESPOSITORY=$2
+REPOSITORY=$2
COMMIT_ID=$3
DIST_DIRECTORY=$4
ROOT_DIR="$(cd "$(dirname $0)"; pwd)"
-git clone $RESPOSITORY $WORK_DIRECTORY
+git clone $REPOSITORY $WORK_DIRECTORY
cd $WORK_DIRECTORY