[incubator-skywalking] 01/01: Merge pull request #794 from carlvine500/master

2018-02-06 Thread wusheng 
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

commit 75be8c879f9948b2e2df16922fcae38e90c042fd
Merge: b00b588 efd27dd
Author: 吴晟 Wu Sheng 
AuthorDate: Wed Feb 7 12:38:07 2018 +0800

Merge pull request #794 from carlvine500/master

bugfix:no data collected after application started

 .../org/apache/skywalking/apm/agent/core/boot/ServiceManager.java  | 7 ---
 .../apm/agent/core/remote/CollectorDiscoveryService.java   | 6 --
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

[incubator-skywalking] branch master updated (b00b588 -> 75be8c8)

2018-02-06 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


from b00b588  Merge pull request #793 from ascrutae/feature/update-docs
 add 5c44dd9  bugfix:no data collected after application started 20+seconds
 add efd27dd  Merge branch 'master' into master
 new 75be8c8  Merge pull request #794 from carlvine500/master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/skywalking/apm/agent/core/boot/ServiceManager.java  | 7 ---
 .../apm/agent/core/remote/CollectorDiscoveryService.java   | 6 --
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

[incubator-skywalking] 01/01: Merge pull request #793 from ascrutae/feature/update-docs

2018-02-06 Thread wusheng 
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

commit b00b588cbf4e901cc7974b2da077074e9d672aef
Merge: 32922de 57e809d
Author: 吴晟 Wu Sheng 
AuthorDate: Wed Feb 7 07:16:44 2018 +0800

Merge pull request #793 from ascrutae/feature/update-docs

Modify GRPC support version

 docs/Supported-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

[incubator-skywalking] branch master updated (32922de -> b00b588)

2018-02-06 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


from 32922de  Merge pull request #792 from ascrutae/fix/kafka-plugin-issue
 add c7c1901  Modify GRPC support version
 add 57e809d  Merge branch 'master' into feature/update-docs
 new b00b588  Merge pull request #793 from ascrutae/feature/update-docs

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/Supported-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

[incubator-skywalking] 01/01: Merge pull request #790 from ascrutae/fix/grpc-plugin-issue

2018-02-06 Thread wusheng 
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

commit 63eec4bd217d0151c05ebe1750c1f2de4d7d481f
Merge: b40f819 03071a4
Author: 吴晟 Wu Sheng 
AuthorDate: Tue Feb 6 21:17:07 2018 +0800

Merge pull request #790 from ascrutae/fix/grpc-plugin-issue

[Agent] Fix grpc don't works in 1.8 version

 ...a => AbstractServerImplBuilderInterceptor.java} |  17 ++-
 ...terceptor.java => AbstractStubInterceptor.java} |  26 ++--
 .../grpc/v1/BlockingCallClientInterceptor.java |  95 ++
 ...Interceptor.java => CallServerInterceptor.java} |  78 
 .../grpc/v1/ClientCallOnNextInterceptor.java   |  61 -
 .../plugin/grpc/v1/ClientCallStartInterceptor.java |  64 --
 .../grpc/v1/ClientCallsMethodInterceptor.java  |  62 -
 .../apm/plugin/grpc/v1/{define => }/Constants.java |  19 +--
 ...Interceptor.java => GRPCClientInterceptor.java} |  28 +++--
 ...escriptor.java => OperationNameFormatUtil.java} |  29 ++---
 .../grpc/v1/ServerCallHandlerInterceptor.java  |  59 -
 .../grpc/v1/ServerCallOnCloseInterceptor.java  |  58 -
 .../grpc/v1/ServerCallOnMessageInterceptor.java|  62 -
 .../grpc/v1/StreamCallClientInterceptor.java   | 115 +
 .../grpc/v1/StreamClientOnCloseInterceptor.java|  77 
 .../grpc/v1/StreamClientOnReadyInterceptor.java|  62 -
 .../UnaryStreamToFutureConstructorInterceptor.java |  35 --
 ... AbstractServerImplBuilderInstrumentation.java} |  25 ++--
 ...ation.java => AbstractStubInstrumentation.java} |  35 --
 .../grpc/v1/define/ClientCallInstrumentation.java  |  81 
 .../grpc/v1/define/ClientCallsInstrumentation.java |  59 -
 ...treamObserverToCallListenerInstrumentation.java | 101 ---
 .../StreamingServerCallHandlerInstrumentation.java |  69 --
 ...StreamingServerCallListenerInstrumentation.java | 117 -
 .../UnaryClientCallListenerInstrumentation.java|  63 --
 .../UnaryServerCallListenerInstrumentation.java| 102 ---
 .../apm/plugin/grpc/v1/vo/GRPCDynamicFields.java   |  89 -
 .../src/main/resources/skywalking-plugin.def   |  11 +-
 .../v1/ClientCallIConstructorInterceptorTest.java  |  65 --
 .../grpc/v1/ClientCallOnNextInterceptorTest.java   |  85 -
 .../grpc/v1/ClientCallsMethodInterceptorTest.java  | 122 --
 .../grpc/v1/ServerCallHandlerInterceptorTest.java  |  72 ---
 .../v1/ServerCallOnMessageInterceptorTest.java |  86 -
 .../grpc/v1/ServerCallOnReadyInterceptorTest.java  | 139 -
 34 files changed, 351 insertions(+), 1917 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

[incubator-skywalking] branch master updated (b40f819 -> 63eec4b)

2018-02-06 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


from b40f819  Merge pull request #789 from apache/protocol-consistency
 add 9c332e8  [Agent] Fix grpc don't works in 1.8 version
 add 60638f7  add comments
 add 93da3fa  Modify operation name
 add 03071a4  modify the comments
 new 63eec4b  Merge pull request #790 from ascrutae/fix/grpc-plugin-issue

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../v1/AbstractServerImplBuilderInterceptor.java}  |  15 ++-
 ...terceptor.java => AbstractStubInterceptor.java} |  23 ++--
 .../grpc/v1/BlockingCallClientInterceptor.java |  95 ++
 ...Interceptor.java => CallServerInterceptor.java} |  78 
 .../grpc/v1/ClientCallOnNextInterceptor.java   |  61 -
 .../plugin/grpc/v1/ClientCallStartInterceptor.java |  64 --
 .../grpc/v1/ClientCallsMethodInterceptor.java  |  62 -
 .../skywalking/apm/plugin/grpc/v1}/Constants.java  |  12 +-
 ...Interceptor.java => GRPCClientInterceptor.java} |  28 +++--
 ...escriptor.java => OperationNameFormatUtil.java} |  29 ++---
 .../grpc/v1/ServerCallHandlerInterceptor.java  |  59 -
 .../grpc/v1/ServerCallOnCancelInterceptor.java |  57 -
 .../grpc/v1/ServerCallOnCloseInterceptor.java  |  58 -
 .../grpc/v1/ServerCallOnMessageInterceptor.java|  62 -
 .../grpc/v1/StreamCallClientInterceptor.java   | 115 +
 .../grpc/v1/StreamClientOnCloseInterceptor.java|  77 
 .../grpc/v1/StreamClientOnReadyInterceptor.java|  62 -
 .../UnaryStreamToFutureConstructorInterceptor.java |  35 --
 ... AbstractServerImplBuilderInstrumentation.java} |  25 ++--
 ...ation.java => AbstractStubInstrumentation.java} |  35 --
 .../grpc/v1/define/ClientCallInstrumentation.java  |  81 
 .../grpc/v1/define/ClientCallsInstrumentation.java |  59 -
 .../apm/plugin/grpc/v1/define/Constants.java   |  37 --
 ...treamObserverToCallListenerInstrumentation.java | 101 ---
 .../StreamingServerCallHandlerInstrumentation.java |  69 --
 ...StreamingServerCallListenerInstrumentation.java | 117 -
 .../UnaryClientCallListenerInstrumentation.java|  63 --
 .../UnaryServerCallListenerInstrumentation.java| 102 ---
 .../apm/plugin/grpc/v1/vo/GRPCDynamicFields.java   |  89 -
 .../src/main/resources/skywalking-plugin.def   |  11 +-
 .../v1/ClientCallIConstructorInterceptorTest.java  |  65 --
 .../grpc/v1/ClientCallOnNextInterceptorTest.java   |  85 -
 .../grpc/v1/ClientCallsMethodInterceptorTest.java  | 122 --
 .../grpc/v1/ServerCallHandlerInterceptorTest.java  |  72 ---
 .../v1/ServerCallOnMessageInterceptorTest.java |  86 -
 .../grpc/v1/ServerCallOnReadyInterceptorTest.java  | 139 -
 36 files changed, 357 insertions(+), 1993 deletions(-)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/UpdateNameServerInterceptor.java
 => 
grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/AbstractServerImplBuilderInterceptor.java}
 (77%)
 rename 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/{ManagedChannelInterceptor.java
 => AbstractStubInterceptor.java} (71%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/BlockingCallClientInterceptor.java
 rename 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/{ServerCallOnReadyInterceptor.java
 => CallServerInterceptor.java} (53%)
 delete mode 100644 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/ClientCallOnNextInterceptor.java
 delete mode 100644 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/ClientCallStartInterceptor.java
 delete mode 100644 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/ClientCallsMethodInterceptor.java
 copy 
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf
 => 
apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1}/Constants.java
 (73%)
 rename 
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/{ClientCallIConstructorInterceptor.java
 => GRPCClientInterceptor.java} (52%)
 rename