Merge pull request #7412 from DataDog/ban/embed-cwstls-always

Make cws-tls use the same JNA dependency as instrumentations

Author: bantonsson

dd-java-agent/build.gradle

@@ -117,9 +117,7 @@ includeSubprojShadowJar ':dd-java-agent:agent-iast', 'iast'
 includeSubprojShadowJar ':dd-java-agent:agent-debugger', 'debugger'
 includeSubprojShadowJar ':dd-java-agent:agent-ci-visibility', 'ci-visibility'
 includeSubprojShadowJar ':dd-java-agent:agent-logs-intake', 'logs-intake'
-if (project.rootProject.hasProperty("agentIncludeCwsTls") && agentIncludeCwsTls) {
-  includeSubprojShadowJar ':dd-java-agent:cws-tls', 'cws-tls'
-}
+includeSubprojShadowJar ':dd-java-agent:cws-tls', 'cws-tls'
 
 def sharedShadowJar = tasks.register('sharedShadowJar', ShadowJar) {
   configurations = [project.configurations.sharedShadowInclude]
@@ -286,8 +284,7 @@ tasks.register('checkAgentJarSize').configure {
   doLast {
     // Arbitrary limit to prevent unintentional increases to the agent jar size
     // Raise or lower as required
-    def megs = (project.rootProject.hasProperty("agentIncludeCwsTls") && agentIncludeCwsTls) ? 30 : 29
-    assert shadowJar.archiveFile.get().getAsFile().length() <= megs * 1024 * 1024
+    assert shadowJar.archiveFile.get().getAsFile().length() <= 29 * 1024 * 1024
   }
 
   dependsOn "shadowJar"

dd-java-agent/cws-tls/build.gradle

@@ -1,5 +1,3 @@
-// This component is only included in the Java Agent if the gradle property agentIncludeCwsTls is true
-
 plugins {
   id "com.github.johnrengelman.shadow"
 }
@@ -22,5 +20,6 @@ dependencies {
 
 shadowJar {
   dependencies deps.excludeShared
+  // exclude this since it's available in the instrumentation jar
+  exclude 'com/sun/jna/**/*'
 }
-