Remove slim artifact (#5251)
* Remove slim artifact * Fix build * Revert one change
This commit is contained in:
parent
51742bdd5a
commit
0510ca6188
|
@ -30,7 +30,6 @@ dependencies {
|
|||
implementation("io.opentelemetry:opentelemetry-sdk-extension-resources")
|
||||
implementation("io.opentelemetry:opentelemetry-extension-noop-api")
|
||||
|
||||
// Only the logging exporter is included in our slim distribution so we include it here.
|
||||
// Other exporters are in javaagent-exporters
|
||||
implementation("io.opentelemetry:opentelemetry-exporter-logging")
|
||||
|
||||
|
|
|
@ -35,14 +35,8 @@ val exporterLibs by configurations.creating {
|
|||
isCanBeResolved = true
|
||||
isCanBeConsumed = false
|
||||
}
|
||||
// this configuration collects just exporter libs for slim artifact (also placed in the agent classloader & isolated from the instrumented application)
|
||||
val exporterSlimLibs by configurations.creating {
|
||||
isCanBeResolved = true
|
||||
isCanBeConsumed = false
|
||||
}
|
||||
|
||||
// exclude dependencies that are to be placed in bootstrap from agent libs - they won't be added to inst/
|
||||
listOf(baseJavaagentLibs, javaagentLibs, exporterLibs, exporterSlimLibs).forEach {
|
||||
listOf(baseJavaagentLibs, javaagentLibs, exporterLibs).forEach {
|
||||
it.run {
|
||||
exclude("org.slf4j")
|
||||
exclude("io.opentelemetry", "opentelemetry-api")
|
||||
|
@ -77,9 +71,6 @@ dependencies {
|
|||
|
||||
exporterLibs(project(":javaagent-exporters"))
|
||||
|
||||
exporterSlimLibs("io.opentelemetry:opentelemetry-exporter-otlp")
|
||||
exporterSlimLibs("io.opentelemetry:opentelemetry-exporter-otlp-metrics")
|
||||
|
||||
// concurrentlinkedhashmap-lru and weak-lock-free are copied in to the instrumentation-api module
|
||||
licenseReportDependencies("com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2")
|
||||
licenseReportDependencies("com.blogspot.mydailyjava:weak-lock-free:0.18")
|
||||
|
@ -150,12 +141,6 @@ tasks {
|
|||
archiveFileName.set("exporterLibs-relocated.jar")
|
||||
}
|
||||
|
||||
val relocateExporterSlimLibs by registering(ShadowJar::class) {
|
||||
configurations = listOf(exporterSlimLibs)
|
||||
|
||||
archiveFileName.set("exporterSlimLibs-relocated.jar")
|
||||
}
|
||||
|
||||
// Includes everything needed for OOTB experience
|
||||
val shadowJar by existing(ShadowJar::class) {
|
||||
configurations = listOf(bootstrapLibs)
|
||||
|
@ -185,21 +170,6 @@ tasks {
|
|||
}
|
||||
}
|
||||
|
||||
// Includes instrumentations plus the OTLP/gRPC exporters
|
||||
val slimShadowJar by registering(ShadowJar::class) {
|
||||
configurations = listOf(bootstrapLibs)
|
||||
|
||||
dependsOn(relocateJavaagentLibs, relocateExporterSlimLibs)
|
||||
isolateClasses(relocateJavaagentLibs.get().outputs.files)
|
||||
isolateClasses(relocateExporterSlimLibs.get().outputs.files)
|
||||
|
||||
archiveClassifier.set("slim")
|
||||
|
||||
manifest {
|
||||
attributes(shadowJar.get().manifest.attributes)
|
||||
}
|
||||
}
|
||||
|
||||
// Includes only the agent machinery and required instrumentations
|
||||
val baseJavaagentJar by registering(ShadowJar::class) {
|
||||
configurations = listOf(bootstrapLibs)
|
||||
|
@ -226,7 +196,7 @@ tasks {
|
|||
}
|
||||
|
||||
assemble {
|
||||
dependsOn(shadowJar, slimShadowJar, baseJavaagentJar)
|
||||
dependsOn(shadowJar, baseJavaagentJar)
|
||||
}
|
||||
|
||||
withType<Test>().configureEach {
|
||||
|
@ -248,14 +218,6 @@ tasks {
|
|||
named("generateLicenseReport").configure {
|
||||
dependsOn(cleanLicenses)
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
named<MavenPublication>("maven") {
|
||||
artifact(slimShadowJar)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
licenseReport {
|
||||
|
|
Loading…
Reference in New Issue