Skip to content

Commit bb776ae

Browse files
lauritlaurit
committed
use shaded proto only inside testing-commons
1 parent ac8097d commit bb776ae

File tree

4 files changed

+32
-30
lines changed

4 files changed

+32
-30
lines changed

‎smoke-tests/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ 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")
2930
implementation("org.testcontainers:testcontainers")
3031
implementation("com.fasterxml.jackson.core:jackson-databind")
3132
implementation("com.google.protobuf:protobuf-java-util:4.28.3")
@@ -36,9 +37,8 @@ dependencies {
3637
testImplementation("com.github.docker-java:docker-java-core:$dockerJavaVersion")
3738
testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")
3839

39-
// make IntelliJ see shaded Armeria and opentelemetry-proto
40+
// make IntelliJ see shaded Armeria
4041
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;
89
import groovy.lang.GString;
910
import io.opentelemetry.api.trace.TraceId;
1011
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
1112
import io.opentelemetry.proto.common.v1.AnyValue;
1213
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;

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,6 @@
2222
import io.opentelemetry.api.trace.TraceFlags;
2323
import io.opentelemetry.api.trace.TraceState;
2424
import io.opentelemetry.api.trace.TraceStateBuilder;
25-
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
26-
import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
27-
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
28-
import io.opentelemetry.proto.common.v1.AnyValue;
29-
import io.opentelemetry.proto.common.v1.ArrayValue;
30-
import io.opentelemetry.proto.common.v1.InstrumentationScope;
31-
import io.opentelemetry.proto.common.v1.KeyValue;
32-
import io.opentelemetry.proto.common.v1.KeyValueList;
33-
import io.opentelemetry.proto.internal.protobuf.InvalidProtocolBufferException;
34-
import io.opentelemetry.proto.logs.v1.LogRecord;
35-
import io.opentelemetry.proto.logs.v1.ResourceLogs;
36-
import io.opentelemetry.proto.logs.v1.ScopeLogs;
37-
import io.opentelemetry.proto.logs.v1.SeverityNumber;
38-
import io.opentelemetry.proto.metrics.v1.HistogramDataPoint;
39-
import io.opentelemetry.proto.metrics.v1.Metric;
40-
import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
41-
import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
42-
import io.opentelemetry.proto.metrics.v1.ScopeMetrics;
43-
import io.opentelemetry.proto.metrics.v1.Sum;
44-
import io.opentelemetry.proto.metrics.v1.SummaryDataPoint;
45-
import io.opentelemetry.proto.resource.v1.Resource;
46-
import io.opentelemetry.proto.trace.v1.ResourceSpans;
47-
import io.opentelemetry.proto.trace.v1.ScopeSpans;
48-
import io.opentelemetry.proto.trace.v1.Span;
49-
import io.opentelemetry.proto.trace.v1.Status;
5025
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
5126
import io.opentelemetry.sdk.logs.data.LogRecordData;
5227
import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
@@ -72,6 +47,31 @@
7247
import io.opentelemetry.sdk.trace.data.LinkData;
7348
import io.opentelemetry.sdk.trace.data.SpanData;
7449
import io.opentelemetry.sdk.trace.data.StatusData;
50+
import io.opentelemetry.testing.internal.proto.collector.logs.v1.ExportLogsServiceRequest;
51+
import io.opentelemetry.testing.internal.proto.collector.metrics.v1.ExportMetricsServiceRequest;
52+
import io.opentelemetry.testing.internal.proto.collector.trace.v1.ExportTraceServiceRequest;
53+
import io.opentelemetry.testing.internal.proto.common.v1.AnyValue;
54+
import io.opentelemetry.testing.internal.proto.common.v1.ArrayValue;
55+
import io.opentelemetry.testing.internal.proto.common.v1.InstrumentationScope;
56+
import io.opentelemetry.testing.internal.proto.common.v1.KeyValue;
57+
import io.opentelemetry.testing.internal.proto.common.v1.KeyValueList;
58+
import io.opentelemetry.testing.internal.proto.logs.v1.LogRecord;
59+
import io.opentelemetry.testing.internal.proto.logs.v1.ResourceLogs;
60+
import io.opentelemetry.testing.internal.proto.logs.v1.ScopeLogs;
61+
import io.opentelemetry.testing.internal.proto.logs.v1.SeverityNumber;
62+
import io.opentelemetry.testing.internal.proto.metrics.v1.HistogramDataPoint;
63+
import io.opentelemetry.testing.internal.proto.metrics.v1.Metric;
64+
import io.opentelemetry.testing.internal.proto.metrics.v1.NumberDataPoint;
65+
import io.opentelemetry.testing.internal.proto.metrics.v1.ResourceMetrics;
66+
import io.opentelemetry.testing.internal.proto.metrics.v1.ScopeMetrics;
67+
import io.opentelemetry.testing.internal.proto.metrics.v1.Sum;
68+
import io.opentelemetry.testing.internal.proto.metrics.v1.SummaryDataPoint;
69+
import io.opentelemetry.testing.internal.proto.resource.v1.Resource;
70+
import io.opentelemetry.testing.internal.proto.trace.v1.ResourceSpans;
71+
import io.opentelemetry.testing.internal.proto.trace.v1.ScopeSpans;
72+
import io.opentelemetry.testing.internal.proto.trace.v1.Span;
73+
import io.opentelemetry.testing.internal.proto.trace.v1.Status;
74+
import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
7575
import java.lang.invoke.MethodHandle;
7676
import java.lang.invoke.MethodHandles;
7777
import java.lang.invoke.MethodType;
@@ -568,7 +568,8 @@ private static List<ValueAtQuantile> getValues(SummaryDataPoint point) {
568568
}
569569

570570
private static AggregationTemporality getTemporality(
571-
io.opentelemetry.proto.metrics.v1.AggregationTemporality aggregationTemporality) {
571+
io.opentelemetry.testing.internal.proto.metrics.v1.AggregationTemporality
572+
aggregationTemporality) {
572573
switch (aggregationTemporality) {
573574
case AGGREGATION_TEMPORALITY_CUMULATIVE:
574575
return AggregationTemporality.CUMULATIVE;

‎testing/proto-shaded-for-testing/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ dependencies {
99

1010
tasks {
1111
shadowJar {
12-
relocate("com.google.protobuf", "io.opentelemetry.proto.internal.protobuf")
12+
relocate("io.opentelemetry.proto", "io.opentelemetry.testing.internal.proto")
13+
relocate("com.google.protobuf", "io.opentelemetry.testing.internal.protobuf")
1314
}
1415

1516
val extractShadowJar by registering(Copy::class) {

0 commit comments

Comments
 (0)