Skip to content

Commit 14a45ea

Browse files
Fix muzzle CI step (#7746)
* fix: Fix OOM writeMuzzleTasksToFile gradle task * fix: Set minimun supported version for protobuf instrumentation * feat: Restore muzzle as PR check requirement
1 parent 2a9a4b7 commit 14a45ea

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.circleci/config.continue.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ jobs:
782782
name: Gather muzzle tasks
783783
command: >-
784784
SKIP_BUILDSCAN="true"
785+
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
785786
./gradlew writeMuzzleTasksToFile
786787
<< pipeline.parameters.gradle_flags >>
787788
--max-workers=3
@@ -1434,6 +1435,7 @@ build_test_jobs: &build_test_jobs
14341435
{% for jdk in all_jdks %}
14351436
- "test_{{ jdk }}"
14361437
{% endfor %}
1438+
- muzzle
14371439
- profiling
14381440
- debugger
14391441
- system-tests

dd-java-agent/instrumentation/protobuf/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ muzzle {
88
pass {
99
group = "com.google.protobuf"
1010
module = "protobuf-java"
11-
versions = "[,)"
11+
versions = "[2.0.0,)"
12+
skipVersions = ["2.0.1", "2.1.0", "2.2.0", "2.3.0", "2.4.1"]
1213
assertInverse = true
1314
}
1415
}

0 commit comments

Comments
 (0)