From 75d8aba0f42377a9ac2f04fc56b8572605557ad9 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Feb 2017 21:54:08 +0800 Subject: [PATCH] Big refactor. Rename the api-module root package name . --- .../skywalking/health/report/HealthCollector.java | 4 ++-- .../a/eye/skywalking/{ => api}/logging/api/ILog.java | 2 +- .../skywalking/{ => api}/logging/api/LogManager.java | 2 +- .../{ => api}/logging/api/LogResolver.java | 2 +- .../skywalking/{ => api}/logging/api/NoopLogger.java | 2 +- .../{ => api}/logging/impl/log4j2/Log4j2Logger.java | 4 ++-- .../logging/impl/log4j2/Log4j2Resolver.java | 6 +++--- .../skywalking/{ => api}/util/ConfigInitializer.java | 2 +- .../a/eye/skywalking/{ => api}/util/StringUtil.java | 2 +- .../com/a/eye/skywalking/agent/SkyWalkingAgent.java | 12 ++++++------ .../agent/junction/SkyWalkingEnhanceMatcher.java | 2 +- .../com/a/eye/skywalking/{ => api}/conf/Config.java | 2 +- .../a/eye/skywalking/{ => api}/conf/Constants.java | 4 ++-- .../{ => api}/conf/SnifferConfigInitializer.java | 10 +++++----- .../skywalking/{ => api}/context/ContextCarrier.java | 4 ++-- .../skywalking/{ => api}/context/ContextManager.java | 4 ++-- .../skywalking/{ => api}/context/TracerContext.java | 6 ++---- .../{ => api}/context/TracerContextListener.java | 2 +- .../{ => api}/logging/EasyLogResolver.java | 6 +++--- .../eye/skywalking/{ => api}/logging/EasyLogger.java | 5 +++-- .../a/eye/skywalking/{ => api}/logging/IWriter.java | 2 +- .../a/eye/skywalking/{ => api}/logging/LogLevel.java | 2 +- .../skywalking/{ => api}/logging/STDOutWriter.java | 2 +- .../skywalking/{ => api}/logging/SyncFileWriter.java | 2 +- .../skywalking/{ => api}/logging/WriterFactory.java | 2 +- .../plugin/AbstractClassEnhancePluginDefine.java | 11 ++++++----- .../skywalking/{ => api}/plugin/PluginBootstrap.java | 6 +++--- .../a/eye/skywalking/{ => api}/plugin/PluginCfg.java | 4 ++-- .../{ => api}/plugin/PluginDefineCategory.java | 2 +- .../skywalking/{ => api}/plugin/PluginException.java | 2 +- .../{ => api}/plugin/PluginResourcesResolver.java | 6 +++--- .../{ => api}/plugin/TracingBootstrap.java | 6 +++--- .../bytebuddy/AllObjectDefaultMethodsMatch.java | 2 +- .../plugin/bytebuddy/ArgumentTypeNameMatch.java | 2 +- .../interceptor/ConstructorInterceptPoint.java | 2 +- .../plugin/interceptor/EnhanceException.java | 2 +- .../interceptor/EnhancedClassInstanceContext.java | 10 ++++++---- .../interceptor/InstanceMethodsInterceptPoint.java | 2 +- .../plugin/interceptor/InterceptorException.java | 2 +- .../interceptor/StaticMethodsInterceptPoint.java | 2 +- .../interceptor/assist/NoCocurrencyAceessObject.java | 6 +++--- .../enhance/ClassConstructorInterceptor.java | 10 +++++----- .../enhance/ClassEnhancePluginDefine.java | 11 +++++------ .../ClassInstanceMethodsEnhancePluginDefine.java | 3 ++- .../enhance/ClassInstanceMethodsInterceptor.java | 10 +++++----- .../ClassStaticMethodsEnhancePluginDefine.java | 4 ++-- .../enhance/ClassStaticMethodsInterceptor.java | 8 ++++---- .../enhance/ConstructorInvokeContext.java | 2 +- .../enhance/DefaultClassConstructorInterceptor.java | 8 ++++---- .../api/plugin/interceptor/enhance/FieldGetter.java | 5 +++++ .../plugin/interceptor/enhance/FieldSetter.java | 2 +- .../enhance/InstanceConstructorInterceptor.java | 4 ++-- .../enhance/InstanceMethodInvokeContext.java | 2 +- .../enhance/InstanceMethodsAroundInterceptor.java | 4 ++-- .../interceptor/enhance/MethodInterceptResult.java | 4 ++-- .../interceptor/enhance/MethodInvokeContext.java | 2 +- .../enhance/StaticMethodInvokeContext.java | 2 +- .../enhance/StaticMethodsAroundInterceptor.java | 2 +- .../loader/InterceptorInstanceLoader.java | 6 +++--- .../{ => api}/queue/TraceSegmentHolder.java | 2 +- .../{ => api}/queue/TraceSegmentProcessQueue.java | 4 ++-- .../a/eye/skywalking/{ => api}/util/LoggingUtil.java | 2 +- .../a/eye/skywalking/{ => api}/util/MachineInfo.java | 2 +- .../{ => api}/util/RoutingKeyGenerator.java | 2 +- .../skywalking/{ => api}/util/TraceIdGenerator.java | 2 +- .../plugin/interceptor/enhance/FieldGetter.java | 5 ----- .../{ => api}/context/ContextCarrierTestCase.java | 2 +- .../{ => api}/context/ContextManagerTestCase.java | 2 +- .../{ => api}/context/TestTracerContextListener.java | 2 +- .../{ => api}/context/TracerContextTestCase.java | 2 +- .../{ => api}/plugin/BeInterceptedClass.java | 2 +- .../skywalking/{ => api}/plugin/PluginMainTest.java | 2 +- .../{ => api}/plugin/PluginResourceResoverTest.java | 4 +--- .../{ => api}/plugin/TestAroundInterceptor.java | 8 ++++---- .../{ => api}/plugin/TestInterceptorDefine.java | 8 +++++--- .../plugin/TestStaticAroundInterceptor.java | 8 ++++---- .../{ => api}/plugin/dubbo/DubboBuriedPointType.java | 2 +- .../{ => api}/plugin/dubbo/DubboPluginDefine.java | 4 ++-- .../plugin/dubbo/MonitorFilterInterceptor.java | 12 ++++++------ .../plugin/dubbox/bugfix/below283/BugFixAcitve.java | 2 +- .../plugin/dubbox/bugfix/below283/SWBaseBean.java | 2 +- .../httpClient/v4/HttpClientExecuteInterceptor.java | 8 ++++---- .../plugin/httpClient/v4/WebBuriedPointType.java | 2 +- .../v4/define/AbstractHttpClientPluginDefine.java | 4 ++-- .../define/DefaultRequestDirectorPluginDefine.java | 4 ++-- .../httpClient/v4/define/HttpClientPluginDefine.java | 2 +- .../v4/define/InternalHttpClientPluginDefine.java | 4 ++-- .../v4/define/MinimalHttpClientPluginDefine.java | 4 ++-- .../plugin/jdbc/CallableStatementTracing.java | 4 ++-- .../{ => api}/plugin/jdbc/ConnectionTracing.java | 4 ++-- .../plugin/jdbc/PreparedStatementTracing.java | 4 ++-- .../{ => api}/plugin/jdbc/SWCallableStatement.java | 2 +- .../{ => api}/plugin/jdbc/SWConnection.java | 2 +- .../{ => api}/plugin/jdbc/SWPreparedStatement.java | 2 +- .../{ => api}/plugin/jdbc/SWStatement.java | 2 +- .../{ => api}/plugin/jdbc/StatementTracing.java | 4 ++-- .../jdbc/define/AbstractDatabasePluginDefine.java | 5 +++-- .../{ => api}/plugin/jdbc/define/H2PluginDefine.java | 2 +- .../plugin/jdbc/define/JDBCBuriedPointType.java | 2 +- .../plugin/jdbc/define/JDBCDriverInterceptor.java | 10 +++++----- .../plugin/jdbc/define/MysqlPluginDefine.java | 2 +- .../plugin/jdbc/define/OraclePluginDefine.java | 2 +- ...ClusterConstructorInterceptor4HostAndPortArg.java | 10 ++++------ .../JedisClusterConstructorInterceptor4SetArg.java | 8 ++++---- .../v2/JedisConstructorInterceptor4ShardInfoArg.java | 10 ++++------ .../v2/JedisConstructorInterceptor4StringArg.java | 11 ++++------- .../jedis/v2/JedisConstructorInterceptor4UriArg.java | 8 ++++---- .../plugin/jedis/v2/JedisMethodInterceptor.java | 6 +++--- .../plugin/jedis/v2/RedisBuriedPointType.java | 2 +- .../jedis/v2/define/JedisClusterPluginDefine.java | 4 ++-- .../plugin/jedis/v2/define/JedisPluginDefine.java | 5 +++-- .../{ => api}/plugin/motan/MotanBuriedPointType.java | 2 +- .../plugin/motan/MotanClientCallInterceptor.java | 9 ++++----- .../motan/MotanClientFetchCallURLInterceptor.java | 8 ++++---- .../plugin/motan/MotanServerInterceptor.java | 10 +++++----- .../plugin/motan/define/MotanClientDefine.java | 4 ++-- .../plugin/motan/define/MotanServerDefine.java | 5 +++-- .../plugin/tomcat78x/TomcatPluginInterceptor.java | 8 ++++---- .../plugin/tomcat78x/WebBuriedPointType.java | 2 +- .../plugin/tomcat78x/define/TomcatPluginDefine.java | 4 ++-- .../log/log4j/v1/x/PrintTraceIdInterceptor.java | 6 +++--- .../v1/x/TraceIdPatternConverterActivation.java | 2 +- .../log/log4j/v2/x/PrintTraceIdInterceptor.java | 2 -- .../v1/x/LogbackPatternConverterActivation.java | 2 +- .../log/logback/v1/x/PrintTraceIdInterceptor.java | 6 +++--- .../opentracing/span/SkyWalkingSpanActivation.java | 2 +- .../span/interceptor/SpanFinishInterceptor.java | 6 +++--- .../span/interceptor/SpanNewInstanceInterceptor.java | 4 ++-- .../interceptor/SpanSetOperationNameInterceptor.java | 6 +++--- .../span/interceptor/SpanSetTagInterceptor.java | 6 +++--- .../spanbuilder/SkyWalkingSpanBuilderActivation.java | 2 +- .../SpanBuilderNewInstanceInterceptor.java | 4 ++-- .../interceptor/SpanBuilderStartInterceptor.java | 6 +++--- .../SpanBuilderWithStartTimeInterceptor.java | 6 +++--- .../interceptor/SpanBuilderWithTagInterceptor.java | 6 +++--- .../tracer/SkyWalkingTracerActivation.java | 2 +- ...ractCrossProcessByteBufferContextInterceptor.java | 6 +++--- ...ExtractCrossProcessTextMapContextInterceptor.java | 6 +++--- .../TracerFormatCrossProcessContextInterceptor.java | 7 +++---- .../activation/trace/TraceContextInterceptor.java | 10 +++++----- 140 files changed, 306 insertions(+), 312 deletions(-) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/ILog.java (94%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/LogManager.java (95%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/LogResolver.java (87%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/NoopLogger.java (96%) rename skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/{ => api}/logging/impl/log4j2/Log4j2Logger.java (94%) rename skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/{ => api}/logging/impl/log4j2/Log4j2Resolver.java (62%) rename skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/{ => api}/util/ConfigInitializer.java (98%) rename skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/{ => api}/util/StringUtil.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/Config.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/Constants.java (67%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/SnifferConfigInitializer.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/ContextCarrier.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/ContextManager.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/TracerContext.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/TracerContextListener.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/EasyLogResolver.java (57%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/EasyLogger.java (96%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/IWriter.java (70%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/LogLevel.java (69%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/STDOutWriter.java (85%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/SyncFileWriter.java (98%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/WriterFactory.java (88%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/AbstractClassEnhancePluginDefine.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginBootstrap.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginCfg.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginDefineCategory.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginException.java (88%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginResourcesResolver.java (92%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/TracingBootstrap.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java (98%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/bytebuddy/ArgumentTypeNameMatch.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/ConstructorInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/EnhanceException.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/EnhancedClassInstanceContext.java (72%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/InstanceMethodsInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/InterceptorException.java (85%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/StaticMethodsInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/assist/NoCocurrencyAceessObject.java (86%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassConstructorInterceptor.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassEnhancePluginDefine.java (96%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java (84%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ConstructorInvokeContext.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java (78%) create mode 100644 skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/FieldSetter.java (51%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceConstructorInterceptor.java (79%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceMethodInvokeContext.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java (92%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/MethodInterceptResult.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/MethodInvokeContext.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/StaticMethodInvokeContext.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/loader/InterceptorInstanceLoader.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/queue/TraceSegmentHolder.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/queue/TraceSegmentProcessQueue.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/LoggingUtil.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/MachineInfo.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/RoutingKeyGenerator.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/TraceIdGenerator.java (97%) delete mode 100644 skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/ContextCarrierTestCase.java (97%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/ContextManagerTestCase.java (95%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/TestTracerContextListener.java (89%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/TracerContextTestCase.java (98%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/BeInterceptedClass.java (86%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/PluginMainTest.java (95%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/PluginResourceResoverTest.java (70%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestAroundInterceptor.java (75%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestInterceptorDefine.java (82%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestStaticAroundInterceptor.java (68%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/DubboBuriedPointType.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/DubboPluginDefine.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/MonitorFilterInterceptor.java (93%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbox/bugfix/below283/BugFixAcitve.java (68%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbox/bugfix/below283/SWBaseBean.java (81%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/HttpClientExecuteInterceptor.java (87%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/WebBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java (87%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/HttpClientPluginDefine.java (89%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/CallableStatementTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/ConnectionTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/PreparedStatementTracing.java (91%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWCallableStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWConnection.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWPreparedStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/StatementTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/AbstractDatabasePluginDefine.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/H2PluginDefine.java (75%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/JDBCBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/JDBCDriverInterceptor.java (72%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/MysqlPluginDefine.java (80%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/OraclePluginDefine.java (80%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java (67%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java (70%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java (66%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java (62%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java (64%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisMethodInterceptor.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/RedisBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/define/JedisClusterPluginDefine.java (94%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/define/JedisPluginDefine.java (93%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanBuriedPointType.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanClientCallInterceptor.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanClientFetchCallURLInterceptor.java (73%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanServerInterceptor.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/define/MotanClientDefine.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/define/MotanServerDefine.java (89%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/TomcatPluginInterceptor.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/WebBuriedPointType.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/define/TomcatPluginDefine.java (89%) diff --git a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java index d081acb47e..601bab84cd 100644 --- a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java +++ b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.health.report; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.util.Arrays; import java.util.Map; diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java similarity index 94% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java index dfe6a40673..449b87d2dd 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * The Log interface. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java similarity index 95% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java index 19497e2865..ade1abca85 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * LogManager is the {@link LogResolver} implementation manager. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java similarity index 87% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java index 0a50cef917..c311e33541 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * {@link LogResolver} just do only one thing: return the {@link ILog} implementation. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java similarity index 96% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java index 936c13bb59..8088322e1e 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java similarity index 94% rename from skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java rename to skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java index ca8e2ec81c..2fb1f5d377 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.logging.impl.log4j2; +package com.a.eye.skywalking.api.logging.impl.log4j2; -import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.ILog; import org.apache.logging.log4j.Logger; /** diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java similarity index 62% rename from skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java rename to skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java index de0d9ca204..a2fb23d78d 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.logging.impl.log4j2; +package com.a.eye.skywalking.api.logging.impl.log4j2; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogResolver; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogResolver; import org.apache.logging.log4j.LogManager; /** diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java similarity index 98% rename from skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java rename to skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java index b43907e625..7a079b81d4 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java similarity index 95% rename from skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java rename to skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java index aee0e9096d..d448a38024 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; public final class StringUtil { public static boolean isEmpty(String str) { diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java index df3cf091ee..21868ecc76 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java @@ -2,13 +2,13 @@ package com.a.eye.skywalking.agent; import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher; import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.conf.SnifferConfigInitializer; +import com.a.eye.skywalking.api.conf.SnifferConfigInitializer; import com.a.eye.skywalking.logging.EasyLogResolver; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine; -import com.a.eye.skywalking.plugin.PluginBootstrap; -import com.a.eye.skywalking.plugin.PluginDefineCategory; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.plugin.PluginBootstrap; +import com.a.eye.skywalking.api.plugin.PluginDefineCategory; import com.a.eye.skywalking.plugin.PluginException; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.description.NamedElement; diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java index 8dd4c9eaed..3406088607 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java @@ -1,6 +1,6 @@ package com.a.eye.skywalking.agent.junction; -import com.a.eye.skywalking.plugin.PluginDefineCategory; +import com.a.eye.skywalking.api.plugin.PluginDefineCategory; import net.bytebuddy.description.NamedElement; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java index 85032931de..6ed63537e7 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; public class Config { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java similarity index 67% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java index fa1ebc8ea3..8751a1be48 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; -import com.a.eye.skywalking.util.TraceIdGenerator; +import com.a.eye.skywalking.api.util.TraceIdGenerator; public class Constants { /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java index 1a04b78bf6..4faa1b64ef 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.util.ConfigInitializer; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.util.ConfigInitializer; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.File; import java.io.FileInputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java index a4bb855fff..30d880d09c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegmentRef; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.Serializable; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java index 49fa84965c..2ff3305093 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; -import com.a.eye.skywalking.queue.TraceSegmentProcessQueue; +import com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java index a60911c27d..ea8faf001a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java @@ -1,11 +1,9 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; -import com.a.eye.skywalking.util.TraceIdGenerator; -import java.lang.reflect.Executable; +import com.a.eye.skywalking.api.util.TraceIdGenerator; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java index d1753cb2d4..b343492e1c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java similarity index 57% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java index dc1f578ed9..3f9103b72e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogResolver; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogResolver; /** * Created by wusheng on 2016/11/26. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java similarity index 96% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java index 1c71dcd81e..d5e9dfa123 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java @@ -1,6 +1,7 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; +import com.a.eye.skywalking.api.logging.api.ILog; import com.a.eye.skywalking.util.LoggingUtil; import java.net.URLEncoder; @@ -12,7 +13,7 @@ import static com.a.eye.skywalking.logging.LogLevel.*; /** * Created by xin on 16-6-23. */ -public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { +public class EasyLogger implements ILog { private Class toBeLoggerClass; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java similarity index 70% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java index 36a3945a24..4bbf171166 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; public interface IWriter { void write(String message); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java similarity index 69% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java index 61a84a5fb9..feb602e31d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; /** * Created by xin on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java similarity index 85% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java index 77a29d63ac..58fbeaef02 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; public class STDOutWriter implements IWriter { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java index bd09c64aa7..21cfd48728 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; import com.a.eye.skywalking.conf.Config; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java similarity index 88% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java index 0f62810d07..1e290aa265 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; import com.a.eye.skywalking.conf.Config; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java index ccf1c3b994..7d6de38fe8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java @@ -1,8 +1,9 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; +import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.pool.TypePool.Resolution; @@ -10,7 +11,7 @@ import net.bytebuddy.pool.TypePool.Resolution; * Basic abstract class of all sky-walking auto-instrumentation plugins. *

* It provides the outline of enhancing the target class. - * If you want to know more about enhancing, you should go to see {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine} + * If you want to know more about enhancing, you should go to see {@link ClassEnhancePluginDefine} */ public abstract class AbstractClassEnhancePluginDefine { private static ILog logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java index f799eb865c..c5349b3d6f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import net.bytebuddy.pool.TypePool; import java.net.URL; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java index 9822136eb1..2c31816b1c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java index 8c690d62d2..75f45d81be 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import java.util.HashMap; import java.util.List; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java similarity index 88% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java index 7b8170fbf0..4cab724e91 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; public class PluginException extends RuntimeException { private static final long serialVersionUID = -6020188711867490724L; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java similarity index 92% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java index 52ad8a0263..415014db29 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.io.IOException; import java.net.URL; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java index d4a9c14bb6..0aebaa9312 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java index 833e3d0eba..84858e831f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.bytebuddy; +package com.a.eye.skywalking.api.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java index 6efebf36fd..6d8c8c6af5 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.bytebuddy; +package com.a.eye.skywalking.api.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java index a68a0e1d3e..401f5196e9 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java index 2663964f11..adf1fae5c6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import com.a.eye.skywalking.plugin.PluginException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java similarity index 72% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java index 0e43105762..34736fd772 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java @@ -1,15 +1,17 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** * Enhanced instance field type. * - * Any plugins({@link com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine}'s subclass) override - * {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine#getConstructorsInterceptPoints} + * Any plugins({@link AbstractClassEnhancePluginDefine}'s subclass) override + * {@link ClassEnhancePluginDefine#getConstructorsInterceptPoints} * or - * {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints} + * {@link ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints} * will add a field with this type. * * @author wusheng diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java index 0a21a58e6d..76587e3561 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java similarity index 85% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java index b1a10e9836..43e6072a5a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; public class InterceptorException extends RuntimeException { private static final long serialVersionUID = 7846035239994885019L; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java index f8d7266310..a06c38217e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java similarity index 86% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java index bfaedb9938..eaa0ffadb3 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.assist; +package com.a.eye.skywalking.api.plugin.interceptor.assist; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.InterceptorException; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; /** * {@link NoCocurrencyAceessObject} is an abstract class, diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java index c6bc9c73ba..0c44738515 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldProxy; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java similarity index 96% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 02621024f2..dbb2d3c3e5 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -1,11 +1,10 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; import com.a.eye.skywalking.plugin.PluginException; -import com.a.eye.skywalking.plugin.interceptor.*; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.implementation.MethodDelegation; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java similarity index 84% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index 1fcd98439f..97571d4dc0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -1,5 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java index 664d7dd60c..0def0d5646 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.*; import java.lang.reflect.Method; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index 6b5a468eaf..37b38c0775 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; /** * Plugins, which only need enhance class static methods. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java index c9623040c9..86b4723080 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.Origin; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java index cf866ccd5f..e5aefd6f8d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Constructor context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java similarity index 78% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java index 5f7d91673c..5de84f0d24 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldProxy; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java new file mode 100644 index 0000000000..aa8570fe5c --- /dev/null +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java @@ -0,0 +1,5 @@ +package com.a.eye.skywalking.api.plugin.interceptor.enhance; + +public interface FieldGetter { + Object getValue(); +} diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java similarity index 51% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java index 56989715e0..94a7a7ccd0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; public interface FieldSetter { void setValue(Object value); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java similarity index 79% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java index eead68ef08..2cdf2f3492 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * The instance constructor's interceptor interface. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java index ef1a4afd37..0c27f7b5ce 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Instance method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java similarity index 92% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java index 9e0dc9d8e3..86ee5709be 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * A interceptor, which intercept method's invocation. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java index db59b96eab..a81edf10a1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * This is a method return value manipulator. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java index 440ab6e825..5f4339e5d9 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java index de046c9ce7..78086bb467 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Static method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java index 238237b716..7966c9fc11 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java index e977a14259..26bedd0b21 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.interceptor.loader; +package com.a.eye.skywalking.api.plugin.interceptor.loader; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java index c653e794b0..309bc1e532 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.queue; +package com.a.eye.skywalking.api.queue; import com.a.eye.skywalking.trace.TraceSegment; import com.lmax.disruptor.EventFactory; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java index 1d3223909a..10b2420f8b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.queue; +package com.a.eye.skywalking.api.queue; import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.context.TracerContext; +import com.a.eye.skywalking.api.context.TracerContext; import com.a.eye.skywalking.context.TracerContextListener; import com.a.eye.skywalking.health.report.HealthCollector; import com.a.eye.skywalking.health.report.HeathReading; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java index b9f7b407c1..dbfc3102ca 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java index 9cb10598c3..6c43c14a9a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.lang.management.ManagementFactory; import java.net.InetAddress; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java index bf46053451..a335eaab8d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; /** * Created data xin on 2016/12/4. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java index 6db0948a3e..e68fe7c64f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import com.a.eye.skywalking.conf.Constants; import java.util.UUID; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java deleted file mode 100644 index 63a56acfd2..0000000000 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; - -public interface FieldGetter { - Object getValue(); -} diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java index 82660a7a1a..805090e07c 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import org.junit.Assert; import org.junit.Test; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java index fe9c2ba9a4..017d70cac5 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java index 2b6c56eb02..f1147fd08a 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java index 845251ad2e..15389ff9bd 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java similarity index 86% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java index b7067eb214..2f501a8d4a 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; public class BeInterceptedClass { public BeInterceptedClass(){ diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java index 6789387282..df0fe92f64 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import org.junit.Test; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java similarity index 70% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java index 06d8285c24..d7b1f98281 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java @@ -1,9 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import java.io.IOException; -import com.a.eye.skywalking.plugin.PluginResourcesResolver; - public class PluginResourceResoverTest { public static void main(String[] args) throws IOException { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java similarity index 75% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java index 0b11085893..a640985e9e 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java @@ -1,10 +1,10 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class TestAroundInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java similarity index 82% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java index 47980584dc..6e4c492a29 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java @@ -1,9 +1,11 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java similarity index 68% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java index 3384595611..cfe346d885 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; public class TestStaticAroundInterceptor implements StaticMethodsAroundInterceptor { diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java index 53264dd9ed..d165ae736f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java index 5d04f87c50..90a1eaf958 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java similarity index 93% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java index 6ef3b40fa7..22e01ebf64 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java @@ -1,15 +1,15 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; +import com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283.BugFixAcitve; +import com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283.SWBaseBean; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve; -import com.a.eye.skywalking.plugin.dubbox.bugfix.below283.SWBaseBean; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java similarity index 68% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java index 8d56f83b81..735c6868ef 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbox.bugfix.below283; +package com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283; public final class BugFixAcitve { public static boolean isActive = false; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java similarity index 81% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java index 1a343d5f65..42dca3074e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbox.bugfix.below283; +package com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283; import java.io.Serializable; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java similarity index 87% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java index 221a65c083..514dd61515 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4; +package com.a.eye.skywalking.api.plugin.httpClient.v4; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; @@ -8,8 +8,8 @@ import org.apache.http.HttpRequest; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterceptor { /** diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java index 05b4ac70ed..b4e60faa7d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.httpClient.v4; +package com.a.eye.skywalking.api.plugin.httpClient.v4; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java index c507ab152a..33f7505fec 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java similarity index 87% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java index 5e2c6cca9e..540b2fbbf2 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java index b068b71ae7..fd16161143 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java index 28e5103722..832c3390de 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java index 69213af596..100a8a37f3 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java index 0dc792bede..48dc1b55e6 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java index 613872bf04..d100efa449 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java similarity index 91% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java index 2790e09790..d20d971067 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; -import com.a.eye.skywalking.context.ContextManager; +import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.tag.Tags; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java index d0b9030585..70141c53d1 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java index b2a7efa2ac..d95766a2db 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.sql.*; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java index 8cae0bcf30..12cec2459c 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java index e7d9a8989f..1a3cd2b494 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.sql.Connection; import java.sql.ResultSet; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java index 25ed23df92..1ee9749def 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java index db029464df..e0f452d454 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java @@ -1,7 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java similarity index 75% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java index 22a36b674a..14c32bd17e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; public class H2PluginDefine extends AbstractDatabasePluginDefine { @Override diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java index e398a55b3b..a1aa965d22 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java similarity index 72% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java index 6c38e23901..577e43622d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java @@ -1,11 +1,11 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.jdbc.SWConnection; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.jdbc.SWConnection; import java.sql.Connection; import java.util.Properties; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java similarity index 80% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java index a1cecd2ad1..c286ac49fb 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; /** * Created by xin on 16/8/4. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java similarity index 80% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java index c028f0e904..05fb9e3c0c 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; /** * Created by xin on 16/8/4. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java similarity index 67% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java index 26c4da2eb4..021e2ac66e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java @@ -1,13 +1,11 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.HostAndPort; -import java.util.Set; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by xin on 16-6-12. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java similarity index 70% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java index f630bb1c2b..17a098eb79 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.HostAndPort; import java.util.Set; -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by xin on 16-6-12. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java similarity index 66% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java index dff6b2800d..b0f3a15805 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java @@ -1,13 +1,11 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.JedisShardInfo; -import java.net.URI; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by wusheng on 2016/12/1. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java similarity index 62% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java index 6b64925dc1..9ead9a34a7 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java @@ -1,13 +1,10 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import redis.clients.jedis.JedisShardInfo; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import java.net.URI; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; public class JedisConstructorInterceptor4StringArg implements InstanceConstructorInterceptor { diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java similarity index 64% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java index d5fa5ad29c..273d28075d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java @@ -1,12 +1,12 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import java.net.URI; -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by wusheng on 2016/12/1. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java index 518c9ada75..874d12a287 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java @@ -1,10 +1,10 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.assist.NoCocurrencyAceessObject; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class JedisMethodInterceptor extends NoCocurrencyAceessObject { protected static final String REDIS_CONN_INFO_KEY = "redisClusterConnInfo"; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java index 4718186f69..3153d27e8e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java similarity index 94% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java index d558218757..cfebfb4632 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.jedis.v2.define; +package com.a.eye.skywalking.api.plugin.jedis.v2.define; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.bytebuddy.AllObjectDefaultMethodsMatch; import com.a.eye.skywalking.plugin.bytebuddy.ArgumentTypeNameMatch; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java similarity index 93% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java index 651eb0908c..d4085b551a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java @@ -1,8 +1,9 @@ -package com.a.eye.skywalking.plugin.jedis.v2.define; +package com.a.eye.skywalking.api.plugin.jedis.v2.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.bytebuddy.AllObjectDefaultMethodsMatch; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java index 448a3e53d8..766351815f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java index 76590b8b35..c06cb9ba68 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java @@ -1,14 +1,13 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.URL; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java similarity index 73% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java index 104eb206cc..637a561169 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/23. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java index 89db91c744..9a1570aee0 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.URL; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java index df9272193e..e838dda1e9 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.motan.define; +package com.a.eye.skywalking.api.plugin.motan.define; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java index aec3aeca8b..4649f3a405 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java @@ -1,7 +1,8 @@ -package com.a.eye.skywalking.plugin.motan.define; +package com.a.eye.skywalking.api.plugin.motan.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java index 6a914e4a42..e46e1b6ab3 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.tomcat78x; +package com.a.eye.skywalking.api.plugin.tomcat78x; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java index 99f6458051..d353c784aa 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.tomcat78x; +package com.a.eye.skywalking.api.plugin.tomcat78x; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java index 6e26528cd8..d79b185c9f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.tomcat78x.define; +package com.a.eye.skywalking.api.plugin.tomcat78x.define; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java index bb2edba9fe..b70b9173da 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java @@ -1,10 +1,10 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java index 865dd4463e..1f06344d3e 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java index 1140baa5ce..46840d3bf4 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java @@ -1,8 +1,6 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.*; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java index 33160d00ec..6379d9685d 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java index d66ee862ae..0677d4efa6 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java @@ -1,10 +1,10 @@ package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java index b93a5214fa..8fd58f621b 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java index a285b4da21..3af85ee90c 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java @@ -3,10 +3,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.invoke.monitor.LocalMethodInvokeMonitor; import com.a.eye.skywalking.model.Span; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java index 26b3805e52..d0821a41e6 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** * @author zhangxin diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java index e7f6dc7a4d..5eb368ff0a 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/16. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java index 978d2e43b7..f8ee21cc7b 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.HashMap; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java index c575a20c74..7d79c3d1cd 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java index d11c70a74e..6b0b56dd57 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; public class SpanBuilderNewInstanceInterceptor implements InstanceConstructorInterceptor { diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java index 93794ac3f0..70846c7e0f 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.intercep import com.a.eye.skywalking.invoke.monitor.LocalMethodInvokeMonitor; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.OpenTracingLocalBuriedPointType; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java index a932c25ba0..1071743bc1 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/16. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java index 3a44e7d2f6..6fddea0c77 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.HashMap; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java index 1e026ea04c..767e1d9da9 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java index e6ea5aa441..8650449e28 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.RefContext; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java index 5ada55d394..729c555f56 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.RefContext; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.Iterator; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java index 50b88b0d75..bf6a4880f8 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java @@ -3,11 +3,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Span; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; -import com.a.eye.skywalking.toolkit.opentracing.SkyWalkingTracer; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * @author zhangxin diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java index 9dc48a0569..89f43ac7d6 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java @@ -1,12 +1,12 @@ package com.a.eye.skywalking.toolkit.activation.trace; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; /** * -- GitLab