Skip to content

Commit 341ed6e

Browse files
committed
Shade testing protobuf dependency
1 parent 3c56704 commit 341ed6e

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ include(":dependencyManagement")
145145
include(":testing:agent-exporter")
146146
include(":testing:agent-for-testing")
147147
include(":testing:armeria-shaded-for-testing")
148+
include(":testing:proto-shaded-for-testing")
148149
include(":testing-common")
149150
include(":testing-common:integration-tests")
150151
include(":testing-common:library-for-integration-tests")

testing-common/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ sourceSets {
1010
main {
1111
val armeriaShadedDeps = project(":testing:armeria-shaded-for-testing")
1212
output.dir(armeriaShadedDeps.file("build/extracted/shadow"), "builtBy" to ":testing:armeria-shaded-for-testing:extractShadowJar")
13+
14+
val protoShadedDeps = project(":testing:proto-shaded-for-testing")
15+
output.dir(protoShadedDeps.file("build/extracted/shadow"), "builtBy" to ":testing:proto-shaded-for-testing:extractShadowJar")
1316
}
1417
}
1518

@@ -47,13 +50,12 @@ dependencies {
4750
api("org.slf4j:slf4j-api")
4851

4952
compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
53+
compileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
5054
compileOnly(project(":javaagent-bootstrap"))
5155

5256
compileOnly("com.google.auto.value:auto-value-annotations")
5357
annotationProcessor("com.google.auto.value:auto-value")
5458

55-
implementation("io.opentelemetry.proto:opentelemetry-proto")
56-
5759
implementation("net.bytebuddy:byte-buddy")
5860
implementation("ch.qos.logback:logback-classic")
5961
implementation("org.slf4j:log4j-over-slf4j")

testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
1313
import static java.util.stream.Collectors.toList;
1414

15-
import com.google.protobuf.InvalidProtocolBufferException;
1615
import io.opentelemetry.api.common.Attributes;
1716
import io.opentelemetry.api.common.AttributesBuilder;
1817
import io.opentelemetry.api.common.Value;
@@ -31,6 +30,7 @@
3130
import io.opentelemetry.proto.common.v1.InstrumentationScope;
3231
import io.opentelemetry.proto.common.v1.KeyValue;
3332
import io.opentelemetry.proto.common.v1.KeyValueList;
33+
import io.opentelemetry.proto.internal.protobuf.InvalidProtocolBufferException;
3434
import io.opentelemetry.proto.logs.v1.LogRecord;
3535
import io.opentelemetry.proto.logs.v1.ResourceLogs;
3636
import io.opentelemetry.proto.logs.v1.ScopeLogs;

0 commit comments

Comments
 (0)