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 2019/04/14 02:32:55 UTC
[incubator-skywalking] branch master updated: Fix typo and grammar
error (#2483)
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 c27f36a Fix typo and grammar error (#2483)
c27f36a is described below
commit c27f36a3c009be4997bcc50051e15be61ee9f259
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sun Apr 14 10:32:50 2019 +0800
Fix typo and grammar error (#2483)
---
.../apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java | 4 ++--
docs/en/guides/Java-Plugin-Development-Guide.md | 6 +++---
docs/en/guides/storage-extention.md | 2 +-
.../Skywalking-Cross-Process-Propagation-Headers-Protocol-v2.md | 2 +-
docs/en/protocols/Trace-Data-Protocol-v2.md | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java
index 7ed28f8..70aadfb 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
*/
public abstract class AbstractMessageConsumeInterceptor implements InstanceMethodsAroundInterceptor {
- public static final String COMSUMER_OPERATION_NAME_PREFIX = "RocketMQ/";
+ public static final String CONSUMER_OPERATION_NAME_PREFIX = "RocketMQ/";
@Override
public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
@@ -50,7 +50,7 @@ public abstract class AbstractMessageConsumeInterceptor implements InstanceMetho
List<MessageExt> msgs = (List<MessageExt>)allArguments[0];
ContextCarrier contextCarrier = getContextCarrierFromMessage(msgs.get(0));
- AbstractSpan span = ContextManager.createEntrySpan(COMSUMER_OPERATION_NAME_PREFIX + msgs.get(0).getTopic() + "/Consumer", contextCarrier);
+ AbstractSpan span = ContextManager.createEntrySpan(CONSUMER_OPERATION_NAME_PREFIX + msgs.get(0).getTopic() + "/Consumer", contextCarrier);
span.setComponent(ComponentsDefine.ROCKET_MQ_CONSUMER);
SpanLayer.asMQ(span);
diff --git a/docs/en/guides/Java-Plugin-Development-Guide.md b/docs/en/guides/Java-Plugin-Development-Guide.md
index a8ca5b6..4d57a8b 100644
--- a/docs/en/guides/Java-Plugin-Development-Guide.md
+++ b/docs/en/guides/Java-Plugin-Development-Guide.md
@@ -221,13 +221,13 @@ ClassMatch represents how to match the target classes, there are 4 ways:
* byName, through the full class name(package name + `.` + class name)
* byClassAnnotationMatch, through the class existed certain annotations.
* byMethodAnnotationMatch, through the class's method existed certain annotations.
-* byHierarchyMatch, throught the class's parent classes or interfaces
+* byHierarchyMatch, through the class's parent classes or interfaces
**Attentions**:
* Forbid to use `*.class.getName()` to get the class String name. Recommend you to use literal String. This is for
avoiding ClassLoader issues.
* `by*AnnotationMatch` doesn't support the inherited annotations.
-* Don't recommend use `byHierarchyMatch`, unless it is really necessary. Because using it may trigger intercepting
+* Don't recommend to use `byHierarchyMatch`, unless it is really necessary. Because using it may trigger intercepting
many unexcepted methods, which causes performance issues and concerns.
Example：
@@ -322,5 +322,5 @@ Please follow there steps:
1. Develop and test.
1. Send the pull request and ask for review.
1. Provide the automatic test cases.
-1. The plugin committers approves your plugins after automatic test cases provided and the tests passed in our CI.
+1. The plugin committers approve your plugins after automatic test cases provided and the tests passed in our CI.
1. The plugin accepted by SkyWalking.
diff --git a/docs/en/guides/storage-extention.md b/docs/en/guides/storage-extention.md
index 3d8b56c..3fb76cf 100644
--- a/docs/en/guides/storage-extention.md
+++ b/docs/en/guides/storage-extention.md
@@ -38,4 +38,4 @@ or `org.apache.skywalking.oap.server.storage.plugin.jdbc.mysql.MySQLStorageProvi
## Redistribution with new storage implementation.
You don't have to clone the main repo just for implementing the storage. You could just easy depend our Apache releases.
-Take a look at [SkyAPM/SkyWalking-With-Es5x-Storage](https://github.com/SkyAPM/SkyWalking-With-Es5x-Storage) repo, SkyWalking v6 redistribution with ElasticSearch 5 TCP connection storage implemention.
+Take a look at [SkyAPM/SkyWalking-With-Es5x-Storage](https://github.com/SkyAPM/SkyWalking-With-Es5x-Storage) repo, SkyWalking v6 redistribution with ElasticSearch 5 TCP connection storage implementation.
diff --git a/docs/en/protocols/Skywalking-Cross-Process-Propagation-Headers-Protocol-v2.md b/docs/en/protocols/Skywalking-Cross-Process-Propagation-Headers-Protocol-v2.md
index 832b99d..74d64eb 100644
--- a/docs/en/protocols/Skywalking-Cross-Process-Propagation-Headers-Protocol-v2.md
+++ b/docs/en/protocols/Skywalking-Cross-Process-Propagation-Headers-Protocol-v2.md
@@ -9,7 +9,7 @@ of [v1(a.k.a. sw3)](Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md)
The major differences of v2 and v1, comes from SkyWalking's evolution, including
1. Mesh and languages are not same always, some info in headers should be optional.
1. BASE64 encoding required.
-1. Sampling flag is including.
+1. Sampling flag is included.
## Header Item
* Header Name: `sw6`
diff --git a/docs/en/protocols/Trace-Data-Protocol-v2.md b/docs/en/protocols/Trace-Data-Protocol-v2.md
index 6b2acc2..6275605 100644
--- a/docs/en/protocols/Trace-Data-Protocol-v2.md
+++ b/docs/en/protocols/Trace-Data-Protocol-v2.md
@@ -35,10 +35,10 @@ For trace format, there are some notices
* EntrySpan
EntrySpan represents a service provider, also the endpoint of server side. As an APM system, we are targeting the
-application servers. So almost all the services and MQ-comsumer are EntrySpan(s).
+application servers. So almost all the services and MQ-consumer are EntrySpan(s).
* LocalSpan
-LocalSpan represents a normal Java method, which don't relate with remote service, neither a MQ producer/comsumer
+LocalSpan represents a normal Java method, which don't relate with remote service, neither a MQ producer/consumer
nor a service(e.g. HTTP service) provider/consumer.
* ExitSpan