Skip to content

Commit 792b6da

Browse files
lauritrenovate[bot]
laurit
and
renovate[bot]
authored
Shade testing protobuf dependency (#12782)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 310eddc commit 792b6da

File tree

8 files changed

+59
-33
lines changed

8 files changed

+59
-33
lines changed

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ val DEPENDENCIES = listOf(
103103
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}",
104104
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
105105
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
106-
"io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha",
106+
"io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
107107
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
108108
"org.assertj:assertj-core:3.26.3",
109109
"org.awaitility:awaitility:4.2.2",

‎examples/distro/smoke-tests/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.1")
88
testImplementation("com.google.protobuf:protobuf-java-util:4.28.3")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
10-
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha")
10+
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")
1111
testImplementation("io.opentelemetry:opentelemetry-api")
1212

1313
testImplementation("ch.qos.logback:logback-classic:1.5.12")

‎examples/extension/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dependencies {
104104
testImplementation("com.google.protobuf:protobuf-java-util:4.28.3")
105105
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
106106
testImplementation("io.opentelemetry:opentelemetry-api")
107-
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha")
107+
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")
108108

109109
testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}")
110110
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}")

‎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")

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.smoketest
77

88
import com.fasterxml.jackson.databind.ObjectMapper
9-
import com.google.protobuf.GeneratedMessageV3
9+
import com.google.protobuf.GeneratedMessage
1010
import com.google.protobuf.util.JsonFormat
1111
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest
1212
import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest
@@ -42,7 +42,7 @@ class TelemetryRetriever {
4242
return waitForTelemetry("get-logs", { ExportLogsServiceRequest.newBuilder() })
4343
}
4444

45-
private <T extends GeneratedMessageV3, B extends GeneratedMessageV3.Builder> Collection<T> waitForTelemetry(String path, Supplier<B> builderConstructor) {
45+
private <T extends GeneratedMessage, B extends GeneratedMessage.Builder> Collection<T> waitForTelemetry(String path, Supplier<B> builderConstructor) {
4646
def content = waitForContent(path)
4747

4848
return OBJECT_MAPPER.readTree(content).collect {

‎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: 27 additions & 26 deletions
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;
@@ -23,30 +22,6 @@
2322
import io.opentelemetry.api.trace.TraceFlags;
2423
import io.opentelemetry.api.trace.TraceState;
2524
import io.opentelemetry.api.trace.TraceStateBuilder;
26-
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
27-
import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
28-
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
29-
import io.opentelemetry.proto.common.v1.AnyValue;
30-
import io.opentelemetry.proto.common.v1.ArrayValue;
31-
import io.opentelemetry.proto.common.v1.InstrumentationScope;
32-
import io.opentelemetry.proto.common.v1.KeyValue;
33-
import io.opentelemetry.proto.common.v1.KeyValueList;
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: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
plugins {
2+
id("com.gradleup.shadow")
3+
id("otel.java-conventions")
4+
}
5+
6+
dependencies {
7+
implementation("io.opentelemetry.proto:opentelemetry-proto")
8+
}
9+
10+
tasks {
11+
shadowJar {
12+
relocate("io.opentelemetry.proto", "io.opentelemetry.testing.internal.proto")
13+
relocate("com.google.protobuf", "io.opentelemetry.testing.internal.protobuf")
14+
}
15+
16+
val extractShadowJar by registering(Copy::class) {
17+
dependsOn(shadowJar)
18+
from(zipTree(shadowJar.get().archiveFile))
19+
into("build/extracted/shadow")
20+
includeEmptyDirs = false
21+
}
22+
}

0 commit comments

Comments
 (0)