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 2020/02/12 06:08:21 UTC

[skywalking] branch grpc_alarm updated (0635bbe -> abaee0f)

This is an automated email from the ASF dual-hosted git repository.

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


    from 0635bbe  fix.
     add e5366c0  Tag annotation supports returned expression (#4327)
     add abaee0f  Merge branch 'master' into grpc_alarm

No new revisions were added by this update.

Summary of changes:
 .../apm/agent/core/util/CustomizeExpression.java   |  24 +++
 .../trace/TagAnnotationMethodInterceptor.java      |  39 +++--
 .../trace/TraceAnnotationMethodInterceptor.java    |  37 +++--
 .../apm/toolkit/activation/util/TagUtil.java       |  43 ++++++
 .../activation/trace/TagAnnotationTest.java        | 169 +++++++++++++++++++++
 .../activation/trace/TraceAnnotationTest.java      |  76 ++++++++-
 .../java-agent/Application-toolkit-trace.md        |   8 +-
 .../config/expectedData.yaml                       |  15 ++
 .../apache/skywalking/apm/toolkit/model/User.java  |  28 ++--
 .../toolkit/controller/TestController.java         |   1 +
 .../testcase/toolkit/controller/TestService.java   |   6 +
 11 files changed, 405 insertions(+), 41 deletions(-)
 create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/util/TagUtil.java
 create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationTest.java
 copy apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Person.java => test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/model/User.java (66%)