53e8608832
Merge branch 'master' into 6.0
...
# Conflicts:
# .gitignore
# LICENSE
# README.md
# README_ZH.md
# apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
# apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
# apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
# apm-application-toolkit/apm-toolkit-opentracing/pom.xml
# apm-application-toolkit/apm-toolkit-trace/pom.xml
# apm-application-toolkit/pom.xml
# apm-checkstyle/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/pom.xml
# apm-collector/apm-collector-agent/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml
# apm-collector/apm-collector-analysis/pom.xml
# apm-collector/apm-collector-boot/pom.xml
# apm-collector/apm-collector-boot/src/main/resources/component-libraries.yml
# apm-collector/apm-collector-cache/collector-cache-caffeine-provider/pom.xml
# apm-collector/apm-collector-cache/collector-cache-define/pom.xml
# apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
# apm-collector/apm-collector-cache/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
# apm-collector/apm-collector-cluster/pom.xml
# apm-collector/apm-collector-component/client-component/pom.xml
# apm-collector/apm-collector-component/pom.xml
# apm-collector/apm-collector-component/server-component/pom.xml
# apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
# apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
# apm-collector/apm-collector-configuration/pom.xml
# apm-collector/apm-collector-core/pom.xml
# apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
# apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
# apm-collector/apm-collector-grpc-manager/pom.xml
# apm-collector/apm-collector-instrument/pom.xml
# apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
# apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
# apm-collector/apm-collector-jetty-manager/pom.xml
# apm-collector/apm-collector-naming/collector-naming-define/pom.xml
# apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
# apm-collector/apm-collector-naming/pom.xml
# apm-collector/apm-collector-remote/collector-remote-define/pom.xml
# apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
# apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
# apm-collector/apm-collector-remote/pom.xml
# apm-collector/apm-collector-storage/collector-storage-define/pom.xml
# apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
# apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
# apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/pom.xml
# apm-collector/apm-collector-storage/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/pom.xml
# apm-collector/apm-collector-ui/collector-ui-define/pom.xml
# apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml
# apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
# apm-collector/apm-collector-ui/pom.xml
# apm-collector/pom.xml
# apm-commons/apm-datacarrier/pom.xml
# apm-commons/apm-util/pom.xml
# apm-commons/pom.xml
# apm-dist/pom.xml
# apm-protocol/apm-network/pom.xml
# apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
# apm-protocol/apm-ui-protocol/pom.xml
# apm-protocol/pom.xml
# apm-sniffer/apm-agent-core/pom.xml
# apm-sniffer/apm-agent/pom.xml
# apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
# apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
# apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
# apm-sniffer/apm-test-tools/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/pom.xml
# apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
# apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml
# apm-sniffer/optional-plugins/pom.xml
# apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml
# apm-sniffer/pom.xml
# apm-webapp/pom.xml
# docs/README.md
# docs/README_ZH.md
# docs/cn/Direct-uplink-CN.md
# docs/cn/How-to-build-CN.md
# docs/cn/Optional-plugins-CN.md
# docs/users.md
# pom.xml
2018-08-25 22:08:19 +08:00
60e829fa30
Add the function of the specified agent config
2018-08-25 21:41:42 +08:00
6e6e13b9f5
add the function of the specified agent config ( #1584 )
...
* Fix bug stop stopSpan when not createSpan
* Fix bug stop stopSpan when not createSpan
* change the agent log level to millisecond
* add the function of the specified-agent-config
* Update README_ZH.md
* Use -D to set the specified config path
* add docs
* update docs
* change method name
* add link
* change the function name
* change the key
* format doc
2018-08-25 19:00:27 +08:00
47cba6c56c
Moved hardcoded dependency versions to properties tag in pom.xml ( #1583 )
2018-08-24 10:18:48 +08:00
15263bce89
Moved hardcoded dependency versions to properties tag in pom.xml ( #1583 )
2018-08-24 09:28:25 +08:00
6fe2fa0c4b
change the agent log level to millisecond ( #1580 )
...
* Fix bug stop stopSpan when not createSpan
* Fix bug stop stopSpan when not createSpan
* change the agent log level to millisecond
2018-08-23 21:49:16 +08:00
31e4ceb0b1
change the agent log level to millisecond ( #1580 )
...
* Fix bug stop stopSpan when not createSpan
* Fix bug stop stopSpan when not createSpan
* change the agent log level to millisecond
2018-08-23 17:17:27 +08:00
4b17685c11
Sync mvnw to 6.0 , provided by @adriancole
2018-08-22 22:50:50 +08:00
b3959202df
[Agent] Provide plugin for Elasticsearch 5.x ( #1500 )
...
* [Agent] Provide plugin for Elasticsearch 5.x
Add [Agent] Elasticsearch transport client plugin
fix component name
add elasticsearch component
add elasticSearch component into component-libraries.yml
* update support list
* update PlainListenableActionFutureInterceptor.java
* fix set span attributes
* clear runtimeContext
* remove extra plugins
2018-08-22 20:23:43 +08:00
d0b951649f
Moves to Maven wrapper to stabilize the version in use ( #1569 )
...
* Moves to Maven wrapper to stabilize the version in use
This will ensure those building will have similar experience due to
having a fixed maven version.
* Updates most plugin versions and removes redundant configuration
* Sets up build enforcement for JDK 1.8 until further work occurs
2018-08-22 19:04:15 +08:00
d1cdeecc3f
Support ojdbc8 ( #1571 )
2018-08-22 17:44:32 +08:00
1c8431c86f
Support ojdbc8 ( #1571 )
2018-08-22 17:43:57 +08:00
ba92364a65
Fix bug stop stopSpan when not createSpan in Spring Callback ( #1572 )
...
* Fix bug stop stopSpan when not createSpan
2018-08-22 14:33:12 +08:00
18d2d352fd
Fix bug stop stopSpan when not createSpan in Spring Callback ( #1572 )
...
* Fix bug stop stopSpan when not createSpan
2018-08-22 14:30:58 +08:00
26cebf74ad
Fix #1549 ( #1568 )
2018-08-21 13:53:52 +08:00
0162fdd8ae
Fix #1549 ( #1568 )
2018-08-21 13:53:00 +08:00
7c2aa4c43a
FIX NPE in tomcat plugin ForwardInterceptor ( #1562 )
2018-08-21 12:11:40 +08:00
dd942d15a3
FIX NPE in tomcat plugin ForwardInterceptor ( #1562 )
2018-08-21 07:18:40 +08:00
4c04a599c4
All of the inventory register test success.
2018-08-18 14:14:28 +08:00
1ec420b0fd
Remove collector.servers and collector.direct_servers, and add collector.backend_service setting. cc @ascrutae
2018-08-15 22:08:30 +08:00
e8456c0f83
Fix operation name is empty issue ( #1525 )
2018-08-06 16:27:40 +08:00
42028e60ae
Fix operation name is empty issue ( #1525 )
2018-08-06 16:23:38 +08:00
bfef7d3bca
Fix CI.
2018-08-05 18:47:31 +08:00
05b25f7b74
Update ActiveMQConsumerInterceptor.java ( #1523 )
2018-08-05 18:31:24 +08:00
6bea7abe98
Update ActiveMQProducerInterceptor.java ( #1522 )
2018-08-05 18:30:54 +08:00
29c0a97251
Update ActiveMQConsumerInterceptor.java ( #1523 )
2018-08-05 08:47:28 +08:00
789cdce759
Update ActiveMQProducerInterceptor.java ( #1522 )
2018-08-05 07:25:55 +08:00
da2189e598
[Agent] Add plugin for ActiveMQ 5.x ( #1513 )
...
* add activemq-plugin
* fix update ActiveMQConsumerInstrumentation Enhance another class
* refacor ActiveMQConsumerInstrumentation code
* support both topic and queue
* clear the code
* add UnitTest add fix bug
* fix obtain url bug
* Refactor the ActiveMQProducerInstrumentation code
* fix bug
* fix ConstructorInterceptor BUG
* add Licensed
* Update application.yml
Restore configuration
* Restore configuration
* perfect test
* fix
* fix License
* fix Project Files
* fix import class in instrumentation
* fix test case
* fix java doc
* fix Trigger CI
* fix ActiveMQConsumerAndProducerConstructorInterceptorTest
* delete unit test
* fix
* fix
* fix folder directory problem
* Delete ActiveMQConsumerInstrumentation.java
2018-08-04 20:13:00 +08:00
1d39614b00
[Agent] Add plugin for ActiveMQ 5.x ( #1513 )
...
* add activemq-plugin
* fix update ActiveMQConsumerInstrumentation Enhance another class
* refacor ActiveMQConsumerInstrumentation code
* support both topic and queue
* clear the code
* add UnitTest add fix bug
* fix obtain url bug
* Refactor the ActiveMQProducerInstrumentation code
* fix bug
* fix ConstructorInterceptor BUG
* add Licensed
* Update application.yml
Restore configuration
* Restore configuration
* perfect test
* fix
* fix License
* fix Project Files
* fix import class in instrumentation
* fix test case
* fix java doc
* fix Trigger CI
* fix ActiveMQConsumerAndProducerConstructorInterceptorTest
* delete unit test
* fix
* fix
* fix folder directory problem
* Delete ActiveMQConsumerInstrumentation.java
2018-08-04 14:14:50 +08:00
5eea1ae767
Fix #1488 : Fix NPE when the targetAop class is null ( #1507 )
2018-07-31 22:37:26 +08:00
a5d2610392
Fix #1488 : Fix NPE when the targetAop class is null ( #1507 )
2018-07-31 22:36:40 +08:00
291e799190
Cherry-pick from commit 56d7fe4ed7
2018-07-24 15:02:26 +08:00
56d7fe4ed7
Fix RuntimeContext cannot store anything when the trace is not creat ( #1480 )
...
* Fix RuntimeContext cannot store anything when the trace is not create
* Add RuntimecontextSnapshot and remove debug info
2018-07-24 14:39:56 +08:00
1c3606a832
Change the way to transmit the Request and Response ( #1471 )
2018-07-19 07:21:49 +08:00
d38b208c9e
Fix #1454 : fix NPE issue about spring apo interceptor ( #1467 )
2018-07-18 10:20:39 +08:00
630e62312c
Fix #1454 : fix NPE issue about spring apo interceptor ( #1467 )
2018-07-18 10:19:35 +08:00
48348efe74
@lemon @ascrutae I change the proto file path for preparing 6.0, but didn't change .net namespace. But I think if you sync the protocol submodule, you still need some changes.
2018-07-17 14:20:58 +08:00
44fc3e0742
Adjust and modify the catalog and doc under Supported-list.md ( #1445 )
...
* first commit
* ad
* add
* add
* add
* add
* add
* add
* add
* add
* add
* add
* add
* 调整和修改中间件，框架与类库支持列表 目录文档
* add
* add
* 修改Incubating
* add
2018-07-13 23:22:50 -07:00
6b99abffff
[Agent] Apache http client plugin bug ( #1448 ) ( #1452 )
...
* #1447
Fixed the after method interceptor for the apache http client NPE error when the response is null cause by the doExecute method throw a exception.
2018-07-13 13:48:37 +08:00
b8206b8cec
[Agent] Apache http client plugin bug ( #1448 )
...
* #1447
Fixed the after method interceptor for the apache http client NPE error when the response is null cause by the doExecute method throw a exception.
2018-07-12 22:02:59 -07:00
e0979ceed7
Update version to RC ( #1446 )
...
* Change version
2018-07-11 15:53:33 -07:00
d2753037bb
Upgrade version to 6.0.0 alpha.
2018-07-07 10:46:41 +08:00
1b74d1d842
Fix #1361 : Remove the SkywalkingDynamicField property ( #1375 )
2018-06-21 11:29:06 +08:00
e36de08ee2
Fix #1356 : Remove unused depencies package ( #1357 )
2018-06-16 18:11:59 +08:00
787c64ec0d
fix spymemcached plugin can't work ( #1354 )
2018-06-15 13:07:09 +08:00
cab42447a7
fix lowerCaseUrl ( #1342 )
2018-06-12 13:12:28 +08:00
6ad2f53ac0
fix operation name ( #1343 )
2018-06-12 12:26:35 +08:00
65299892e3
Change index page of Incubating and optional plugin documents ( #1340 )
...
* Reorganize incubating and optional docs.
2018-06-11 22:50:20 +08:00
1b83b34401
Relied on grpc response for certain, to avoid OOM when collector is overloaded. ( #1323 )
2018-06-10 22:00:49 +08:00
0f0b56db61
Fix #1280 : Modify tomcat interceptor ( #1325 )
2018-06-10 18:17:03 +08:00
Wu Sheng
caoyixiong
Fatih ERDEM
Adrian Cole
oatiz
Xin,Zhang
peng-yongsheng
XiaoFu
xinzhuxiansheng
coder-yqj
lican