You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/07/20 13:49:02 UTC
[skywalking] branch configInit updated (ca7d57a -> f5d1366)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch configInit
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from ca7d57a Separate config initialization in the plugin out of core level Config.
add f5d1366 Try to use SkyWalking ClassLoader to initialize the Config class.
No new revisions were added by this update.
Summary of changes:
...nitializationService.java => PluginConfig.java} | 6 +---
.../agent/core/boot/PluginConfigInitializer.java | 36 ----------------------
.../agent/core/plugin/loader/AgentClassLoader.java | 14 +++++++--
.../apm/agent/core/conf/PluginConfig.java | 34 --------------------
.../core/conf/PluginConfigInitializerTest.java | 36 ----------------------
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../skywalking/apm/agent/SkyWalkingAgent.java | 3 --
...hConfig.java => ElasticsearchPluginConfig.java} | 9 ++----
.../v5/TransportActionNodeProxyInterceptor.java | 2 +-
.../v5/TransportProxyClientInterceptor.java | 2 +-
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
...hConfig.java => ElasticsearchPluginConfig.java} | 9 ++----
...terActionFutureActionGetMethodsInterceptor.java | 4 +--
...ClusterClientPutSettingsMethodsInterceptor.java | 2 +-
.../IndicesClientCreateMethodsInterceptor.java | 2 +-
.../RestHighLevelClientGetMethodsInterceptor.java | 2 +-
...RestHighLevelClientIndexMethodsInterceptor.java | 2 +-
...estHighLevelClientSearchMethodsInterceptor.java | 2 +-
...estHighLevelClientUpdateMethodsInterceptor.java | 2 +-
...rtActionNodeProxyExecuteMethodsInterceptor.java | 2 +-
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
...ctionFutureActionGetMethodsInterceptorTest.java | 2 +-
...terClientPutSettingsMethodsInterceptorTest.java | 2 +-
.../IndicesClientCreateMethodsInterceptorTest.java | 2 +-
...stHighLevelClientGetMethodsInterceptorTest.java | 2 +-
...HighLevelClientIndexMethodsInterceptorTest.java | 2 +-
...ighLevelClientSearchMethodsInterceptorTest.java | 2 +-
...ighLevelClientUpdateMethodsInterceptorTest.java | 2 +-
...tionNodeProxyExecuteMethodsInterceptorTest.java | 2 +-
...fluxDBConfig.java => InfluxDBPluginConfig.java} | 9 ++----
.../interceptor/InfluxDBMethodInterceptor.java | 4 +--
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../{JDBCConfig.java => JDBCPluginConfig.java} | 9 ++----
.../PSSetterDefinitionOfJDBCInstrumentation.java | 2 +-
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../plugin/light4j/HandleRequestInterceptor.java | 10 +++---
...Light4JConfig.java => Light4JPluginConfig.java} | 9 ++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
...PreparedStatementExecuteMethodsInterceptor.java | 6 ++--
...aredStatementExecuteMethodsInterceptorTest.java | 4 +--
.../{MongoConfig.java => MongoPluginConfig.java} | 9 ++----
.../mongodb/v3/support/MongoOperationHelper.java | 6 ++--
.../plugin/mongodb/v3/support/MongoSpanHelper.java | 4 +--
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../v3/interceptor/v30/MongoDBInterceptorTest.java | 4 +--
.../MongoDBOperationExecutorInterceptorTest.java | 4 +--
...PreparedStatementExecuteMethodsInterceptor.java | 6 ++--
...PreparedStatementExecuteMethodsInterceptor.java | 6 ++--
.../apm/plugin/solrj/SolrClientInterceptor.java | 10 +++---
.../{SolrJConfig.java => SolrJPluginConfig.java} | 9 ++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../plugin/solrj/SolrClientInterceptorTest.java | 14 ++++-----
...ngMVCConfig.java => SpringMVCPluginConfig.java} | 9 ++----
.../interceptor/AbstractMethodInterceptor.java | 12 ++++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../plugin/tomcat78x/TomcatInvokeInterceptor.java | 8 ++---
.../{TomcatConfig.java => TomcatPluginConfig.java} | 9 ++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
...ervice.java => ToolkitPluginConfigService.java} | 9 ++----
.../trace/TraceAnnotationMethodInterceptor.java | 4 +--
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
...ngConfig.java => JDKThreadingPluginConfig.java} | 9 ++----
.../apm/plugin/jdk/threading/ThreadingConfig.java | 2 +-
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../customize/conf/CustomizeConfiguration.java | 10 +++---
...ConfigService.java => PluginConfigService.java} | 9 ++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
.../GetTransactionMethodInterceptor.java | 2 +-
...ringTXConfig.java => SpringTXPluginConfig.java} | 9 ++----
...apm.agent.core.boot.ConfigInitializationService | 19 ------------
70 files changed, 117 insertions(+), 551 deletions(-)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/{ConfigInitializationService.java => PluginConfig.java} (87%)
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/PluginConfigInitializer.java
delete mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/PluginConfig.java
delete mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/PluginConfigInitializerTest.java
delete mode 100644 apm-sniffer/apm-agent-core/src/test/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/{ElasticsearchConfig.java => ElasticsearchPluginConfig.java} (83%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/{ElasticsearchConfig.java => ElasticsearchPluginConfig.java} (83%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/influxdb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/influxdb/{InfluxDBConfig.java => InfluxDBPluginConfig.java} (82%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/influxdb-2.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/{JDBCConfig.java => JDBCPluginConfig.java} (92%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/{Light4JConfig.java => Light4JPluginConfig.java} (83%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/{MongoConfig.java => MongoPluginConfig.java} (87%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/{SolrJConfig.java => SolrJPluginConfig.java} (85%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/{SpringMVCConfig.java => SpringMVCPluginConfig.java} (88%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/{TomcatConfig.java => TomcatPluginConfig.java} (87%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/{ToolkitConfigService.java => ToolkitPluginConfigService.java} (83%)
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/{JDKThreadingConfig.java => JDKThreadingPluginConfig.java} (84%)
delete mode 100644 apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/{ConfigService.java => PluginConfigService.java} (86%)
delete mode 100644 apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService
rename apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/{SpringTXConfig.java => SpringTXPluginConfig.java} (83%)
delete mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.ConfigInitializationService