Skip to content

Commit c41ec01

Browse files
authored
Fix shading of grpc service files (#90)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent d96029f commit c41ec01

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

javaagent-core/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
protobuf {
1010
protoc {
1111
// The artifact spec for the Protobuf Compiler
12-
artifact = "com.google.protobuf:protoc:3.13.0"
12+
artifact = "com.google.protobuf:protoc:3.11.4"
1313
}
1414
generateProtoTasks {
1515
}
@@ -24,8 +24,8 @@ idea {
2424
dependencies {
2525
implementation("io.opentelemetry:opentelemetry-api:0.9.1")
2626

27-
api("com.google.protobuf:protobuf-java:3.13.0")
28-
api("com.google.protobuf:protobuf-java-util:3.13.0")
27+
api("com.google.protobuf:protobuf-java:3.11.4")
28+
api("com.google.protobuf:protobuf-java-util:3.11.4")
2929
// convert yaml to json, since java protobuf impl supports only json
3030
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3")
3131
}

javaagent/build.gradle.kts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
// https://oss.jfrog.org/artifactory/oss-snapshot-local/io/opentelemetry/instrumentation/auto/
1111
// https://dl.bintray.com/open-telemetry/maven/
1212
implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "0.9.0", classifier = "all")
13-
api(project(":javaagent-core"))
13+
implementation(project(":javaagent-core"))
1414
}
1515

1616
base.archivesBaseName = "hypertrace-agent"
@@ -26,9 +26,20 @@ tasks {
2626
dependsOn(customizationShadowTask)
2727
}
2828

29+
2930
shadowJar {
3031
// config in javaagent-core uses protobuf and jackson
3132
relocate("com.fasterxml.jackson", "org.hypertrace.shaded.com.fasterxml.jackson")
33+
relocate("com.google", "org.hypertrace.shaded.com.google")
34+
relocate("google.protobuf", "org.hypertrace.shaded.google.protobuf")
35+
relocate("javax", "org.hypertrace.shaded.javax")
36+
relocate("org.checkerframework", "org.hypertrace.shaded.com.checkerframework")
37+
relocate("org.yaml", "org.hypertrace.shaded.org.yaml")
38+
39+
dependencies {
40+
exclude(dependency("org.codehaus.mojo:animal-sniffer-annotations"))
41+
exclude(dependency("javax.annotation:javax.annotation-api"))
42+
}
3243

3344
// relocate following classes because javaagent-core uses OTEL APIs
3445
relocate("io.grpc", "io.opentelemetry.javaagent.shaded.io.grpc")
@@ -42,6 +53,8 @@ tasks {
4253

4354
mergeServiceFiles {
4455
include("inst/META-INF/services/*")
56+
// exclude because it would be shaded twice and the META-INF/services/ would be io.opentelemetry.javaagent.shaded.io.grpc
57+
exclude("inst/META-INF/services/io.grpc*")
4558
}
4659
exclude("**/module-info.class")
4760
manifest {

0 commit comments

Comments
 (0)