more

trask · trask · commit 4dc65fd60e2a · 2025-10-23T13:26:08.000-07:00
diff --git a/agent/agent/src/main/resources/inst/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider b/agent/agent/src/main/resources/inst/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider
@@ -0,0 +1 @@
+io.opentelemetry.exporter.otlp.internal.OtlpMetricExporterProvider
diff --git a/buildSrc/src/main/kotlin/ai.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.shadow-conventions.gradle.kts
@@ -11,13 +11,16 @@ tasks.withType<ShadowJar>().configureEach {
   mergeServiceFiles("META-INF/services/**")
   mergeServiceFiles {
     include("inst/META-INF/services/**")
+    path = "inst/META-INF/services"
   }
   filesMatching("META-INF/services/**") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
   }
   filesMatching("inst/META-INF/services/**") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
   }
+  exclude("META-INF/services/javax.servlet.ServletContainerInitializer")
+  exclude("inst/META-INF/services/javax.servlet.ServletContainerInitializer")
   exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
   exclude(
     "META-INF/LICENSE",
diff --git a/smoke-tests/apps/ReadOnly/build.gradle.kts b/smoke-tests/apps/ReadOnly/build.gradle.kts
@@ -1,5 +1,3 @@
 plugins {
   id("ai.smoke-test-jar")
 }
-
-aiSmokeTest.mainClass.set("com.microsoft.applicationinsights.smoketestapp.App")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+io.opentelemetry.exporter.otlp.internal.OtlpMetricExporterProvider`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,16 @@ tasks.withType<ShadowJar>().configureEach {`
`11`	`11`	`mergeServiceFiles("META-INF/services/**")`
`12`	`12`	`mergeServiceFiles {`
`13`	`13`	`include("inst/META-INF/services/**")`
	`14`	`+ path = "inst/META-INF/services"`
`14`	`15`	`}`
`15`	`16`	`filesMatching("META-INF/services/**") {`
`16`	`17`	`duplicatesStrategy = DuplicatesStrategy.INCLUDE`
`17`	`18`	`}`
`18`	`19`	`filesMatching("inst/META-INF/services/**") {`
`19`	`20`	`duplicatesStrategy = DuplicatesStrategy.INCLUDE`
`20`	`21`	`}`
	`22`	`+ exclude("META-INF/services/javax.servlet.ServletContainerInitializer")`
	`23`	`+ exclude("inst/META-INF/services/javax.servlet.ServletContainerInitializer")`
`21`	`24`	`exclude("META-INF/.SF", "META-INF/.DSA", "META-INF/*.RSA")`
`22`	`25`	`exclude(`
`23`	`26`	`"META-INF/LICENSE",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("ai.smoke-test-jar")`
`3`	`3`	`}`
`4`		`-`
`5`		`-aiSmokeTest.mainClass.set("com.microsoft.applicationinsights.smoketestapp.App")`