Skip to content

Commit ac8097d

Browse files
committed
use shaded proto
1 parent 4c0a9f1 commit ac8097d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

smoke-tests/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ dependencies {
2626
implementation(platform("io.grpc:grpc-bom:1.68.1"))
2727
implementation("org.slf4j:slf4j-api")
2828
implementation("io.opentelemetry:opentelemetry-api")
29-
implementation("io.opentelemetry.proto:opentelemetry-proto")
3029
implementation("org.testcontainers:testcontainers")
3130
implementation("com.fasterxml.jackson.core:jackson-databind")
3231
implementation("com.google.protobuf:protobuf-java-util:4.28.3")
@@ -37,8 +36,9 @@ dependencies {
3736
testImplementation("com.github.docker-java:docker-java-core:$dockerJavaVersion")
3837
testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")
3938

40-
// make IntelliJ see shaded Armeria
39+
// make IntelliJ see shaded Armeria and opentelemetry-proto
4140
testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
41+
testCompileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
4242
}
4343

4444
tasks {

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TraceInspector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
package io.opentelemetry.smoketest;
77

8-
import com.google.protobuf.ByteString;
98
import groovy.lang.GString;
109
import io.opentelemetry.api.trace.TraceId;
1110
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
1211
import io.opentelemetry.proto.common.v1.AnyValue;
1312
import io.opentelemetry.proto.common.v1.KeyValue;
13+
import io.opentelemetry.proto.internal.protobuf.ByteString;
1414
import io.opentelemetry.proto.trace.v1.ResourceSpans;
1515
import io.opentelemetry.proto.trace.v1.Span;
1616
import java.util.Collection;

0 commit comments

Comments
 (0)