Wu Sheng
|
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 |
Fatih ERDEM
|
47cba6c56c
|
Moved hardcoded dependency versions to properties tag in pom.xml (#1583)
|
2018-08-24 10:18:48 +08:00 |
|
Fatih ERDEM
|
15263bce89
|
Moved hardcoded dependency versions to properties tag in pom.xml (#1583)
|
2018-08-24 09:28:25 +08:00 |
caoyixiong
|
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 |
|
caoyixiong
|
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 |
Xin,Zhang
|
26cebf74ad
|
Fix #1549 (#1568)
|
2018-08-21 13:53:52 +08:00 |
|
Xin,Zhang
|
0162fdd8ae
|
Fix #1549 (#1568)
|
2018-08-21 13:53:00 +08:00 |
|
Xin,Zhang
|
5eea1ae767
|
Fix #1488: Fix NPE when the targetAop class is null (#1507)
|
2018-07-31 22:37:26 +08:00 |
|
Xin,Zhang
|
a5d2610392
|
Fix #1488: Fix NPE when the targetAop class is null (#1507)
|
2018-07-31 22:36:40 +08:00 |
|
Xin,Zhang
|
291e799190
|
Cherry-pick from commit 56d7fe4ed7
|
2018-07-24 15:02:26 +08:00 |
|
Xin,Zhang
|
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 |
|
Xin,Zhang
|
1c3606a832
|
Change the way to transmit the Request and Response (#1471)
|
2018-07-19 07:21:49 +08:00 |
|
Xin,Zhang
|
d38b208c9e
|
Fix #1454: fix NPE issue about spring apo interceptor (#1467)
|
2018-07-18 10:20:39 +08:00 |
|
Xin,Zhang
|
630e62312c
|
Fix #1454: fix NPE issue about spring apo interceptor (#1467)
|
2018-07-18 10:19:35 +08:00 |
|
吴晟 Wu Sheng
|
e0979ceed7
|
Update version to RC (#1446)
* Change version
|
2018-07-11 15:53:33 -07:00 |
peng-yongsheng
|
d2753037bb
|
Upgrade version to 6.0.0 alpha.
|
2018-07-07 10:46:41 +08:00 |
|
Xin,Zhang
|
1b74d1d842
|
Fix #1361: Remove the SkywalkingDynamicField property (#1375)
|
2018-06-21 11:29:06 +08:00 |
lican
|
6ad2f53ac0
|
fix operation name (#1343)
|
2018-06-12 12:26:35 +08:00 |
|
Xin,Zhang
|
0f0b56db61
|
Fix #1280: Modify tomcat interceptor (#1325)
|
2018-06-10 18:17:03 +08:00 |
SevenPointOld
|
2c822363cb
|
Spring mvc plugin auto add '/' if necessary (#1315)
* spring mvc plugin auto add '/' if necessary
|
2018-06-06 15:41:30 +08:00 |
|
Xin,Zhang
|
a835fe4ec5
|
Fix occure the NPE when SpringMVC and hystrix work together (#1256)
|
2018-05-24 13:36:38 +08:00 |
|
吴晟 Wu Sheng
|
a6e04c97ec
|
Update version to beta2 for next iteration. (#1233)
|
2018-05-16 21:21:30 +08:00 |
lican
|
406d9dfb6d
|
Spring aop patch (#1118)
* spring aop patch #1114
* more strict check
|
2018-04-26 21:07:18 +08:00 |
|
吴晟 Wu Sheng
|
e13ff79326
|
Sync to fix release check (#982)
Fix IPMC checks for releasing.
|
2018-03-24 17:11:04 +08:00 |
|
吴晟 Wu Sheng
|
08267611a2
|
Prepare beta iteratoration (#944)
* [maven-release-plugin] prepare release apm-5.0.0-alpha
* [maven-release-plugin] prepare for next development iteration
|
2018-03-13 23:47:38 -05:00 |
|
Xin,Zhang
|
0ddec9c6a4
|
[Agent] fix the interceptor package name is incorrect (#897)
|
2018-03-07 15:19:50 +08:00 |
ascrutae
|
0d6233dd54
|
[Agent] fix that javadoc import unused class cause classloader issue
|
2018-02-27 11:29:18 +08:00 |
|
wusheng
|
f7fdd9f854
|
Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release.
|
2018-02-26 23:22:10 +08:00 |
|
wu-sheng
|
1d6ca31b62
|
Commit many java doc fixes.
|
2018-02-26 12:01:24 +08:00 |
YunaiV
|
44a5526c78
|
fixes #735 Concurrency conflicts in Spring plugin
* EnhanceRequireObjectCache add clearRequestAndResponse method
* invoke EnhanceRequireObjectCache clearRequestAndResponse At AbstractMethodInterceptor
|
2018-01-11 20:51:19 +08:00 |
|
YunaiV
|
647f4f00a7
|
fixes #735 Concurrency conflicts in Spring plugin ：clear ThreadLocal
|
2018-01-11 16:22:37 +08:00 |
YunaiV
|
8854921f9e
|
fixes #735 Concurrency conflicts in Spring plugin
|
2018-01-11 09:48:42 +08:00 |
|
ascrutae
|
4e64362173
|
[Agent] fix the spring plugin doesn't work
|
2018-01-05 11:03:03 +08:00 |
|
ascrutae
|
10d55860db
|
[Agent] fix the remote port is incorrect
|
2017-12-31 10:48:02 +08:00 |
|
ascrutae
|
fe5ff26d09
|
[Agent] Fix interceptor class about concurrent plugin is incorrect
|
2017-12-30 15:49:33 +08:00 |
gaohongtao
|
318c3db7c9
|
Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha`
|
2017-12-15 10:40:23 +08:00 |
|
ascrutae
|
a4b49b28b4
|
fix issue that the intercept class and the enhance class package name of the trace annotation plugin is incorrect
|
2017-12-13 18:38:45 +08:00 |
|
ascrutae
|
a62076f082
|
fix all interceptor class in plugin is incorrect
|
2017-12-12 14:16:45 +08:00 |
|
吴晟 Wu Sheng
|
032ade6e3c
|
Merge pull request #656 from ascrutae/feature/plugin-def-incorrect
fix the instrumentation class in plugin define file is incorrect
|
2017-12-11 16:05:10 +08:00 |
|
ascrutae
|
b5a7c8fbf0
|
fix the instrumentation class in plugin define file is incorrect
|
2017-12-11 16:00:15 +08:00 |
|
wusheng
|
15328202b8
|
Revove duplicate license headers.
|
2017-12-11 15:04:26 +08:00 |
|
wusheng
|
05b818e709
|
Update package name to org.apache.skywalking
|
2017-12-10 16:32:39 +08:00 |
|
wusheng
|
b16d23c148
|
Update artifactId to "org.apache.skywalking"
|
2017-12-10 08:21:20 +08:00 |
|
wusheng
|
23133f7d97
|
Update copyright to Apache Foundation.
|
2017-12-09 23:38:32 +08:00 |
|
wusheng
|
d458622bb4
|
Update version to 5.0-2018-preview for new iteration.
|
2017-12-06 22:06:54 +08:00 |
|
ascrutae
|
b02a873466
|
support spring mvc spring 4.0 framework
|
2017-12-06 11:55:12 +08:00 |
|
ascrutae
|
4c7eda8e38
|
fix match failed issue
|
2017-12-05 13:41:19 +08:00 |
|
Xin,Zhang
|
a086804753
|
Merge branch 'master' into fix/match-failed
|
2017-12-05 01:02:21 +08:00 |
|
ascrutae
|
e63e033263
|
fix match failed issue
|
2017-12-05 00:56:58 +08:00 |
|
wusheng
|
055c760bc0
|
Set versions, and documents ready for releasing 3.2.6
|
2017-12-04 22:04:28 +08:00 |