Skip to content

Commit 998d151

Browse files
Copilottrasklaurit
authored
Remove unnecessary muzzle skip versions after lenient resolution change (open-telemetry#16830)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: trask <218610+trask@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
1 parent 1163e7b commit 998d151

37 files changed

Lines changed: 0 additions & 117 deletions

File tree

instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ muzzle {
77
group.set("com.alibaba")
88
module.set("druid")
99
versions.set("(,)")
10-
skip("1.0.30")
1110
}
1211
}
1312

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ muzzle {
2020
module.set("dropwizard-client")
2121
versions.set("(,3.0.0)")
2222
assertInverse.set(true)
23-
// Could not find com.google.code.findbugs:jsr305:.
24-
skip("3.0.2", "4.0.2")
2523
}
2624
}
2725

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ muzzle {
1717
excludeInstrumentationName("aws-sdk-2.2-sqs")
1818
excludeInstrumentationName("aws-sdk-2.2-sns")
1919
excludeInstrumentationName("aws-sdk-2.2-lambda")
20-
21-
// several software.amazon.awssdk artifacts are missing for this version
22-
skip("2.17.200")
2320
}
2421

2522
fail {
@@ -33,9 +30,6 @@ muzzle {
3330
// "fail" asserts that *all* the instrumentation modules fail to load, but the core one is
3431
// actually expected to succeed, so exclude it from checks.
3532
excludeInstrumentationName("aws-sdk-2.2-core")
36-
37-
// several software.amazon.awssdk artifacts are missing for this version
38-
skip("2.17.200")
3933
}
4034

4135
pass {
@@ -49,9 +43,6 @@ muzzle {
4943
excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
5044
excludeInstrumentationName("aws-sdk-2.2-sns")
5145
excludeInstrumentationName("aws-sdk-2.2-lambda")
52-
53-
// several software.amazon.awssdk artifacts are missing for this version
54-
skip("2.17.200")
5546
}
5647

5748
pass {
@@ -65,9 +56,6 @@ muzzle {
6556
excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
6657
excludeInstrumentationName("aws-sdk-2.2-sqs")
6758
excludeInstrumentationName("aws-sdk-2.2-lambda")
68-
69-
// several software.amazon.awssdk artifacts are missing for this version
70-
skip("2.17.200")
7159
}
7260
pass {
7361
group.set("software.amazon.awssdk")
@@ -80,9 +68,6 @@ muzzle {
8068
excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
8169
excludeInstrumentationName("aws-sdk-2.2-sqs")
8270
excludeInstrumentationName("aws-sdk-2.2-sns")
83-
84-
// several software.amazon.awssdk artifacts are missing for this version
85-
skip("2.17.200")
8671
}
8772
pass {
8873
group.set("software.amazon.awssdk")

instrumentation/c3p0-0.9/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ muzzle {
77
group.set("com.mchange")
88
module.set("c3p0")
99
versions.set("(,)")
10-
// these versions have missing dependencies in maven central
11-
skip("0.9.2-pre2-RELEASE", "0.9.2-pre3")
1210
}
1311
}
1412

instrumentation/camel-2.20/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ muzzle {
88
module.set("camel-core")
99
versions.set("[2.19,3)")
1010
assertInverse.set(true)
11-
// https://repo.maven.apache.org/maven2/org/apache/camel/core/4.12.0/core-4.12.0.pom is missing
12-
skip("4.12.0")
1311
}
1412
}
1513

instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ muzzle {
77
group.set("com.couchbase.client")
88
module.set("java-client")
99
versions.set("[3.1.6,3.2.0)")
10-
// these versions were released as ".bundle" instead of ".jar"
11-
skip("2.7.5", "2.7.8")
1210
assertInverse.set(true)
1311
}
1412
}

instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ muzzle {
77
group.set("com.couchbase.client")
88
module.set("java-client")
99
versions.set("[3.1,3.1.6)")
10-
// these versions were released as ".bundle" instead of ".jar"
11-
skip("2.7.5", "2.7.8")
1210
assertInverse.set(true)
1311
}
1412
}

instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ muzzle {
77
group.set("com.couchbase.client")
88
module.set("java-client")
99
versions.set("[3.2.0,3.4.0)")
10-
// these versions were released as ".bundle" instead of ".jar"
11-
skip("2.7.5", "2.7.8")
1210
assertInverse.set(true)
1311
}
1412
}

instrumentation/couchbase/couchbase-3.4/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ muzzle {
77
group.set("com.couchbase.client")
88
module.set("java-client")
99
versions.set("[3.4.0,)")
10-
// these versions were released as ".bundle" instead of ".jar"
11-
skip("2.7.5", "2.7.8")
1210
assertInverse.set(true)
1311
}
1412
}

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ muzzle {
77
group.set("org.elasticsearch.client")
88
module.set("transport")
99
versions.set("[5.0.0,5.3.0)")
10-
// version 7.11.0 depends on org.elasticsearch:elasticsearch:7.11.0 which depends on
11-
// org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist
12-
// version 7.17.8 has broken module metadata
13-
skip("7.11.0", "7.17.8")
1410
// version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist
1511
excludeDependency("org.elasticsearch:elasticsearch-preallocate")
1612
assertInverse.set(true)
@@ -19,9 +15,6 @@ muzzle {
1915
group.set("org.elasticsearch")
2016
module.set("elasticsearch")
2117
versions.set("[5.0.0,5.3.0)")
22-
// version 7.11.0 depends on org.elasticsearch:elasticsearch:7.11.0 which depends on
23-
// org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist
24-
skip("7.11.0")
2518
// version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist
2619
excludeDependency("org.elasticsearch:elasticsearch-preallocate")
2720
assertInverse.set(true)

0 commit comments

Comments
 (0)