From 91f1bef6f4b62d12511d0ffe4332442350b66892 Mon Sep 17 00:00:00 2001 From: Andrew Kent Date: Thu, 29 Nov 2018 16:18:14 -0800 Subject: [PATCH] Simplify AWS muzzle ranges AWS Muzzle workaround is no longer needed with latest muzzle optimizations. --- .../aws-java-sdk-1.11.0.gradle | 63 +------------------ 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle index 88b5219514..8809d643c5 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle @@ -9,68 +9,9 @@ muzzle { pass { group = "com.amazonaws" module = "aws-java-sdk-core" - versions = "[1.10.33, 1.11.0)" + versions = "[1.10.33,)" + assertInverse = true } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.0, 1.11.50)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.50, 1.11.100)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.100, 1.11.150)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.150, 1.11.200)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.200, 1.11.250)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.250, 1.11.300)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.300, 1.11.350)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.350, 1.11.400)" - } - - pass { - group = "com.amazonaws" - module = "aws-java-sdk-core" - versions = "[1.11.400,)" - } - -// fail { -// group = "com.amazonaws" -// module = "aws-java-sdk-core" -// versions = "[,1.10.33)" -// } } apply from: "${rootDir}/gradle/java.gradle"