File tree Expand file tree Collapse file tree 3 files changed +6
-3
lines changed
src/main/java/io/opentelemetry/javaagent/testing/common Expand file tree Collapse file tree 3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -145,6 +145,7 @@ include(":dependencyManagement")
145145include(" :testing:agent-exporter" )
146146include(" :testing:agent-for-testing" )
147147include(" :testing:armeria-shaded-for-testing" )
148+ include(" :testing:proto-shaded-for-testing" )
148149include(" :testing-common" )
149150include(" :testing-common:integration-tests" )
150151include(" :testing-common:library-for-integration-tests" )
Original file line number Diff line number Diff 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" )
Original file line number Diff line number Diff line change 1212import static io .opentelemetry .api .common .AttributeKey .stringArrayKey ;
1313import static java .util .stream .Collectors .toList ;
1414
15- import com .google .protobuf .InvalidProtocolBufferException ;
1615import io .opentelemetry .api .common .Attributes ;
1716import io .opentelemetry .api .common .AttributesBuilder ;
1817import io .opentelemetry .api .common .Value ;
3130import io .opentelemetry .proto .common .v1 .InstrumentationScope ;
3231import io .opentelemetry .proto .common .v1 .KeyValue ;
3332import io .opentelemetry .proto .common .v1 .KeyValueList ;
33+ import io .opentelemetry .proto .internal .protobuf .InvalidProtocolBufferException ;
3434import io .opentelemetry .proto .logs .v1 .LogRecord ;
3535import io .opentelemetry .proto .logs .v1 .ResourceLogs ;
3636import io .opentelemetry .proto .logs .v1 .ScopeLogs ;
You can’t perform that action at this time.
0 commit comments