Skip to content

Commit 5e9e253

Browse files
authored
The fattest jar now has -all classifier (#515)
* The fattest jar now has `-all` classifier * Test fix
1 parent 1c2f74d commit 5e9e253

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

java-agent/java-agent.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,27 @@ CopySpec isolateSpec(Collection<Task> sourceTasks) {
3737
}
3838
}
3939

40+
//Includes everything needed for OOTB experience
4041
shadowJar {
41-
archiveClassifier = 'no-exporters'
42-
43-
def sourceTasks = [project(':instrumentation').tasks.shadowJar]
42+
def sourceTasks = [project(':instrumentation').tasks.shadowJar, project(':auto-exporters').tasks.shadowJar]
4443
dependsOn sourceTasks
4544
with isolateSpec(sourceTasks)
4645
}
4746

48-
task embedExporters(type: ShadowJar) {
47+
//Includes instrumentations, but not exporters
48+
task lightShadow(type: ShadowJar) {
4949
archiveClassifier = ''
5050
from sourceSets.main.output
5151

52-
def sourceTasks = [project(':instrumentation').tasks.shadowJar, project(':auto-exporters').tasks.shadowJar]
52+
def sourceTasks = [project(':instrumentation').tasks.shadowJar]
5353
dependsOn sourceTasks
5454
with isolateSpec(sourceTasks)
5555
}
56-
assemble.dependsOn embedExporters
5756

5857
publishing {
5958
publications {
6059
maven(MavenPublication) {
61-
artifact embedExporters
60+
artifact lightShadow
6261
}
6362
}
6463
}

smoke-tests/smoke-tests.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ dependencies {
1010

1111
subprojects { subProject ->
1212
subProject.tasks.withType(Test).configureEach {
13-
dependsOn = [':opentelemetry-auto:embedExporters', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar']
13+
dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar']
1414

1515
doFirst {
1616
// Tests depend on this to know where to run things and what agent jar to use
1717
jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}"
18-
jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.embedExporters.archivePath}"
18+
jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.shadowJar.archivePath}"
1919
jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}"
2020
}
2121
}

0 commit comments

Comments
 (0)