Shade wiremock

Author: anuraaga

settings.gradle.kts

@@ -103,6 +103,7 @@ include(":testing:agent-exporter")
 include(":testing:agent-for-testing")
 include(":testing:armeria-shaded-for-testing")
 include(":testing:proto-shaded-for-testing")
+include(":testing:wiremock-shaded-for-testing")
 include(":testing-common")
 include(":testing-common:integration-tests")
 include(":testing-common:library-for-integration-tests")

testing-common/build.gradle.kts

@@ -19,6 +19,12 @@ sourceSets {
       protoShadedDeps.file("build/extracted/shadow"),
       "builtBy" to ":testing:proto-shaded-for-testing:extractShadowJar"
     )
+
+    val wiremockShadedDeps = project(":testing:wiremock-shaded-for-testing")
+    output.dir(
+      wiremockShadedDeps.file("build/extracted/shadow"),
+      "builtBy" to ":testing:wiremock-shaded-for-testing:extractShadowJar"
+    )
   }
 }
 
@@ -54,13 +60,10 @@ dependencies {
   api("org.mockito:mockito-core")
   api("org.slf4j:slf4j-api")
 
-  // used to record LLM responses in gen AI tests
-  api("com.github.tomakehurst:wiremock-jre8:2.35.2")
-  implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2")
-
   compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
   compileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
+  // used to record LLM responses in gen AI tests
+  compileOnly(project(":testing:wiremock-shaded-for-testing", configuration = "shadow"))
   compileOnly(project(":javaagent-bootstrap"))
 
   compileOnly("com.google.auto.value:auto-value-annotations")
@@ -93,4 +96,9 @@ tasks {
   javadoc {
     enabled = false
   }
+
+  jar {
+    // When there are duplicates between multiple shaded dependencies, just ignore them.
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  }
 }

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java

@@ -8,18 +8,6 @@
 import static com.github.tomakehurst.wiremock.common.AbstractFileSource.byFileExtension;
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
 
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.cfg.JsonNodeFeature;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.github.tomakehurst.wiremock.common.FileSource;
 import com.github.tomakehurst.wiremock.common.Json;
 import com.github.tomakehurst.wiremock.common.JsonException;
@@ -29,6 +17,18 @@
 import com.github.tomakehurst.wiremock.standalone.MappingsSource;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.stubbing.StubMappings;
+import io.opentelemetry.testing.internal.jackson.annotation.JsonInclude.Include;
+import io.opentelemetry.testing.internal.jackson.core.JsonGenerator;
+import io.opentelemetry.testing.internal.jackson.core.JsonParser;
+import io.opentelemetry.testing.internal.jackson.core.JsonProcessingException;
+import io.opentelemetry.testing.internal.jackson.databind.DeserializationFeature;
+import io.opentelemetry.testing.internal.jackson.databind.ObjectMapper;
+import io.opentelemetry.testing.internal.jackson.databind.ObjectWriter;
+import io.opentelemetry.testing.internal.jackson.databind.SerializationFeature;
+import io.opentelemetry.testing.internal.jackson.databind.cfg.JsonNodeFeature;
+import io.opentelemetry.testing.internal.jackson.dataformat.yaml.YAMLGenerator;
+import io.opentelemetry.testing.internal.jackson.dataformat.yaml.YAMLMapper;
+import io.opentelemetry.testing.internal.jackson.datatype.jsr310.JavaTimeModule;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;

testing/wiremock-shaded-for-testing/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+  id("com.gradleup.shadow")
+  id("otel.java-conventions")
+}
+
+dependencies {
+  implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
+  implementation("com.google.errorprone:error_prone_annotations")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2")
+}
+
+tasks {
+  shadowJar {
+    dependencies {
+      exclude(dependency("org.slf4j:slf4j-api"))
+      exclude(dependency("org.junit.jupiter:junit-jupiter-api"))
+      exclude(dependency("org.junit.platform:junit-platform-commons"))
+      // Exclude dependencies bundled during Armeria shading
+      exclude(dependency("com.fasterxml.jackson.core:jackson-annotations"))
+      exclude(dependency("com.fasterxml.jackson.core:jackson-core"))
+      exclude(dependency("com.fasterxml.jackson.core:jackson-databind"))
+    }
+
+    // Ensures tests are not affected by wiremock dependencies. Wiremock itself is
+    // safe with its original name.
+    relocate("org.eclipse.jetty", "io.opentelemetry.testing.internal.jetty")
+    relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson")
+
+    mergeServiceFiles()
+  }
+
+  val extractShadowJar by registering(Copy::class) {
+    dependsOn(shadowJar)
+    // there's both "LICENSE" file and "license" and without excluding one of these build fails on case insensitive file systems
+    // there's a LICENSE.txt file that has the same contents anyway, so we're not losing anything excluding that
+    from(zipTree(shadowJar.get().archiveFile)) {
+      exclude("META-INF/LICENSE")
+    }
+    into("build/extracted/shadow")
+    includeEmptyDirs = false
+  }
+}