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/03/25 01:58:28 UTC
[skywalking] branch master updated: Add missing `@Repeatable` to
`@Tag` annotation (#4567)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 72f46f7 Add missing `@Repeatable` to `@Tag` annotation (#4567)
72f46f7 is described below
commit 72f46f749989a08089325fde3149a0a67fed9abd
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Mar 25 09:58:16 2020 +0800
Add missing `@Repeatable` to `@Tag` annotation (#4567)
* Add missing `@Repeatable` to `@Tag` annotation
* Remove some verified minor versions to speed up plugin tests
---
.../apache/skywalking/apm/toolkit/trace/Tag.java | 2 ++
.../finagle-17.10.x-scenario/support-version.list | 11 --------
.../scenarios/jetty-scenario/support-version.list | 29 ----------------------
.../mongodb-3.x-scenario/support-version.list | 8 ------
.../scenarios/mysql-scenario/support-version.list | 23 -----------------
.../support-version.list | 21 +---------------
6 files changed, 3 insertions(+), 91 deletions(-)
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
index ea43c38..22917d4 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.apm.toolkit.trace;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -31,6 +32,7 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Tags.class)
public @interface Tag {
/**
* @return the key of the tag to be injected into the current active span
diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list b/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list
index ecd0fac..74652e1 100644
--- a/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list
+++ b/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list
@@ -15,30 +15,19 @@
# limitations under the License.
17.10.0
-17.11.0
17.12.0
18.1.0
-18.2.0
18.3.0
-18.4.0
18.5.0
-18.6.0
18.7.0
-18.8.0
-18.9.0
18.9.1
18.10.0
18.11.0
18.12.0
19.1.0
-19.2.0
19.3.0
-19.4.0
19.5.0
-19.5.1
-19.6.0
19.7.0
-19.8.0
19.9.0
19.10.0
19.11.0
diff --git a/test/plugin/scenarios/jetty-scenario/support-version.list b/test/plugin/scenarios/jetty-scenario/support-version.list
index 8479160..ed8958a 100644
--- a/test/plugin/scenarios/jetty-scenario/support-version.list
+++ b/test/plugin/scenarios/jetty-scenario/support-version.list
@@ -15,65 +15,36 @@
# limitations under the License.
9.4.8.v20171121
-9.4.7.v20170914
9.4.6.v20170531
-9.4.5.v20170502
9.4.4.v20170414
-9.4.3.v20170317
9.4.2.v20170220
-9.4.1.v20170120
9.4.0.v20161208
9.3.22.v20171030
-9.3.21.v20170918
9.3.20.v20170531
-9.3.19.v20170502
9.3.18.v20170406
-9.3.17.v20170317
9.3.16.v20170120
-9.3.15.v20161220
9.3.14.v20161028
-9.3.13.v20161014
9.3.12.v20160915
-9.3.11.v20160721
9.3.10.v20160621
9.3.9.v20160517
-9.3.8.v20160314
9.3.7.v20160115
-9.3.6.v20151106
9.3.5.v20151012
-9.3.4.v20151007
9.3.3.v20150827
-9.3.2.v20150730
9.3.1.v20150714
9.3.0.v20150612
9.2.23.v20171218
-9.2.22.v20170606
9.2.21.v20170120
-9.2.20.v20161216
9.2.19.v20160908
-9.2.18.v20160721
9.2.17.v20160517
-9.2.16.v20160414
9.2.15.v20160210
-9.2.14.v20151106
9.2.13.v20150730
-9.2.12.v20150709
9.2.11.v20150529
-9.2.10.v20150310
9.2.9.v20150224
-9.2.8.v20150217
9.2.7.v20150116
-9.2.6.v20141205
9.2.5.v20141112
-9.2.4.v20141103
9.2.3.v20140905
-9.2.2.v20140723
9.2.1.v20140609
-9.2.0.v20140526
9.1.6.v20160112
-9.1.5.v20140505
9.1.4.v20140401
-9.1.3.v20140225
9.1.2.v20140210
-9.1.1.v20140108
9.1.0.v20131115
diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/support-version.list b/test/plugin/scenarios/mongodb-3.x-scenario/support-version.list
index b176995..c84abc8 100644
--- a/test/plugin/scenarios/mongodb-3.x-scenario/support-version.list
+++ b/test/plugin/scenarios/mongodb-3.x-scenario/support-version.list
@@ -15,24 +15,16 @@
# limitations under the License.
3.4.0
-3.4.1
3.4.2
-3.4.3
3.5.0
3.6.0
-3.6.1
3.6.2
-3.6.3
3.6.4
3.7.0
-3.7.1
3.8.0
-3.8.1
3.8.2
3.9.0
-3.9.1
3.10.0
-3.10.1
3.10.2
3.11.0
3.11.1
\ No newline at end of file
diff --git a/test/plugin/scenarios/mysql-scenario/support-version.list b/test/plugin/scenarios/mysql-scenario/support-version.list
index b099c65..4768268 100644
--- a/test/plugin/scenarios/mysql-scenario/support-version.list
+++ b/test/plugin/scenarios/mysql-scenario/support-version.list
@@ -22,50 +22,27 @@
8.0.12
8.0.11
6.0.6
-6.0.5
6.0.4
-6.0.3
6.0.2
-5.1.45
5.1.44
-5.1.43
5.1.42
-5.1.41
5.1.40
-5.1.39
5.1.38
-5.1.37
5.1.36
-5.1.35
5.1.34
-5.1.33
5.1.32
-5.1.31
5.1.30
-5.1.29
5.1.28
-5.1.27
5.1.26
-5.1.25
5.1.24
-5.1.23
5.1.22
-5.1.21
5.1.20
-5.1.19
5.1.18
-5.1.17
5.1.16
-5.1.15
5.1.14
-5.1.13
5.1.12
-5.1.11
5.1.10
-5.1.9
5.1.8
5.1.6
-5.1.5
5.1.4
-5.1.3
5.1.2
\ No newline at end of file
diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/support-version.list b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/support-version.list
index 9287a4b..c4d79d0 100644
--- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/support-version.list
+++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/support-version.list
@@ -13,65 +13,46 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
9.4.1207
-9.4.1207.jre6
9.4.1207.jre7
9.4.1208
-9.4.1208.jre6
9.4.1208.jre7
9.4.1209
-9.4.1209.jre6
9.4.1209.jre7
9.4.1210
-9.4.1210.jre6
9.4.1210.jre7
9.4.1211
-9.4.1211.jre6
9.4.1211.jre7
9.4.1212
-9.4.1212.jre6
9.4.1212.jre7
-42.0.0.jre6
42.0.0.jre7
42.0.0
42.1.0.jre7
42.1.0
-42.1.1.jre6
42.1.1.jre7
42.1.1
-42.1.2.jre6
42.1.2.jre7
42.1.2
-42.1.3.jre6
42.1.3.jre7
42.1.3
-42.1.4.jre6
42.1.4.jre7
42.1.4
-42.2.0.jre6
42.2.0.jre7
42.2.0
-42.2.1.jre6
42.2.1.jre7
42.2.1
-42.2.2.jre6
42.2.2.jre7
42.2.2
-42.2.3.jre6
42.2.3.jre7
42.2.3
-42.2.4.jre6
42.2.4.jre7
42.2.4
-42.2.5.jre6
42.2.5.jre7
42.2.5
-42.2.6.jre6
42.2.6.jre7
42.2.6
-42.2.7.jre6
42.2.7.jre7
42.2.7
-42.2.8.jre6
42.2.8.jre7
42.2.8