Skip to content

Commit bd6e410

Browse files
JonasKunzJonasKunz
committed
Fix checks
1 parent ba4dc7e commit bd6e410

File tree

8 files changed

+38
-19
lines changed

8 files changed

+38
-19
lines changed

‎docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
Comparing source compatibility of opentelemetry-exporter-otlp-1.50.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.49.0.jar
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)
25
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder (not serializable)
36
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
7+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)
48
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
59
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
10+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder (not serializable)
11+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
12+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)
13+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder (not serializable)
14+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
15+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)
616
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder (not serializable)
717
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
18+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)
819
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
920
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
21+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder (not serializable)
22+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
23+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)

‎docs/apidiffs/current_vs_latest/opentelemetry-exporter-zipkin.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
Comparing source compatibility of opentelemetry-exporter-zipkin-1.50.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.49.0.jar
2-
No changes.
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion)

‎docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
11
Comparing source compatibility of opentelemetry-sdk-common-1.50.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.49.0.jar
2-
No changes.
2+
+++ NEW ENUM: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion (compatible)
3+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
4+
+++ NEW INTERFACE: java.lang.constant.Constable
5+
+++ NEW INTERFACE: java.lang.Comparable
6+
+++ NEW INTERFACE: java.io.Serializable
7+
+++ NEW SUPERCLASS: java.lang.Enum
8+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion DISABLED
9+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion LEGACY
10+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion V1_33
11+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion LATEST
12+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion valueOf(java.lang.String)
13+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.common.InternalTelemetrySchemaVersion[] values()

‎exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public ExporterMetrics.Recording startRecordingExport(int itemCount) {
168168
}
169169

170170
private class Recording extends ExporterMetrics.Recording {
171-
/** The number items (spans, log records or metric data points) being exported */
171+
172172
private final int itemCount;
173173

174174
private Recording(int itemCount) {

‎exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private void recordDuration(
185185
}
186186

187187
private class Recording extends ExporterMetrics.Recording {
188-
/** The number items (spans, log records or metric data points) being exported */
188+
189189
private final int itemCount;
190190

191191
private final long startNanoTime;

‎exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ void build_multipleSendersNoConfiguration() {
4040
assertThatCode(
4141
() ->
4242
new GrpcExporterBuilder<>(
43-
"exporter",
44-
ComponentId.StandardExporterType.Signal.SPAN,
45-
"testing",
43+
ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
4644
10,
4745
new URI("http://localhost"),
4846
() -> DummyServiceFutureStub::newFutureStub,
@@ -65,9 +63,7 @@ void build_multipleSendersNoConfiguration() {
6563
void build_multipleSendersWithUpstream() throws URISyntaxException {
6664
assertThat(
6765
new GrpcExporterBuilder<>(
68-
"exporter",
69-
ComponentId.StandardExporterType.Signal.SPAN,
70-
"testing",
66+
ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
7167
10,
7268
new URI("http://localhost"),
7369
() -> DummyServiceFutureStub::newFutureStub,
@@ -87,9 +83,7 @@ void build_multipleSendersWithUpstream() throws URISyntaxException {
8783
void build_multipleSendersWithOkHttp() throws URISyntaxException {
8884
assertThat(
8985
new GrpcExporterBuilder<>(
90-
"exporter",
91-
ComponentId.StandardExporterType.Signal.SPAN,
92-
"testing",
86+
ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
9387
10,
9488
new URI("http://localhost"),
9589
() -> DummyServiceFutureStub::newFutureStub,
@@ -110,9 +104,7 @@ void build_multipleSendersNoMatch() {
110104
assertThatThrownBy(
111105
() ->
112106
new GrpcExporterBuilder<>(
113-
"exporter",
114-
ComponentId.StandardExporterType.Signal.SPAN,
115-
"testing",
107+
ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
116108
10,
117109
new URI("http://localhost"),
118110
() -> DummyServiceFutureStub::newFutureStub,

‎exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ void stringRepresentation() {
257257
try (ZipkinSpanExporter exporter = ZipkinSpanExporter.builder().build()) {
258258
assertThat(exporter.toString())
259259
.isEqualTo(
260-
"ZipkinSpanExporter{endpoint=http://localhost:9411/api/v2/spans, compressionEnabled=true, readTimeoutMillis=10000}");
260+
"ZipkinSpanExporter{endpoint=http://localhost:9411/api/v2/spans, compressionEnabled=true, readTimeoutMillis=10000, internalTelemetrySchemaVersion=LEGACY}");
261261
}
262262
try (ZipkinSpanExporter exporter =
263263
ZipkinSpanExporter.builder()
@@ -267,7 +267,7 @@ void stringRepresentation() {
267267
.build()) {
268268
assertThat(exporter.toString())
269269
.isEqualTo(
270-
"ZipkinSpanExporter{endpoint=http://zipkin:9411/api/v2/spans, compressionEnabled=false, readTimeoutMillis=15000}");
270+
"ZipkinSpanExporter{endpoint=http://zipkin:9411/api/v2/spans, compressionEnabled=false, readTimeoutMillis=15000, internalTelemetrySchemaVersion=LEGACY}");
271271
}
272272
}
273273

‎sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentId.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public enum StandardExporterType implements StandardType {
4646
ZIPKIN_HTTP_SPAN_EXPORTER("zipkin_http_span_exporter", Signal.SPAN),
4747
/**
4848
* Has the same semconv attribute value as ZIPKIN_HTTP_SPAN_EXPORTER, but we still use a
49-
* different enum value because they produce separate legacy metrics
49+
* different enum value for now because they produce separate legacy metrics.
5050
*/
5151
ZIPKIN_HTTP_JSON_SPAN_EXPORTER("zipkin_http_span_exporter", Signal.SPAN);
5252

0 commit comments

Comments
 (0)