You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/04/06 02:12:58 UTC

[skywalking] branch docker/agent updated (840ada3 -> 9db18fc)

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

kezhenxu94 pushed a change to branch docker/agent
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 840ada3  Download CLI from official release instead of older release image
 discard 95e912b  Merge branch 'master' into docker/agent
 discard 0f472a2  Update CHANGES.md
 discard dc2d6f5  feature: add dockerfile for agent image
     add c2c6262  Update Dockerfile.go (#6689)
     add 647e234  Fix CHANGES.md typo (#6688)
     add 411bcf2  Support @Trace, @Tag and @Tags work for static methods (#6685)
     add 11dfc39  feature: add dockerfile for agent image
     add 14476a2  Update CHANGES.md
     add 9db18fc  Download CLI from official release instead of older release image

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (840ada3)
            \
             N -- N -- N   refs/heads/docker/agent (9db18fc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                         |  9 +--
 ...ptor.java => BaseTagAnnotationInterceptor.java} | 33 +++--------
 ...or.java => BaseTraceAnnotationInterceptor.java} | 36 ++++--------
 .../activation/trace/TagAnnotationActivation.java  | 28 ++++++++-
 .../trace/TagAnnotationMethodInterceptor.java      | 67 ++++------------------
 .../TagAnnotationStaticMethodInterceptor.java}     | 12 ++--
 .../trace/TraceAnnotationActivation.java           | 28 ++++++++-
 .../trace/TraceAnnotationMethodInterceptor.java    | 60 ++-----------------
 .../TraceAnnotationStaticMethodInterceptor.java}   | 12 ++--
 test/e2e/e2e-test/docker/go/Dockerfile.go          |  4 +-
 .../config/expectedData.yaml                       | 15 +++++
 .../toolkit/controller/TestController.java         |  1 +
 .../testcase/toolkit/controller/TestService.java   |  8 +++
 13 files changed, 131 insertions(+), 182 deletions(-)
 copy apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/{TagAnnotationMethodInterceptor.java => BaseTagAnnotationInterceptor.java} (73%)
 copy apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/{TraceAnnotationMethodInterceptor.java => BaseTraceAnnotationInterceptor.java} (70%)
 copy apm-sniffer/{optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java => apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationStaticMethodInterceptor.java} (79%)
 copy apm-sniffer/{optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java => apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationStaticMethodInterceptor.java} (79%)