This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch bootstrap-cl
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from dffc9e3 Refactor codes
new 7ea12f5 Build the new core
new 96f17f1 Setup the new core.
The 2 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:
apm-sniffer/apm-agent-core/pom.xml | 44 +++--
.../apm/agent/core/logging/api/LogManager.java | 15 +-
.../apm/agent/core/logging/api/LogResolver.java | 6 +
.../agent/core/logging/core/EasyLogResolver.java | 4 +
.../apm/agent/core/logging/core/EasyLogger.java | 8 +-
.../plugin/AbstractClassEnhancePluginDefine.java | 28 ++++
.../apm/agent/core/plugin/PluginFinder.java | 9 +-
.../plugin/bootstrap/BootstrapInstrumentBoost.java | 184 +++++++++++++++++++++
.../plugin/bootstrap/BootstrapPluginLogBridge.java | 91 ++++++++++
.../bootstrap/IBootstrapLog.java} | 15 +-
...ootstrapInstanceMethodInterceptorTemplate.java} | 72 ++++----
.../interceptor/enhance/BootstrapInterAssist.java | 78 +++++++++
.../enhance/ClassEnhancePluginDefine.java | 121 ++++++++------
.../ClassInstanceMethodsEnhancePluginDefine.java | 2 +-
.../ClassStaticMethodsEnhancePluginDefine.java | 4 +-
.../BootstrapClassEnhancePluginDefine.java | 162 ------------------
.../bootstrap/BootstrapInstMethodsInter.java | 52 ------
.../BootstrapInstanceMethodsInterceptPoint.java | 43 -----
apm-sniffer/apm-agent/pom.xml | 23 ++-
.../skywalking/apm/agent/SkyWalkingAgent.java | 48 +-----
.../define/ActiveMQConsumerInstrumentation.java | 4 +-
.../define/ActiveMQProducerInstrumentation.java | 4 +-
.../plugin/canal/define/CanalInstrumentation.java | 4 +-
.../canal/define/ClusterNodeInstrumentation.java | 4 +-
.../asf/dubbo/patch/WrapperInstrumentation.java | 2 +-
.../apm/plugin/asf/dubbo/DubboInstrumentation.java | 4 +-
.../plugin/dubbo/patch/WrapperInstrumentation.java | 2 +-
.../apm/plugin/dubbo/DubboInstrumentation.java | 4 +-
.../esjob/define/JobExecutorInstrumentation.java | 4 +-
.../v5/define/GenericActionInstrumentation.java | 6 +-
...PlainListenableActionFutureInstrumentation.java | 6 +-
.../TransportActionNodeProxyInstrumentation.java | 6 +-
...TransportClientNodesServiceInstrumentation.java | 4 +-
.../TransportProxyClientInstrumentation.java | 6 +-
.../define/DefaultHttpClientInstrumentation.java | 4 +-
.../AbstractServerImplBuilderInstrumentation.java | 4 +-
.../v1/define/AbstractStubInstrumentation.java | 4 +-
.../grpc/v1/define/ClientCallsInstrumentation.java | 2 +-
.../define/AbstractConnectionInstrumentation.java | 4 +-
.../h2/define/JdbcXAConnectionInstrumentation.java | 2 +-
.../PooledJdbcConnectionInstrumentation.java | 2 +-
.../define/AbstractHttpClientInstrumentation.java | 2 +-
.../DefaultRequestDirectorInstrumentation.java | 2 +-
.../v4/define/HttpClientInstrumentation.java | 2 +-
.../define/InternalHttpClientInstrumentation.java | 2 +-
.../define/MinimalHttpClientInstrumentation.java | 2 +-
.../v4/define/HttpAsyncClientInstrumentation.java | 4 +-
.../HttpAsyncRequestExecutorInstrumentation.java | 4 +-
.../v4/define/SessionRequestInstrumentation.java | 4 +-
.../v1/define/HystrixCommandInstrumentation.java | 4 +-
.../v1/define/HystrixPluginsInstrumentation.java | 4 +-
.../jdbc/define/AbstractDriverInstrumentation.java | 4 +-
.../v2/define/JedisClusterInstrumentation.java | 4 +-
.../jedis/v2/define/JedisInstrumentation.java | 4 +-
.../client/define/HttpRequestInstrumentation.java | 4 +-
.../client/define/HttpRequestInstrumentation.java | 4 +-
.../server/define/DispatcherInstrumentation.java | 4 +-
.../v9/server/define/JettyInstrumentation.java | 4 +-
.../HttpUrlConnectionInstrumentation.java | 30 +++-
.../plugin/jre/httpurlconnection/Interceptor.java | 48 +++---
.../kafka/v1/define/CallbackInstrumentation.java | 4 +-
.../v1/define/KafkaConsumerInstrumentation.java | 4 +-
.../v1/define/KafkaProducerInstrumentation.java | 4 +-
.../v1/define/ProducerRecordInstrumentation.java | 4 +-
.../MongoDBCollectionImplInstrumentation.java | 4 +-
.../define/MongoDBCollectionInstrumentation.java | 4 +-
.../mongodb/v3/define/MongoDBInstrumentation.java | 4 +-
.../motan/define/MotanConsumerInstrumentation.java | 4 +-
.../motan/define/MotanProviderInstrumentation.java | 4 +-
.../define/AbstractConnectionInstrumentation.java | 4 +-
.../v5/define/AbstractMysqlInstrumentation.java | 6 +-
.../mysql/v5/define/CacheIpsInstrumentation.java | 4 +-
.../mysql/v5/define/CallableInstrumentation.java | 4 +-
.../ConnectionImplCreateInstrumentation.java | 2 +-
...paredStatementIgnoredSetterInstrumentation.java | 2 +-
.../define/PreparedStatementInstrumentation.java | 4 +-
...PreparedStatementNullSetterInstrumentation.java | 2 +-
.../PreparedStatementSetterInstrumentation.java | 2 +-
.../mysql/v5/define/StatementInstrumentation.java | 4 +-
.../v6/define/AbstractMysqlInstrumentation.java | 6 +-
.../mysql/v6/define/CacheIpsInstrumentation.java | 4 +-
.../mysql/v6/define/CallableInstrumentation.java | 4 +-
.../ConnectionImplCreateInstrumentation.java | 2 +-
.../mysql/v6/define/ConnectionInstrumentation.java | 4 +-
...paredStatementIgnoredSetterInstrumentation.java | 2 +-
.../define/PreparedStatementInstrumentation.java | 4 +-
...PreparedStatementNullSetterInstrumentation.java | 2 +-
.../PreparedStatementSetterInstrumentation.java | 2 +-
.../mysql/v6/define/StatementInstrumentation.java | 4 +-
.../v8/define/AbstractMysqlInstrumentation.java | 6 +-
.../mysql/v8/define/CallableInstrumentation.java | 4 +-
.../ConnectionImplCreateInstrumentation.java | 2 +-
.../mysql/v8/define/ConnectionInstrumentation.java | 4 +-
...paredStatementIgnoredSetterInstrumentation.java | 2 +-
.../define/PreparedStatementInstrumentation.java | 4 +-
...PreparedStatementNullSetterInstrumentation.java | 2 +-
.../PreparedStatementSetterInstrumentation.java | 2 +-
.../mysql/v8/define/StatementInstrumentation.java | 4 +-
.../define/AbstractNutzHttpInstrumentation.java | 4 +-
.../nutz/mvc/define/ActionInstrumentation.java | 4 +-
.../okhttp/v3/define/AsyncCallInstrumentation.java | 4 +-
.../okhttp/v3/define/CallbackInstrumentation.java | 4 +-
.../okhttp/v3/define/RealCallInstrumentation.java | 4 +-
.../AbstractJdbc2StatementInstrumentation.java | 4 +-
.../define/ConnectionInstrumentation.java | 4 +-
.../define/Jdbc3ConnectionInstrumentation.java | 4 +-
.../define/Jdbc4ConnectionInstrumentation.java | 4 +-
.../define/PgCallableStatementInstrumentation.java | 4 +-
.../define/PgPreparedStatementInstrumentation.java | 4 +-
.../define/PgStatementInstrumentation.java | 4 +-
.../define/RabbitMQConsumerInstrumentation.java | 4 +-
.../define/RabbitMQProducerInstrumentation.java | 4 +-
.../define/ConnectionManagerInstrumentation.java | 4 +-
.../v3/define/RedisClientInstrumentation.java | 4 +-
.../v3/define/RedisConnectionInstrumentation.java | 4 +-
.../SynchronousDispatcherInstrumentation.java | 4 +-
.../ConsumeMessageConcurrentlyInstrumentation.java | 4 +-
.../ConsumeMessageOrderlyInstrumentation.java | 4 +-
.../v3/define/MQClientAPIImplInstrumentation.java | 4 +-
.../v3/define/SendCallbackInstrumentation.java | 4 +-
.../ConsumeMessageConcurrentlyInstrumentation.java | 4 +-
.../ConsumeMessageOrderlyInstrumentation.java | 4 +-
.../v4/define/MQClientAPIImplInstrumentation.java | 4 +-
.../v4/define/SendCallbackInstrumentation.java | 4 +-
.../ProducerOperationHandlerInstrumentation.java | 4 +-
.../TransportClientHandlerInstrumentation.java | 4 +-
.../ProducerOperationHandlerInstrumentation.java | 4 +-
.../TransportClientHandlerInstrumentation.java | 4 +-
.../sjdbc/define/ExecutorInstrumentation.java | 4 +-
.../define/ExecuteInstrumentation.java | 4 +-
.../define/JDBCRootInvokeInstrumentation.java | 4 +-
.../define/ParseInstrumentation.java | 4 +-
.../define/ProxyRootInvokeInstrumentation.java | 4 +-
.../v4/define/ExecuteInstrumentation.java | 4 +-
.../v4/define/JDBCRootInvokeInstrumentation.java | 4 +-
.../v4/define/ParseInstrumentation.java | 4 +-
.../v4/define/ProxyRootInvokeInstrumentation.java | 4 +-
.../sofarpc/SofaRpcConsumerInstrumentation.java | 4 +-
.../sofarpc/SofaRpcProviderInstrumentation.java | 4 +-
.../solrj/define/SolrClientInstrumentation.java | 4 +-
.../AsyncExecutionInterceptorInstrumentation.java | 4 +-
.../define/FailureCallbackInstrumentation.java | 4 +-
.../ListenableFutureCallbackInstrumentation.java | 4 +-
.../define/SuccessCallbackInstrumentation.java | 4 +-
.../define/AopExpressionMatchInstrumentation.java | 4 +-
.../define/AopProxyFactoryInstrumentation.java | 4 +-
.../AspectJExpressionPointCutInstrumentation.java | 4 +-
...utowiredAnnotationProcessorInstrumentation.java | 4 +-
.../define/BeanWrapperImplInstrumentation.java | 4 +-
.../mvc/v3/define/ControllerInstrumentation.java | 4 +-
.../v3/define/HandlerMethodInstrumentation.java | 4 +-
.../HandlerMethodInvokerInstrumentation.java | 4 +-
.../v3/define/InvocableHandlerInstrumentation.java | 4 +-
.../define/AbstractControllerInstrumentation.java | 4 +-
.../v4/define/HandlerMethodInstrumentation.java | 4 +-
.../v4/define/InvocableHandlerInstrumentation.java | 4 +-
.../define/AbstractControllerInstrumentation.java | 4 +-
.../v5/define/HandlerMethodInstrumentation.java | 4 +-
...otationMethodHandlerAdapterInstrumentation.java | 4 +-
.../ResponseExtractorFutureInstrumentation.java | 4 +-
.../async/define/RestTemplateInstrumentation.java | 4 +-
.../sync/define/RestTemplateInstrumentation.java | 4 +-
.../v11/define/NetflixFeignInstrumentation.java | 4 +-
.../define/AbstractControllerInstrumentation.java | 4 +-
.../HttpServerOperations20xInstrumentation.java | 4 +-
.../HttpServerOperations21xInstrumentation.java | 4 +-
.../v2/define/MemcachedInstrumentation.java | 4 +-
.../struts2/define/Struts2Instrumentation.java | 4 +-
.../ApplicationDispatcherInstrumentation.java | 4 +-
.../tomcat78x/define/TomcatInstrumentation.java | 4 +-
.../RequestDispatcherImplInstrumentation.java | 4 +-
.../v2x/define/UndertowInstrumentation.java | 2 +-
...ClusteredEventBusSendRemoteInstrumentation.java | 4 +-
...ventBusImplDeliverToHandlerInstrumentation.java | 4 +-
.../define/HandlerRegistrationInstrumentation.java | 4 +-
.../HttpClientRequestImplEndInstrumentation.java | 4 +-
...tRequestImplHandleExceptionInstrumentation.java | 4 +-
...ntRequestImplHandleResponseInstrumentation.java | 4 +-
.../HttpServerResponseImplEndInstrumentation.java | 4 +-
...ResponseImplHandleExceptionInstrumentation.java | 4 +-
.../define/RouterImplAcceptInstrumentation.java | 4 +-
.../v2/define/XMemcachedInstrumentation.java | 4 +-
.../v1/x/TraceIdPatternConverterActivation.java | 4 +-
.../log4j/v2/x/Log4j2OutputAppenderActivation.java | 2 +-
.../v1/x/LogbackPatternConverterActivation.java | 4 +-
.../x/async/AsyncAppenderBaseInstrumentation.java | 4 +-
.../v1/x/async/LoggingEventInstrumentation.java | 4 +-
.../logback/v1/x/mdc/MDCConverterActivation.java | 4 +-
.../SkywalkingContinuationActivation.java | 4 +-
.../opentracing/span/SkywalkingSpanActivation.java | 4 +-
.../tracer/SkywalkingTracerActivation.java | 4 +-
.../activation/trace/ActiveSpanActivation.java | 4 +-
.../trace/CallableOrRunnableActivation.java | 4 +-
.../trace/TraceAnnotationActivation.java | 4 +-
.../activation/trace/TraceContextActivation.java | 2 +-
.../define/CustomizeInstanceInstrumentation.java | 4 +-
.../define/CustomizeStaticInstrumentation.java | 2 +-
.../gson/define/GsonFromJsonInstrumentation.java | 4 +-
.../gson/define/GsonToJsonInstrumentation.java | 4 +-
.../define/AbstractRedisClientInstrumentation.java | 4 +-
.../v5/define/AsyncCommandInstrumentation.java | 4 +-
.../v5/define/ClientOptionsInstrumentation.java | 4 +-
.../define/RedisChannelWriterInstrumentation.java | 4 +-
.../v5/define/RedisClientInstrumentation.java | 4 +-
.../define/RedisClusterClientInstrumentation.java | 4 +-
.../define/DefaultHttpHeadersInstrumentation.java | 4 +-
.../define/FilteringWebHandlerInstrumentation.java | 4 +-
.../HttpClientOperationsInstrumentation.java | 4 +-
.../AbstractSpringBeanInstrumentation.java | 4 +-
.../define/ClientCnxnInstrumentation.java | 4 +-
.../define/EventThreadInstrumentation.java | 4 +-
...or.enhance.bootstrap.Interceptor_internal.class | Bin 0 -> 3229 bytes
docs/en/guides/Java-Plugin-Development-Guide.md | 2 +-
213 files changed, 987 insertions(+), 820 deletions(-)
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapPluginLogBridge.java
copy
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/{logging/api/ILog.java
=> plugin/bootstrap/IBootstrapLog.java} (84%)
copy
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/{InstMethodsInter.java
=> BootstrapInstanceMethodInterceptorTemplate.java} (59%)
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/BootstrapInterAssist.java
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/bootstrap/BootstrapClassEnhancePluginDefine.java
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/bootstrap/BootstrapInstMethodsInter.java
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/bootstrap/BootstrapInstanceMethodsInterceptPoint.java
create mode 100644
debug/org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.bootstrap.Interceptor_internal.class