filterBlanksAndNulls(String[] values) {
/** Returns the TimeUnit associated with a unit string. Defaults to milliseconds. */
private static TimeUnit getDurationUnit(String unitString) {
switch (unitString) {
+ case "us":
+ return TimeUnit.MICROSECONDS;
+ case "ns":
+ return TimeUnit.NANOSECONDS;
case "": // Fallthrough expected
case "ms":
return TimeUnit.MILLISECONDS;
diff --git a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
index e0fe198dc9e..78cc6806c08 100644
--- a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
+++ b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
@@ -185,8 +185,24 @@ void invalidDuration() {
.hasMessage("Invalid duration property duration=9mm. Invalid duration string, found: mm");
}
+ @Test
+ void durationNegativeParsing() {
+ assertThat(
+ DefaultConfigProperties.createFromMap(Collections.singletonMap("duration", "-41"))
+ .getDuration("duration"))
+ .isEqualTo(Duration.ofMillis(-41));
+ }
+
@Test
void durationUnitParsing() {
+ assertThat(
+ DefaultConfigProperties.createFromMap(Collections.singletonMap("duration", "3ns"))
+ .getDuration("duration"))
+ .isEqualTo(Duration.ofNanos(3));
+ assertThat(
+ DefaultConfigProperties.createFromMap(Collections.singletonMap("duration", "2us"))
+ .getDuration("duration"))
+ .isEqualTo(Duration.ofNanos(2000));
assertThat(
DefaultConfigProperties.createFromMap(Collections.singletonMap("duration", "1"))
.getDuration("duration"))
From dc4cc270091a7dae3b0a49a47761da51bb75f29f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:16:11 -0500
Subject: [PATCH 16/42] Update dependency
io.opentelemetry.semconv:opentelemetry-semconv-incubating to v1.27.0-alpha
(#6660)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
dependencyManagement/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 9eacbb3bbfa..206bc3af84e 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -67,7 +67,7 @@ val DEPENDENCIES = listOf(
"io.github.netmikey.logunit:logunit-jul:2.0.0",
"io.jaegertracing:jaeger-client:1.8.1",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.29.0-alpha",
- "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.26.0-alpha",
+ "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.27.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha",
"io.opentracing:opentracing-api:0.33.0",
"io.opentracing:opentracing-noop:0.33.0",
From 97b3fa42f10d43a4f27ecdf2d809bca95fed4de3 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Tue, 20 Aug 2024 22:05:51 -0500
Subject: [PATCH 17/42] Remove outdated ExtendedSpanBuilder javadoc example
(#6659)
---
.../api/incubator/trace/ExtendedSpanBuilder.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpanBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpanBuilder.java
index eec32904a4e..8474095f734 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpanBuilder.java
+++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpanBuilder.java
@@ -29,13 +29,6 @@ public interface ExtendedSpanBuilder extends SpanBuilder {
* The span context will be extracted from the carrier, which you usually get from
* HTTP headers of the metadata of a message you're processing.
*
- *
A typical usage would be:
- * ExtendedTracer.create(tracer)
- * .setSpanKind(SpanKind.SERVER)
- * .setParentFrom(propagators, carrier)
- * .run("my-span", () -> { ... });
- *
- *
* @param propagators provide the propagators from {@link OpenTelemetry#getPropagators()}
* @param carrier the string map where to extract the span context from
*/
From 97185c6fa09c6133c758bd62f931274e67d63a81 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:39:22 -0700
Subject: [PATCH 18/42] Update dependency nl.jqno.equalsverifier:equalsverifier
to v3.16.2 (#6667)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
dependencyManagement/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 206bc3af84e..3144535bf3e 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -73,7 +73,7 @@ val DEPENDENCIES = listOf(
"io.opentracing:opentracing-noop:0.33.0",
"io.prometheus:prometheus-metrics-exporter-httpserver:1.3.1",
"junit:junit:4.13.2",
- "nl.jqno.equalsverifier:equalsverifier:3.16.1",
+ "nl.jqno.equalsverifier:equalsverifier:3.16.2",
"org.awaitility:awaitility:4.2.2",
"org.bouncycastle:bcpkix-jdk15on:1.70",
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
From c90175f1ae7d15fef6bac8eb6c95492c981daa61 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:44:24 -0700
Subject: [PATCH 19/42] Update dependency
org.jetbrains.kotlin:kotlin-gradle-plugin to v2.0.20 (#6663)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
buildSrc/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d85c65767de..5c2c974b841 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -65,7 +65,7 @@ dependencies {
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.0.1")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.0.0")
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
implementation("org.owasp:dependency-check-gradle:10.0.3")
implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
}
From 7522bfe141524d52649b5c344c643104b57af608 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 12:57:30 -0700
Subject: [PATCH 20/42] Update dependency checkstyle to v10.18.0 (#6670)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Watson
---
.../java/io/opentelemetry/api/baggage/propagation/Parser.java | 4 ++--
buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +-
.../exporter/zipkin/LocalInetAddressSupplier.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/all/src/main/java/io/opentelemetry/api/baggage/propagation/Parser.java b/api/all/src/main/java/io/opentelemetry/api/baggage/propagation/Parser.java
index d6c26fcef27..c9d619c1bf3 100644
--- a/api/all/src/main/java/io/opentelemetry/api/baggage/propagation/Parser.java
+++ b/api/all/src/main/java/io/opentelemetry/api/baggage/propagation/Parser.java
@@ -12,11 +12,11 @@
/**
* Implements single-pass Baggage parsing in accordance with https://w3c.github.io/baggage/ Key /
- * value are restricted in accordance with https://www.ietf.org/rfc/rfc2616.txt
+ * value are restricted in accordance with https://www.ietf.org/rfc/rfc2616.txt.
*
* Note: following aspects are not specified in RFC: - some invalid elements (key or value) -
* parser will include valid ones, disregard invalid - empty "value" is regarded as invalid - meta -
- * anything besides element terminator (comma)
+ * anything besides element terminator (comma).
*/
class Parser {
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
index f651f5c3021..929cbee6046 100644
--- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -42,7 +42,7 @@ java {
checkstyle {
configDirectory.set(file("$rootDir/buildscripts/"))
- toolVersion = "10.17.0"
+ toolVersion = "10.18.0"
isIgnoreFailures = false
configProperties["rootDir"] = rootDir
}
diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/LocalInetAddressSupplier.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/LocalInetAddressSupplier.java
index 1ddb324edb6..a5376eb88a9 100644
--- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/LocalInetAddressSupplier.java
+++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/LocalInetAddressSupplier.java
@@ -30,7 +30,7 @@ public InetAddress get() {
return inetAddress;
}
- /** Logic borrowed from brave.internal.Platform.produceLocalEndpoint */
+ /** Logic borrowed from brave.internal.Platform.produceLocalEndpoint. */
@Nullable
private static InetAddress findLocalIp() {
try {
From 71124d2c5b0c3ae36500c82b2853f146b63f82cf Mon Sep 17 00:00:00 2001
From: Jarrod Robins
Date: Wed, 28 Aug 2024 05:49:11 +1000
Subject: [PATCH 21/42] Return status code exceptions via CompletableResultCode
in GrpcExporter and HttpExporter (#6645)
---
.../internal/FailedExportException.java | 126 ++++++++++++++++++
.../exporter/internal/grpc/GrpcExporter.java | 70 ++++++----
.../exporter/internal/http/HttpExporter.java | 6 +-
.../AbstractGrpcTelemetryExporterTest.java | 61 ++++++++-
.../AbstractHttpTelemetryExporterTest.java | 58 ++++++--
.../okhttp/internal/OkHttpGrpcSender.java | 4 +-
.../okhttp/internal/OkHttpHttpSender.java | 7 +-
7 files changed, 284 insertions(+), 48 deletions(-)
create mode 100644 exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java
diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java
new file mode 100644
index 00000000000..74f66dbfa1f
--- /dev/null
+++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.internal;
+
+import io.opentelemetry.exporter.internal.grpc.GrpcResponse;
+import io.opentelemetry.exporter.internal.http.HttpSender;
+import javax.annotation.Nullable;
+
+/**
+ * Represents the failure of a gRPC or HTTP exporter.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public abstract class FailedExportException extends Exception {
+
+ private static final long serialVersionUID = 6988924855140178789L;
+
+ private FailedExportException(@Nullable Throwable cause) {
+ super(cause);
+ }
+
+ /** Indicates an HTTP export failed after receiving a response from the server. */
+ public static HttpExportException httpFailedWithResponse(HttpSender.Response response) {
+ return new HttpExportException(response, null);
+ }
+
+ /** Indicates an HTTP export failed exceptionally without receiving a response from the server. */
+ public static HttpExportException httpFailedExceptionally(Throwable cause) {
+ return new HttpExportException(null, cause);
+ }
+
+ /** Indicates a gRPC export failed after receiving a response from the server. */
+ public static GrpcExportException grpcFailedWithResponse(GrpcResponse response) {
+ return new GrpcExportException(response, null);
+ }
+
+ /** Indicates a gRPC export failed exceptionally without receiving a response from the server. */
+ public static GrpcExportException grpcFailedExceptionally(Throwable cause) {
+ return new GrpcExportException(null, cause);
+ }
+
+ /** Returns true if the export failed with a response from the server. */
+ public abstract boolean failedWithResponse();
+
+ /** Represents the failure of an HTTP exporter. */
+ public static final class HttpExportException extends FailedExportException {
+
+ private static final long serialVersionUID = -6787390183017184775L;
+
+ @Nullable private final HttpSender.Response response;
+ @Nullable private final Throwable cause;
+
+ private HttpExportException(@Nullable HttpSender.Response response, @Nullable Throwable cause) {
+ super(cause);
+ this.response = response;
+ this.cause = cause;
+ }
+
+ @Override
+ public boolean failedWithResponse() {
+ return response != null;
+ }
+
+ /**
+ * Returns the response if the export failed with a response from the server, or null if the
+ * export failed exceptionally with no response.
+ */
+ @Nullable
+ public HttpSender.Response getResponse() {
+ return response;
+ }
+
+ /**
+ * Returns the exceptional cause of failure, or null if the export failed with a response from
+ * the server.
+ */
+ @Nullable
+ @Override
+ public Throwable getCause() {
+ return cause;
+ }
+ }
+
+ /** Represents the failure of a gRPC exporter. */
+ public static final class GrpcExportException extends FailedExportException {
+
+ private static final long serialVersionUID = -9157548250286695364L;
+
+ @Nullable private final GrpcResponse response;
+ @Nullable private final Throwable cause;
+
+ private GrpcExportException(@Nullable GrpcResponse response, @Nullable Throwable cause) {
+ super(cause);
+ this.response = response;
+ this.cause = cause;
+ }
+
+ @Override
+ public boolean failedWithResponse() {
+ return response != null;
+ }
+
+ /**
+ * Returns the response if the export failed with a response from the server, or null if the
+ * export failed exceptionally with no response.
+ */
+ @Nullable
+ public GrpcResponse getResponse() {
+ return response;
+ }
+
+ /**
+ * Returns the exceptional cause of failure, or null if the export failed with a response from
+ * the server.
+ */
+ @Nullable
+ @Override
+ public Throwable getCause() {
+ return cause;
+ }
+ }
+}
diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java
index 6a74ba5df8a..e8101049b9f 100644
--- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java
+++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java
@@ -7,9 +7,11 @@
import static io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil.GRPC_STATUS_UNAVAILABLE;
import static io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil.GRPC_STATUS_UNIMPLEMENTED;
+import static io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil.GRPC_STATUS_UNKNOWN;
import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.exporter.internal.ExporterMetrics;
+import io.opentelemetry.exporter.internal.FailedExportException;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.internal.ThrottlingLogger;
@@ -66,39 +68,17 @@ public CompletableResultCode export(T exportRequest, int numItems) {
},
(response, throwable) -> {
exporterMetrics.addFailed(numItems);
+
+ logFailureMessage(response, throwable);
+
switch (response.grpcStatusValue()) {
- case GRPC_STATUS_UNIMPLEMENTED:
- if (loggedUnimplemented.compareAndSet(false, true)) {
- GrpcExporterUtil.logUnimplemented(
- internalLogger, type, response.grpcStatusDescription());
- }
- break;
- case GRPC_STATUS_UNAVAILABLE:
- logger.log(
- Level.SEVERE,
- "Failed to export "
- + type
- + "s. Server is UNAVAILABLE. "
- + "Make sure your collector is running and reachable from this network. "
- + "Full error message:"
- + response.grpcStatusDescription());
+ case GRPC_STATUS_UNKNOWN:
+ result.failExceptionally(FailedExportException.grpcFailedExceptionally(throwable));
break;
default:
- logger.log(
- Level.WARNING,
- "Failed to export "
- + type
- + "s. Server responded with gRPC status code "
- + response.grpcStatusValue()
- + ". Error message: "
- + response.grpcStatusDescription());
+ result.failExceptionally(FailedExportException.grpcFailedWithResponse(response));
break;
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.log(
- Level.FINEST, "Failed to export " + type + "s. Details follow: " + throwable);
- }
- result.fail();
});
return result;
@@ -111,4 +91,38 @@ public CompletableResultCode shutdown() {
}
return grpcSender.shutdown();
}
+
+ private void logFailureMessage(GrpcResponse response, Throwable throwable) {
+ switch (response.grpcStatusValue()) {
+ case GRPC_STATUS_UNIMPLEMENTED:
+ if (loggedUnimplemented.compareAndSet(false, true)) {
+ GrpcExporterUtil.logUnimplemented(internalLogger, type, response.grpcStatusDescription());
+ }
+ break;
+ case GRPC_STATUS_UNAVAILABLE:
+ logger.log(
+ Level.SEVERE,
+ "Failed to export "
+ + type
+ + "s. Server is UNAVAILABLE. "
+ + "Make sure your collector is running and reachable from this network. "
+ + "Full error message:"
+ + response.grpcStatusDescription());
+ break;
+ default:
+ logger.log(
+ Level.WARNING,
+ "Failed to export "
+ + type
+ + "s. Server responded with gRPC status code "
+ + response.grpcStatusValue()
+ + ". Error message: "
+ + response.grpcStatusDescription());
+ break;
+ }
+
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "Failed to export " + type + "s. Details follow: " + throwable);
+ }
+ }
}
diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java
index befb579d964..d0361eaecca 100644
--- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java
+++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java
@@ -7,6 +7,7 @@
import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.exporter.internal.ExporterMetrics;
+import io.opentelemetry.exporter.internal.FailedExportException;
import io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -90,7 +91,8 @@ public CompletableResultCode export(T exportRequest, int numItems) {
+ statusCode
+ ". Error message: "
+ status);
- result.fail();
+
+ result.failExceptionally(FailedExportException.httpFailedWithResponse(httpResponse));
},
e -> {
exporterMetrics.addFailed(numItems);
@@ -101,7 +103,7 @@ public CompletableResultCode export(T exportRequest, int numItems) {
+ "s. The request could not be executed. Full error message: "
+ e.getMessage(),
e);
- result.fail();
+ result.failExceptionally(FailedExportException.httpFailedExceptionally(e));
});
return result;
diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java
index a62911a54b0..5950d8c00aa 100644
--- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java
+++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java
@@ -25,9 +25,11 @@
import com.linecorp.armeria.testing.junit5.server.ServerExtension;
import io.github.netmikey.logunit.api.LogCapturer;
import io.grpc.ManagedChannel;
+import io.opentelemetry.exporter.internal.FailedExportException;
import io.opentelemetry.exporter.internal.TlsUtil;
import io.opentelemetry.exporter.internal.compression.GzipCompressor;
import io.opentelemetry.exporter.internal.grpc.GrpcExporter;
+import io.opentelemetry.exporter.internal.grpc.GrpcResponse;
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.exporter.otlp.testing.internal.compressor.Base64Compressor;
@@ -66,6 +68,7 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
+import org.assertj.core.api.Assertions;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.assertj.core.api.iterable.ThrowingExtractor;
import org.junit.jupiter.api.AfterAll;
@@ -486,6 +489,7 @@ void connectTimeout() {
CompletableResultCode result =
exporter.export(Collections.singletonList(generateFakeTelemetry()));
assertThat(result.join(10, TimeUnit.SECONDS).isSuccess()).isFalse();
+
// Assert that the export request fails well before the default connect timeout of 10s
assertThat(System.currentTimeMillis() - startTimeMillis)
.isLessThan(TimeUnit.SECONDS.toMillis(1));
@@ -540,17 +544,33 @@ void doubleShutdown() {
@Test
@SuppressLogger(GrpcExporter.class)
void error() {
- addGrpcError(13, null);
+ int statusCode = 13;
+ addGrpcError(statusCode, null);
TelemetryExporter exporter = nonRetryingExporter();
try {
- assertThat(
- exporter
- .export(Collections.singletonList(generateFakeTelemetry()))
- .join(10, TimeUnit.SECONDS)
- .isSuccess())
- .isFalse();
+ CompletableResultCode result =
+ exporter
+ .export(Collections.singletonList(generateFakeTelemetry()))
+ .join(10, TimeUnit.SECONDS);
+
+ assertThat(result.isSuccess()).isFalse();
+
+ assertThat(result.getFailureThrowable())
+ .asInstanceOf(
+ InstanceOfAssertFactories.throwable(FailedExportException.GrpcExportException.class))
+ .returns(true, Assertions.from(FailedExportException::failedWithResponse))
+ .satisfies(
+ ex -> {
+ assertThat(ex.getResponse())
+ .isNotNull()
+ .extracting(GrpcResponse::grpcStatusValue)
+ .isEqualTo(statusCode);
+
+ assertThat(ex.getCause()).isNull();
+ });
+
LoggingEvent log =
logs.assertContains(
"Failed to export "
@@ -562,6 +582,33 @@ void error() {
}
}
+ @Test
+ @SuppressLogger(GrpcExporter.class)
+ void errorWithUnknownError() {
+ addGrpcError(2, null);
+
+ TelemetryExporter exporter = nonRetryingExporter();
+
+ try {
+ assertThat(
+ exporter
+ .export(Collections.singletonList(generateFakeTelemetry()))
+ .join(10, TimeUnit.SECONDS)
+ .getFailureThrowable())
+ .asInstanceOf(
+ InstanceOfAssertFactories.throwable(FailedExportException.GrpcExportException.class))
+ .returns(false, Assertions.from(FailedExportException::failedWithResponse))
+ .satisfies(
+ ex -> {
+ assertThat(ex.getResponse()).isNull();
+
+ assertThat(ex.getCause()).isNotNull();
+ });
+ } finally {
+ exporter.shutdown();
+ }
+ }
+
@Test
@SuppressLogger(GrpcExporter.class)
void errorWithMessage() {
diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
index befa39af5f3..7f6bfff04b3 100644
--- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
+++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
@@ -26,9 +26,11 @@
import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension;
import com.linecorp.armeria.testing.junit5.server.ServerExtension;
import io.github.netmikey.logunit.api.LogCapturer;
+import io.opentelemetry.exporter.internal.FailedExportException;
import io.opentelemetry.exporter.internal.TlsUtil;
import io.opentelemetry.exporter.internal.compression.GzipCompressor;
import io.opentelemetry.exporter.internal.http.HttpExporter;
+import io.opentelemetry.exporter.internal.http.HttpSender;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.exporter.otlp.testing.internal.compressor.Base64Compressor;
import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
@@ -72,6 +74,8 @@
import okio.GzipSource;
import okio.Okio;
import okio.Source;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.InstanceOfAssertFactories;
import org.assertj.core.api.iterable.ThrowingExtractor;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
@@ -534,8 +538,22 @@ void connectTimeout() {
try {
long startTimeMillis = System.currentTimeMillis();
CompletableResultCode result =
- exporter.export(Collections.singletonList(generateFakeTelemetry()));
- assertThat(result.join(10, TimeUnit.SECONDS).isSuccess()).isFalse();
+ exporter
+ .export(Collections.singletonList(generateFakeTelemetry()))
+ .join(10, TimeUnit.SECONDS);
+
+ assertThat(result.isSuccess()).isFalse();
+
+ assertThat(result.getFailureThrowable())
+ .asInstanceOf(
+ InstanceOfAssertFactories.throwable(FailedExportException.HttpExportException.class))
+ .returns(false, Assertions.from(FailedExportException::failedWithResponse))
+ .satisfies(
+ ex -> {
+ assertThat(ex.getResponse()).isNull();
+ assertThat(ex.getCause()).isNotNull();
+ });
+
// Assert that the export request fails well before the default connect timeout of 10s
assertThat(System.currentTimeMillis() - startTimeMillis)
.isLessThan(TimeUnit.SECONDS.toMillis(1));
@@ -590,13 +608,35 @@ void doubleShutdown() {
@Test
@SuppressLogger(HttpExporter.class)
void error() {
- addHttpError(500);
- assertThat(
- exporter
- .export(Collections.singletonList(generateFakeTelemetry()))
- .join(10, TimeUnit.SECONDS)
- .isSuccess())
- .isFalse();
+ int statusCode = 500;
+ addHttpError(statusCode);
+ CompletableResultCode result =
+ exporter
+ .export(Collections.singletonList(generateFakeTelemetry()))
+ .join(10, TimeUnit.SECONDS);
+
+ assertThat(result.isSuccess()).isFalse();
+
+ assertThat(result.getFailureThrowable())
+ .asInstanceOf(
+ InstanceOfAssertFactories.throwable(FailedExportException.HttpExportException.class))
+ .returns(true, Assertions.from(FailedExportException::failedWithResponse))
+ .satisfies(
+ ex -> {
+ assertThat(ex.getResponse())
+ .isNotNull()
+ .satisfies(
+ response -> {
+ assertThat(response)
+ .extracting(HttpSender.Response::statusCode)
+ .isEqualTo(statusCode);
+
+ assertThatCode(response::responseBody).doesNotThrowAnyException();
+ });
+
+ assertThat(ex.getCause()).isNull();
+ });
+
LoggingEvent log =
logs.assertContains(
"Failed to export "
diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java
index 7fb04c4e513..a622d95ac6c 100644
--- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java
+++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java
@@ -136,7 +136,9 @@ public void onFailure(Call call, IOException e) {
if (description == null) {
description = "";
}
- onError.accept(GrpcResponse.create(2 /* UNKNOWN */, description), e);
+ onError.accept(
+ GrpcResponse.create(GrpcExporterUtil.GRPC_STATUS_UNKNOWN, description),
+ e);
}
@Override
diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java
index 1a0263a13de..20af7127451 100644
--- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java
+++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java
@@ -143,6 +143,8 @@ public void onResponse(Call call, okhttp3.Response response) {
try (ResponseBody body = response.body()) {
onResponse.accept(
new Response() {
+ @Nullable private byte[] bodyBytes;
+
@Override
public int statusCode() {
return response.code();
@@ -155,7 +157,10 @@ public String statusMessage() {
@Override
public byte[] responseBody() throws IOException {
- return body.bytes();
+ if (bodyBytes == null) {
+ bodyBytes = body.bytes();
+ }
+ return bodyBytes;
}
});
}
From 902c46e2a74239bc13e140f8d70a0106c8f10ee1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 20:25:20 -0700
Subject: [PATCH 22/42] Update gradle/actions action to v4.0.1 (#6673)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/gradle-wrapper-validation.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index e659ca0fa97..c55680e34b8 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -13,4 +13,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- - uses: gradle/actions/wrapper-validation@v4.0.0
+ - uses: gradle/actions/wrapper-validation@v4.0.1
From 05fe136cb3d90de26bed5f865bb7d519680e5be2 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:42:37 -0500
Subject: [PATCH 23/42] Add file configuration ComponentProvider support for
resources (#6625)
---
.../sdk/autoconfigure/internal/SpiHelper.java | 4 +-
.../incubator/fileconfig/ResourceFactory.java | 95 +++++++++++++++++--
...OpenTelemetryConfigurationFactoryTest.java | 4 +
.../fileconfig/ResourceFactoryTest.java | 17 +++-
.../component/ResourceComponentProvider.java | 27 ++++++
...ResourceOrderedFirstComponentProvider.java | 33 +++++++
...esourceOrderedSecondComponentProvider.java | 34 +++++++
...toconfigure.spi.internal.ComponentProvider | 3 +
8 files changed, 203 insertions(+), 14 deletions(-)
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedFirstComponentProvider.java
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedSecondComponentProvider.java
diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/internal/SpiHelper.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/internal/SpiHelper.java
index bd3bfc13f04..c8c40e63e07 100644
--- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/internal/SpiHelper.java
+++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/internal/SpiHelper.java
@@ -81,9 +81,9 @@ public NamedSpiManager loadConfigurable(
}
/**
- * Find a registered {@link ComponentProvider} which {@link ComponentProvider#getType()} matching
+ * Find a registered {@link ComponentProvider} with {@link ComponentProvider#getType()} matching
* {@code type}, {@link ComponentProvider#getName()} matching {@code name}, and call {@link
- * ComponentProvider#create(StructuredConfigProperties)} with the given {@code model}.
+ * ComponentProvider#create(StructuredConfigProperties)} with the given {@code config}.
*
* @throws ConfigurationException if no matching providers are found, or if multiple are found
* (i.e. conflict), or if {@link ComponentProvider#create(StructuredConfigProperties)} throws
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java
index 04a0de2bcac..eaaf1ae98b3 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java
@@ -6,14 +6,25 @@
package io.opentelemetry.sdk.extension.incubator.fileconfig;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Attributes;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Resource;
-import io.opentelemetry.sdk.resources.ResourceBuilder;
+import io.opentelemetry.sdk.resources.Resource;
import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
-final class ResourceFactory implements Factory {
+final class ResourceFactory
+ implements Factory<
+ io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Resource, Resource> {
+ private static final StructuredConfigProperties EMPTY_CONFIG =
+ FileConfiguration.toConfigProperties(Collections.emptyMap());
private static final ResourceFactory INSTANCE = new ResourceFactory();
private ResourceFactory() {}
@@ -23,16 +34,82 @@ static ResourceFactory getInstance() {
}
@Override
- public io.opentelemetry.sdk.resources.Resource create(
- Resource model, SpiHelper spiHelper, List closeables) {
- ResourceBuilder builder = io.opentelemetry.sdk.resources.Resource.getDefault().toBuilder();
+ public Resource create(
+ io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Resource model,
+ SpiHelper spiHelper,
+ List closeables) {
+ Resource result = Resource.getDefault();
+
+ List resourceDetectorResources = loadFromResourceDetectors(spiHelper);
+ for (Resource resourceProviderResource : resourceDetectorResources) {
+ result = result.merge(resourceProviderResource);
+ }
Attributes attributesModel = model.getAttributes();
if (attributesModel != null) {
- builder.putAll(
- AttributesFactory.getInstance().create(attributesModel, spiHelper, closeables));
+ result =
+ result.toBuilder()
+ .putAll(
+ AttributesFactory.getInstance().create(attributesModel, spiHelper, closeables))
+ .build();
}
- return builder.build();
+ return result;
+ }
+
+ /**
+ * Load resources from resource detectors, in order of lowest priority to highest priority.
+ *
+ * In file configuration, a resource detector is a {@link ComponentProvider} with {@link
+ * ComponentProvider#getType()} set to {@link Resource}. Unlike other {@link ComponentProvider}s,
+ * the resource detector version does not use {@link ComponentProvider#getName()} (except for
+ * debug messages), and {@link ComponentProvider#create(StructuredConfigProperties)} is called
+ * with an empty instance. Additionally, the {@link Ordered#order()} value is respected for
+ * resource detectors which implement {@link Ordered}.
+ */
+ @SuppressWarnings("rawtypes")
+ private static List loadFromResourceDetectors(SpiHelper spiHelper) {
+ List componentProviders = spiHelper.load(ComponentProvider.class);
+ List resourceAndOrders = new ArrayList<>();
+ for (ComponentProvider componentProvider : componentProviders) {
+ if (componentProvider.getType() != Resource.class) {
+ continue;
+ }
+ Resource resource;
+ try {
+ resource = (Resource) componentProvider.create(EMPTY_CONFIG);
+ } catch (Throwable throwable) {
+ throw new ConfigurationException(
+ "Error configuring "
+ + Resource.class.getName()
+ + " with name \""
+ + componentProvider.getName()
+ + "\"",
+ throwable);
+ }
+ int order =
+ (componentProvider instanceof Ordered) ? ((Ordered) componentProvider).order() : 0;
+ resourceAndOrders.add(new ResourceAndOrder(resource, order));
+ }
+ resourceAndOrders.sort(Comparator.comparing(ResourceAndOrder::order));
+ return resourceAndOrders.stream().map(ResourceAndOrder::resource).collect(Collectors.toList());
+ }
+
+ private static final class ResourceAndOrder {
+ private final Resource resource;
+ private final int order;
+
+ private ResourceAndOrder(Resource resource, int order) {
+ this.resource = resource;
+ this.order = order;
+ }
+
+ private Resource resource() {
+ return resource;
+ }
+
+ private int order() {
+ return order;
+ }
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java
index da3cc7cd013..7de50047ece 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java
@@ -140,6 +140,10 @@ void create_Configured() {
io.opentelemetry.sdk.resources.Resource.getDefault().toBuilder()
.put("service.name", "my-service")
.put("key", "val")
+ // resource attributes from resource ComponentProviders
+ .put("color", "red")
+ .put("shape", "square")
+ .put("order", "second")
.build();
OpenTelemetrySdk expectedSdk =
OpenTelemetrySdk.builder()
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java
index 37e494ee28a..584f908431c 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java
@@ -6,7 +6,7 @@
package io.opentelemetry.sdk.extension.incubator.fileconfig;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Attributes;
@@ -16,8 +16,11 @@
class ResourceFactoryTest {
+ private SpiHelper spiHelper = SpiHelper.create(MetricExporterFactoryTest.class.getClassLoader());
+
@Test
void create() {
+ spiHelper = spy(spiHelper);
assertThat(
ResourceFactory.getInstance()
.create(
@@ -26,13 +29,21 @@ void create() {
.withAttributes(
new Attributes()
.withServiceName("my-service")
- .withAdditionalProperty("key", "val")),
- mock(SpiHelper.class),
+ .withAdditionalProperty("key", "val")
+ // Should override shape attribute from ResourceComponentProvider
+ .withAdditionalProperty("shape", "circle")),
+ spiHelper,
Collections.emptyList()))
.isEqualTo(
Resource.getDefault().toBuilder()
.put("service.name", "my-service")
.put("key", "val")
+ .put("shape", "circle")
+ // From ResourceComponentProvider
+ .put("color", "red")
+ // From ResourceOrderedSecondComponentProvider, which takes priority over
+ // ResourceOrderedFirstComponentProvider
+ .put("order", "second")
.build());
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java
new file mode 100644
index 00000000000..13b0e86c05a
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.resources.Resource;
+
+public class ResourceComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return Resource.class;
+ }
+
+ @Override
+ public String getName() {
+ return "unused";
+ }
+
+ @Override
+ public Resource create(StructuredConfigProperties config) {
+ return Resource.builder().put("shape", "square").put("color", "red").build();
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedFirstComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedFirstComponentProvider.java
new file mode 100644
index 00000000000..f2f41e5b955
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedFirstComponentProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.resources.Resource;
+
+public class ResourceOrderedFirstComponentProvider implements ComponentProvider, Ordered {
+ @Override
+ public Class getType() {
+ return Resource.class;
+ }
+
+ @Override
+ public String getName() {
+ return "unused";
+ }
+
+ @Override
+ public Resource create(StructuredConfigProperties config) {
+ return Resource.builder().put("order", "first").build();
+ }
+
+ @Override
+ public int order() {
+ return 1;
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedSecondComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedSecondComponentProvider.java
new file mode 100644
index 00000000000..00017b2b7d4
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceOrderedSecondComponentProvider.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.resources.Resource;
+
+public class ResourceOrderedSecondComponentProvider
+ implements ComponentProvider, Ordered {
+ @Override
+ public Class getType() {
+ return Resource.class;
+ }
+
+ @Override
+ public String getName() {
+ return "unused";
+ }
+
+ @Override
+ public Resource create(StructuredConfigProperties config) {
+ return Resource.builder().put("order", "second").build();
+ }
+
+ @Override
+ public int order() {
+ return 2;
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
index 0dc2d209e1d..6ab8ffdecc3 100644
--- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
+++ b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -1,3 +1,6 @@
io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceOrderedFirstComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceOrderedSecondComponentProvider
From 8495996d549a969ab2fece1f12a7d6bc0f84f17c Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:59:04 -0500
Subject: [PATCH 24/42] Processor component provider (#6623)
---
.../fileconfig/LogRecordProcessorFactory.java | 24 ++++++--
.../fileconfig/SpanProcessorFactory.java | 24 ++++++--
.../LogRecordProcessorFactoryTest.java | 32 +++++++---
.../fileconfig/MetricExporterFactoryTest.java | 5 +-
.../fileconfig/SpanProcessorFactoryTest.java | 31 +++++++---
.../LogRecordProcessorComponentProvider.java | 47 ++++++++++++++
.../SpanProcessorComponentProvider.java | 61 +++++++++++++++++++
...toconfigure.spi.internal.ComponentProvider | 2 +
8 files changed, 200 insertions(+), 26 deletions(-)
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java
index 78183f19232..882db7db24f 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java
@@ -17,6 +17,7 @@
import java.io.Closeable;
import java.time.Duration;
import java.util.List;
+import java.util.Map;
final class LogRecordProcessorFactory
implements Factory<
@@ -73,11 +74,26 @@ public LogRecordProcessor create(
closeables, SimpleLogRecordProcessor.create(logRecordExporter));
}
- // TODO: add support for generic log record processors
if (!model.getAdditionalProperties().isEmpty()) {
- throw new ConfigurationException(
- "Unrecognized log record processor(s): "
- + model.getAdditionalProperties().keySet().stream().collect(joining(",", "[", "]")));
+ Map additionalProperties = model.getAdditionalProperties();
+ if (additionalProperties.size() > 1) {
+ throw new ConfigurationException(
+ "Invalid configuration - multiple log record processors set: "
+ + additionalProperties.keySet().stream().collect(joining(",", "[", "]")));
+ }
+ Map.Entry processorKeyValue =
+ additionalProperties.entrySet().stream()
+ .findFirst()
+ .orElseThrow(
+ () ->
+ new IllegalStateException("Missing processor. This is a programming error."));
+ LogRecordProcessor logRecordProcessor =
+ FileConfigUtil.loadComponent(
+ spiHelper,
+ LogRecordProcessor.class,
+ processorKeyValue.getKey(),
+ processorKeyValue.getValue());
+ return FileConfigUtil.addAndReturn(closeables, logRecordProcessor);
} else {
throw new ConfigurationException("log processor must be set");
}
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java
index d0c50ebaa61..9d2e4362078 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java
@@ -17,6 +17,7 @@
import java.io.Closeable;
import java.time.Duration;
import java.util.List;
+import java.util.Map;
final class SpanProcessorFactory
implements Factory<
@@ -70,11 +71,26 @@ public SpanProcessor create(
return FileConfigUtil.addAndReturn(closeables, SimpleSpanProcessor.create(spanExporter));
}
- // TODO: add support for generic span processors
if (!model.getAdditionalProperties().isEmpty()) {
- throw new ConfigurationException(
- "Unrecognized span processor(s): "
- + model.getAdditionalProperties().keySet().stream().collect(joining(",", "[", "]")));
+ Map additionalProperties = model.getAdditionalProperties();
+ if (additionalProperties.size() > 1) {
+ throw new ConfigurationException(
+ "Invalid configuration - multiple span processors set: "
+ + additionalProperties.keySet().stream().collect(joining(",", "[", "]")));
+ }
+ Map.Entry processorKeyValue =
+ additionalProperties.entrySet().stream()
+ .findFirst()
+ .orElseThrow(
+ () ->
+ new IllegalStateException("Missing processor. This is a programming error."));
+ SpanProcessor spanProcessor =
+ FileConfigUtil.loadComponent(
+ spiHelper,
+ SpanProcessor.class,
+ processorKeyValue.getKey(),
+ processorKeyValue.getValue());
+ return FileConfigUtil.addAndReturn(closeables, spanProcessor);
} else {
throw new ConfigurationException("span processor must be set");
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java
index 06ad307ee06..31038580e82 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java
@@ -13,6 +13,7 @@
import io.opentelemetry.internal.testing.CleanupExtension;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessor;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporter;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessor;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -137,19 +139,35 @@ void create_SimpleConfigured() {
}
@Test
- void create_SpiProcessor() {
- List closeables = new ArrayList<>();
-
+ void create_SpiProcessor_Unknown() {
assertThatThrownBy(
() ->
LogRecordProcessorFactory.getInstance()
.create(
new LogRecordProcessor()
- .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ .withAdditionalProperty(
+ "unknown_key", ImmutableMap.of("key1", "value1")),
spiHelper,
- closeables))
+ new ArrayList<>()))
.isInstanceOf(ConfigurationException.class)
- .hasMessage("Unrecognized log record processor(s): [test]");
- cleanup.addCloseables(closeables);
+ .hasMessage(
+ "No component provider detected for io.opentelemetry.sdk.logs.LogRecordProcessor with name \"unknown_key\".");
+ }
+
+ @Test
+ void create_SpiExporter_Valid() {
+ io.opentelemetry.sdk.logs.LogRecordProcessor logRecordProcessor =
+ LogRecordProcessorFactory.getInstance()
+ .create(
+ new LogRecordProcessor()
+ .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ spiHelper,
+ new ArrayList<>());
+ assertThat(logRecordProcessor)
+ .isInstanceOf(LogRecordProcessorComponentProvider.TestLogRecordProcessor.class);
+ Assertions.assertThat(
+ ((LogRecordProcessorComponentProvider.TestLogRecordProcessor) logRecordProcessor)
+ .config.getString("key1"))
+ .isEqualTo("value1");
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java
index 8356339e063..64f0db469ec 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java
@@ -210,7 +210,7 @@ void create_PrometheusExporter() {
.MetricExporter()
.withPrometheus(new Prometheus()),
spiHelper,
- new ArrayList<>()))
+ closeables))
.isInstanceOf(ConfigurationException.class)
.hasMessage("prometheus exporter not supported in this context");
cleanup.addCloseables(closeables);
@@ -218,8 +218,6 @@ void create_PrometheusExporter() {
@Test
void create_SpiExporter_Unknown() {
- List closeables = new ArrayList<>();
-
assertThatThrownBy(
() ->
MetricExporterFactory.getInstance()
@@ -233,7 +231,6 @@ void create_SpiExporter_Unknown() {
.isInstanceOf(ConfigurationException.class)
.hasMessage(
"No component provider detected for io.opentelemetry.sdk.metrics.export.MetricExporter with name \"unknown_key\".");
- cleanup.addCloseables(closeables);
}
@Test
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java
index 972e0a137f9..19426bd1244 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java
@@ -13,6 +13,7 @@
import io.opentelemetry.internal.testing.CleanupExtension;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessor;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Otlp;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessor;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -137,19 +139,34 @@ void create_SimpleConfigured() {
}
@Test
- void create_SpiProcessor() {
- List closeables = new ArrayList<>();
-
+ void create_SpiProcessor_Unknown() {
assertThatThrownBy(
() ->
SpanProcessorFactory.getInstance()
.create(
new SpanProcessor()
- .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ .withAdditionalProperty(
+ "unknown_key", ImmutableMap.of("key1", "value1")),
spiHelper,
- closeables))
+ new ArrayList<>()))
.isInstanceOf(ConfigurationException.class)
- .hasMessage("Unrecognized span processor(s): [test]");
- cleanup.addCloseables(closeables);
+ .hasMessage(
+ "No component provider detected for io.opentelemetry.sdk.trace.SpanProcessor with name \"unknown_key\".");
+ }
+
+ @Test
+ void create_SpiExporter_Valid() {
+ io.opentelemetry.sdk.trace.SpanProcessor spanProcessor =
+ SpanProcessorFactory.getInstance()
+ .create(
+ new SpanProcessor()
+ .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ spiHelper,
+ new ArrayList<>());
+ assertThat(spanProcessor).isInstanceOf(SpanProcessorComponentProvider.TestSpanProcessor.class);
+ Assertions.assertThat(
+ ((SpanProcessorComponentProvider.TestSpanProcessor) spanProcessor)
+ .config.getString("key1"))
+ .isEqualTo("value1");
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java
new file mode 100644
index 00000000000..581f2726154
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.logs.LogRecordProcessor;
+import io.opentelemetry.sdk.logs.ReadWriteLogRecord;
+
+public class LogRecordProcessorComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return LogRecordProcessor.class;
+ }
+
+ @Override
+ public String getName() {
+ return "test";
+ }
+
+ @Override
+ public LogRecordProcessor create(StructuredConfigProperties config) {
+ return new TestLogRecordProcessor(config);
+ }
+
+ public static class TestLogRecordProcessor implements LogRecordProcessor {
+
+ public final StructuredConfigProperties config;
+
+ private TestLogRecordProcessor(StructuredConfigProperties config) {
+ this.config = config;
+ }
+
+ @Override
+ public void onEmit(Context context, ReadWriteLogRecord logRecord) {}
+
+ @Override
+ public CompletableResultCode shutdown() {
+ return CompletableResultCode.ofSuccess();
+ }
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java
new file mode 100644
index 00000000000..7bfe0936cd9
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.trace.ReadWriteSpan;
+import io.opentelemetry.sdk.trace.ReadableSpan;
+import io.opentelemetry.sdk.trace.SpanProcessor;
+
+public class SpanProcessorComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return SpanProcessor.class;
+ }
+
+ @Override
+ public String getName() {
+ return "test";
+ }
+
+ @Override
+ public SpanProcessor create(StructuredConfigProperties config) {
+ return new TestSpanProcessor(config);
+ }
+
+ public static class TestSpanProcessor implements SpanProcessor {
+
+ public final StructuredConfigProperties config;
+
+ private TestSpanProcessor(StructuredConfigProperties config) {
+ this.config = config;
+ }
+
+ @Override
+ public void onStart(Context parentContext, ReadWriteSpan span) {}
+
+ @Override
+ public boolean isStartRequired() {
+ return true;
+ }
+
+ @Override
+ public void onEnd(ReadableSpan span) {}
+
+ @Override
+ public boolean isEndRequired() {
+ return true;
+ }
+
+ @Override
+ public CompletableResultCode shutdown() {
+ return CompletableResultCode.ofSuccess();
+ }
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
index 6ab8ffdecc3..88759776549 100644
--- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
+++ b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -1,6 +1,8 @@
io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceOrderedFirstComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceOrderedSecondComponentProvider
From 938b03dff65ee752802f9c131f14afff29bd01d0 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:09:36 -0500
Subject: [PATCH 25/42] Add file configuration ComponentProvider support for
samplers (#6494)
---
.../fileconfig/FileConfiguration.java | 81 +++++++++++++------
.../incubator/fileconfig/SamplerFactory.java | 79 ++++++------------
.../YamlStructuredConfigProperties.java | 31 +++++--
.../FileConfigurationCreateTest.java | 2 +-
.../fileconfig/SamplerFactoryTest.java | 27 ++++++-
.../component/SamplerComponentProvider.java | 58 +++++++++++++
...toconfigure.spi.internal.ComponentProvider | 1 +
.../jaeger-remote-sampler/build.gradle.kts | 1 +
.../JaegerRemoteSamplerComponentProvider.java | 54 +++++++++++++
...toconfigure.spi.internal.ComponentProvider | 1 +
10 files changed, 245 insertions(+), 90 deletions(-)
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java
create mode 100644 sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java
create mode 100644 sdk-extensions/jaeger-remote-sampler/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfiguration.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfiguration.java
index 82888ed5735..1a28935086b 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfiguration.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfiguration.java
@@ -12,8 +12,10 @@
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Sampler;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
@@ -84,30 +86,10 @@ public static OpenTelemetrySdk parseAndCreate(InputStream inputStream) {
* @throws ConfigurationException if unable to interpret
*/
public static OpenTelemetrySdk create(OpenTelemetryConfiguration configurationModel) {
- List closeables = new ArrayList<>();
- try {
- return OpenTelemetryConfigurationFactory.getInstance()
- .create(
- configurationModel,
- SpiHelper.create(FileConfiguration.class.getClassLoader()),
- closeables);
- } catch (RuntimeException e) {
- logger.info(
- "Error encountered interpreting configuration model. Closing partially configured components.");
- for (Closeable closeable : closeables) {
- try {
- logger.fine("Closing " + closeable.getClass().getName());
- closeable.close();
- } catch (IOException ex) {
- logger.warning(
- "Error closing " + closeable.getClass().getName() + ": " + ex.getMessage());
- }
- }
- if (e instanceof ConfigurationException) {
- throw e;
- }
- throw new ConfigurationException("Unexpected configuration error", e);
- }
+ return createAndMaybeCleanup(
+ OpenTelemetryConfigurationFactory.getInstance(),
+ SpiHelper.create(FileConfiguration.class.getClassLoader()),
+ configurationModel);
}
/**
@@ -157,6 +139,57 @@ static StructuredConfigProperties toConfigProperties(Object model) {
return YamlStructuredConfigProperties.create(configurationMap);
}
+ /**
+ * Create a {@link Sampler} from the {@code samplerModel} representing the sampler config.
+ *
+ * This is used when samplers are composed, with one sampler accepting one or more additional
+ * samplers as config properties. The {@link ComponentProvider} implementation can call this to
+ * configure a delegate {@link Sampler} from the {@link StructuredConfigProperties} corresponding
+ * to a particular config property.
+ */
+ // TODO(jack-berg): add create methods for all SDK extension components supported by
+ // ComponentProvider
+ public static io.opentelemetry.sdk.trace.samplers.Sampler createSampler(
+ StructuredConfigProperties genericSamplerModel) {
+ Sampler samplerModel = convertToModel(genericSamplerModel, Sampler.class);
+ return createAndMaybeCleanup(
+ SamplerFactory.getInstance(),
+ SpiHelper.create(FileConfiguration.class.getClassLoader()),
+ samplerModel);
+ }
+
+ static T convertToModel(
+ StructuredConfigProperties structuredConfigProperties, Class modelType) {
+ if (!(structuredConfigProperties instanceof YamlStructuredConfigProperties)) {
+ throw new ConfigurationException(
+ "Only YamlStructuredConfigProperties can be converted to model");
+ }
+ return MAPPER.convertValue(
+ ((YamlStructuredConfigProperties) structuredConfigProperties).toMap(), modelType);
+ }
+
+ static R createAndMaybeCleanup(Factory factory, SpiHelper spiHelper, M model) {
+ List closeables = new ArrayList<>();
+ try {
+ return factory.create(model, spiHelper, closeables);
+ } catch (RuntimeException e) {
+ logger.info("Error encountered interpreting model. Closing partially configured components.");
+ for (Closeable closeable : closeables) {
+ try {
+ logger.fine("Closing " + closeable.getClass().getName());
+ closeable.close();
+ } catch (IOException ex) {
+ logger.warning(
+ "Error closing " + closeable.getClass().getName() + ": " + ex.getMessage());
+ }
+ }
+ if (e instanceof ConfigurationException) {
+ throw e;
+ }
+ throw new ConfigurationException("Unexpected configuration error", e);
+ }
+ }
+
/**
* {@link StandardConstructor} which substitutes environment variables.
*
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java
index f900015f8c4..2f8c3bc4520 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java
@@ -7,20 +7,14 @@
import static java.util.stream.Collectors.joining;
-import io.opentelemetry.sdk.autoconfigure.internal.NamedSpiManager;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.JaegerRemote;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ParentBased;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceIdRatioBased;
import io.opentelemetry.sdk.trace.samplers.ParentBasedSamplerBuilder;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import java.io.Closeable;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,70 +57,49 @@ public Sampler create(
: create(parentBasedModel.getRoot(), spiHelper, closeables);
ParentBasedSamplerBuilder builder = Sampler.parentBasedBuilder(root);
if (parentBasedModel.getRemoteParentSampled() != null) {
- builder.setRemoteParentSampled(
- create(parentBasedModel.getRemoteParentSampled(), spiHelper, closeables));
+ Sampler sampler = create(parentBasedModel.getRemoteParentSampled(), spiHelper, closeables);
+ builder.setRemoteParentSampled(sampler);
}
if (parentBasedModel.getRemoteParentNotSampled() != null) {
- builder.setRemoteParentNotSampled(
- create(parentBasedModel.getRemoteParentNotSampled(), spiHelper, closeables));
+ Sampler sampler =
+ create(parentBasedModel.getRemoteParentNotSampled(), spiHelper, closeables);
+ builder.setRemoteParentNotSampled(sampler);
}
if (parentBasedModel.getLocalParentSampled() != null) {
- builder.setLocalParentSampled(
- create(parentBasedModel.getLocalParentSampled(), spiHelper, closeables));
+ Sampler sampler = create(parentBasedModel.getLocalParentSampled(), spiHelper, closeables);
+ builder.setLocalParentSampled(sampler);
}
if (parentBasedModel.getLocalParentNotSampled() != null) {
- builder.setLocalParentNotSampled(
- create(parentBasedModel.getLocalParentNotSampled(), spiHelper, closeables));
+ Sampler sampler =
+ create(parentBasedModel.getLocalParentNotSampled(), spiHelper, closeables);
+ builder.setLocalParentNotSampled(sampler);
}
return builder.build();
}
JaegerRemote jaegerRemoteModel = model.getJaegerRemote();
if (jaegerRemoteModel != null) {
- // Translate from file configuration scheme to environment variable scheme. This is ultimately
- // interpreted by JaegerRemoteSamplerProvider, but we want to avoid the dependency on
- // opentelemetry-sdk-extension-jaeger-remote-sampler
- Map properties = new HashMap<>();
- if (jaegerRemoteModel.getEndpoint() != null) {
- properties.put("endpoint", jaegerRemoteModel.getEndpoint());
- }
- if (jaegerRemoteModel.getInterval() != null) {
- properties.put("pollingInterval", String.valueOf(jaegerRemoteModel.getInterval()));
- }
- // TODO(jack-berg): determine how to support initial sampler. This is first case where a
- // component configured via SPI has property that isn't available in the environment variable
- // scheme.
- String otelTraceSamplerArg =
- properties.entrySet().stream()
- .map(entry -> entry.getKey() + "=" + entry.getValue())
- .collect(joining(","));
-
- ConfigProperties configProperties =
- DefaultConfigProperties.createFromMap(
- Collections.singletonMap("otel.traces.sampler.arg", otelTraceSamplerArg));
- return FileConfigUtil.addAndReturn(
- closeables,
- FileConfigUtil.assertNotNull(
- samplerSpiManager(configProperties, spiHelper).getByName("jaeger_remote"),
- "jaeger remote sampler"));
+ model.getAdditionalProperties().put("jaeger_remote", jaegerRemoteModel);
}
- // TODO(jack-berg): add support for generic SPI samplers
if (!model.getAdditionalProperties().isEmpty()) {
- throw new ConfigurationException(
- "Unrecognized sampler(s): "
- + model.getAdditionalProperties().keySet().stream().collect(joining(",", "[", "]")));
+ Map additionalProperties = model.getAdditionalProperties();
+ if (additionalProperties.size() > 1) {
+ throw new ConfigurationException(
+ "Invalid configuration - multiple samplers exporters set: "
+ + additionalProperties.keySet().stream().collect(joining(",", "[", "]")));
+ }
+ Map.Entry exporterKeyValue =
+ additionalProperties.entrySet().stream()
+ .findFirst()
+ .orElseThrow(
+ () -> new IllegalStateException("Missing sampler. This is a programming error."));
+ Sampler sampler =
+ FileConfigUtil.loadComponent(
+ spiHelper, Sampler.class, exporterKeyValue.getKey(), exporterKeyValue.getValue());
+ return FileConfigUtil.addAndReturn(closeables, sampler);
} else {
throw new ConfigurationException("sampler must be set");
}
}
-
- private static NamedSpiManager samplerSpiManager(
- ConfigProperties config, SpiHelper spiHelper) {
- return spiHelper.loadConfigurable(
- ConfigurableSamplerProvider.class,
- ConfigurableSamplerProvider::getName,
- ConfigurableSamplerProvider::createSampler,
- config);
- }
}
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlStructuredConfigProperties.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlStructuredConfigProperties.java
index 6475bbe1698..2e9e20d3f0c 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlStructuredConfigProperties.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlStructuredConfigProperties.java
@@ -35,13 +35,13 @@ final class YamlStructuredConfigProperties implements StructuredConfigProperties
/** Values are {@link #isPrimitive(Object)}, {@link List} of scalars. */
private final Map simpleEntries;
- private final Map> listEntries;
- private final Map mapEntries;
+ private final Map> listEntries;
+ private final Map mapEntries;
private YamlStructuredConfigProperties(
Map simpleEntries,
- Map> listEntries,
- Map mapEntries) {
+ Map> listEntries,
+ Map mapEntries) {
this.simpleEntries = simpleEntries;
this.listEntries = listEntries;
this.mapEntries = mapEntries;
@@ -59,8 +59,8 @@ private YamlStructuredConfigProperties(
@SuppressWarnings("unchecked")
static YamlStructuredConfigProperties create(Map properties) {
Map simpleEntries = new HashMap<>();
- Map> listEntries = new HashMap<>();
- Map mapEntries = new HashMap<>();
+ Map> listEntries = new HashMap<>();
+ Map mapEntries = new HashMap<>();
for (Map.Entry entry : properties.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
@@ -73,7 +73,7 @@ static YamlStructuredConfigProperties create(Map properties) {
continue;
}
if (isListOfMaps(value)) {
- List list =
+ List list =
((List>) value)
.stream().map(YamlStructuredConfigProperties::create).collect(toList());
listEntries.put(key, list);
@@ -257,7 +257,11 @@ public StructuredConfigProperties getStructured(String name) {
@Nullable
@Override
public List getStructuredList(String name) {
- return listEntries.get(name);
+ List value = listEntries.get(name);
+ if (value != null) {
+ return Collections.unmodifiableList(value);
+ }
+ return null;
}
@Override
@@ -277,4 +281,15 @@ public String toString() {
mapEntries.forEach((key, value) -> joiner.add(key + "=" + value));
return joiner.toString();
}
+
+ /** Return a map representation of the data. */
+ Map toMap() {
+ Map result = new HashMap<>(simpleEntries);
+ listEntries.forEach(
+ (key, value) ->
+ result.put(
+ key, value.stream().map(YamlStructuredConfigProperties::toMap).collect(toList())));
+ mapEntries.forEach((key, value) -> result.put(key, value.toMap()));
+ return Collections.unmodifiableMap(result);
+ }
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
index dcd90cd60c4..d47ae14eb9a 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
@@ -121,7 +121,7 @@ void parseAndCreate_Exception_CleansUpPartials() {
.hasMessage(
"No component provider detected for io.opentelemetry.sdk.logs.export.LogRecordExporter with name \"foo\".");
logCapturer.assertContains(
- "Error encountered interpreting configuration model. Closing partially configured components.");
+ "Error encountered interpreting model. Closing partially configured components.");
logCapturer.assertContains(
"Closing io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter");
logCapturer.assertContains("Closing io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor");
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java
index 4df997c3b2a..4413ddb34c7 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java
@@ -13,6 +13,7 @@
import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.component.SamplerComponentProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOff;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOn;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.JaegerRemote;
@@ -116,23 +117,41 @@ private static Stream createArguments() {
JaegerRemoteSampler.builder()
.setEndpoint("http://jaeger-remote-endpoint")
.setPollingInterval(Duration.ofSeconds(10))
+ .setInitialSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOff())
.build()));
}
@Test
- void create_SpiExporter() {
+ void create_SpiExporter_Unknown() {
List closeables = new ArrayList<>();
assertThatThrownBy(
() ->
SamplerFactory.getInstance()
.create(
- new Sampler()
- .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ new io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model
+ .Sampler()
+ .withAdditionalProperty(
+ "unknown_key", ImmutableMap.of("key1", "value1")),
spiHelper,
new ArrayList<>()))
.isInstanceOf(ConfigurationException.class)
- .hasMessage("Unrecognized sampler(s): [test]");
+ .hasMessage(
+ "No component provider detected for io.opentelemetry.sdk.trace.samplers.Sampler with name \"unknown_key\".");
cleanup.addCloseables(closeables);
}
+
+ @Test
+ void create_SpiExporter_Valid() {
+ io.opentelemetry.sdk.trace.samplers.Sampler sampler =
+ SamplerFactory.getInstance()
+ .create(
+ new io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Sampler()
+ .withAdditionalProperty("test", ImmutableMap.of("key1", "value1")),
+ spiHelper,
+ new ArrayList<>());
+ assertThat(sampler).isInstanceOf(SamplerComponentProvider.TestSampler.class);
+ assertThat(((SamplerComponentProvider.TestSampler) sampler).config.getString("key1"))
+ .isEqualTo("value1");
+ }
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java
new file mode 100644
index 00000000000..2d4c983e4d7
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.trace.data.LinkData;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
+import io.opentelemetry.sdk.trace.samplers.SamplingResult;
+import java.util.List;
+
+public class SamplerComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return Sampler.class;
+ }
+
+ @Override
+ public String getName() {
+ return "test";
+ }
+
+ @Override
+ public Sampler create(StructuredConfigProperties config) {
+ return new TestSampler(config);
+ }
+
+ public static class TestSampler implements Sampler {
+
+ public final StructuredConfigProperties config;
+
+ private TestSampler(StructuredConfigProperties config) {
+ this.config = config;
+ }
+
+ @Override
+ public SamplingResult shouldSample(
+ Context parentContext,
+ String traceId,
+ String name,
+ SpanKind spanKind,
+ Attributes attributes,
+ List parentLinks) {
+ return SamplingResult.recordOnly();
+ }
+
+ @Override
+ public String getDescription() {
+ return "test";
+ }
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
index 88759776549..2bc161f4d9c 100644
--- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
+++ b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -1,6 +1,7 @@
io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.SamplerComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceComponentProvider
diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
index fca0210b6a1..ac250eef3d1 100644
--- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
+++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
@@ -13,6 +13,7 @@ otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.jaeger")
dependencies {
api(project(":sdk:all"))
compileOnly(project(":sdk-extensions:autoconfigure"))
+ compileOnly(project(":sdk-extensions:incubator"))
implementation(project(":sdk:all"))
implementation(project(":exporters:common"))
diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java
new file mode 100644
index 00000000000..9ce99c908b2
--- /dev/null
+++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler.internal;
+
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfiguration;
+import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler;
+import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSamplerBuilder;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
+import java.time.Duration;
+
+/**
+ * File configuration SPI implementation for {@link JaegerRemoteSampler}.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class JaegerRemoteSamplerComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return Sampler.class;
+ }
+
+ @Override
+ public String getName() {
+ return "jaeger_remote";
+ }
+
+ @Override
+ public Sampler create(StructuredConfigProperties config) {
+ JaegerRemoteSamplerBuilder builder = JaegerRemoteSampler.builder();
+
+ // Optional configuration
+ String endpoint = config.getString("endpoint");
+ if (endpoint != null) {
+ builder.setEndpoint(endpoint);
+ }
+ Long pollingIntervalMs = config.getLong("internal");
+ if (pollingIntervalMs != null) {
+ builder.setPollingInterval(Duration.ofMillis(pollingIntervalMs));
+ }
+ StructuredConfigProperties initialSamplerModel = config.getStructured("initial_sampler");
+ if (initialSamplerModel != null) {
+ Sampler initialSampler = FileConfiguration.createSampler(initialSamplerModel);
+ builder.setInitialSampler(initialSampler);
+ }
+
+ return builder.build();
+ }
+}
diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/jaeger-remote-sampler/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
new file mode 100644
index 00000000000..a06efe29e4f
--- /dev/null
+++ b/sdk-extensions/jaeger-remote-sampler/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -0,0 +1 @@
+io.opentelemetry.sdk.extension.trace.jaeger.sampler.internal.JaegerRemoteSamplerComponentProvider
From d37c1c74e7ec20a990e1a0a07a5daa1a2ecf9f0b Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:18:19 -0500
Subject: [PATCH 26/42] Add file configuration ComponentProvider support for
propagators (#6624)
---
.../internal/B3ComponentProvider.java | 36 ++++++++++++
.../internal/B3MultiComponentProvider.java | 36 ++++++++++++
.../internal/JaegerComponentProvider.java | 35 ++++++++++++
.../internal/OtTraceComponentProvider.java | 36 ++++++++++++
...toconfigure.spi.internal.ComponentProvider | 4 ++
.../fileconfig/TextMapPropagatorFactory.java | 26 ++-------
.../FileConfigurationCreateTest.java | 5 +-
.../TextMapPropagatorFactoryTest.java | 22 +++++++-
.../TextMapPropagatorComponentProvider.java | 55 +++++++++++++++++++
...toconfigure.spi.internal.ComponentProvider | 1 +
10 files changed, 233 insertions(+), 23 deletions(-)
create mode 100644 extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3ComponentProvider.java
create mode 100644 extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3MultiComponentProvider.java
create mode 100644 extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/JaegerComponentProvider.java
create mode 100644 extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/OtTraceComponentProvider.java
create mode 100644 extensions/trace-propagators/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
create mode 100644 sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java
diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3ComponentProvider.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3ComponentProvider.java
new file mode 100644
index 00000000000..b97134eda7a
--- /dev/null
+++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3ComponentProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.extension.trace.propagation.internal;
+
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+
+/**
+ * File configuration SPI implementation for {@link B3Propagator} which allows enables the {@link
+ * B3Propagator#injectingSingleHeader()}.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public final class B3ComponentProvider implements ComponentProvider {
+
+ @Override
+ public Class getType() {
+ return TextMapPropagator.class;
+ }
+
+ @Override
+ public String getName() {
+ return "b3";
+ }
+
+ @Override
+ public TextMapPropagator create(StructuredConfigProperties config) {
+ return B3Propagator.injectingSingleHeader();
+ }
+}
diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3MultiComponentProvider.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3MultiComponentProvider.java
new file mode 100644
index 00000000000..77ac501a2ea
--- /dev/null
+++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/B3MultiComponentProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.extension.trace.propagation.internal;
+
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+
+/**
+ * File configuration SPI implementation for {@link B3Propagator} which allows enables the {@link
+ * B3Propagator#injectingMultiHeaders()}.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public final class B3MultiComponentProvider implements ComponentProvider {
+
+ @Override
+ public Class getType() {
+ return TextMapPropagator.class;
+ }
+
+ @Override
+ public String getName() {
+ return "b3multi";
+ }
+
+ @Override
+ public TextMapPropagator create(StructuredConfigProperties config) {
+ return B3Propagator.injectingMultiHeaders();
+ }
+}
diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/JaegerComponentProvider.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/JaegerComponentProvider.java
new file mode 100644
index 00000000000..0fb844a40da
--- /dev/null
+++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/JaegerComponentProvider.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.extension.trace.propagation.internal;
+
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+
+/**
+ * File configuration SPI implementation for {@link JaegerPropagator}.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public final class JaegerComponentProvider implements ComponentProvider {
+
+ @Override
+ public Class getType() {
+ return TextMapPropagator.class;
+ }
+
+ @Override
+ public String getName() {
+ return "jaeger";
+ }
+
+ @Override
+ public TextMapPropagator create(StructuredConfigProperties config) {
+ return JaegerPropagator.getInstance();
+ }
+}
diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/OtTraceComponentProvider.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/OtTraceComponentProvider.java
new file mode 100644
index 00000000000..97b41aad3af
--- /dev/null
+++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/OtTraceComponentProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.extension.trace.propagation.internal;
+
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.extension.trace.propagation.OtTracePropagator;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+
+/**
+ * File configuration SPI implementation for {@link B3Propagator}.
+ *
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public final class OtTraceComponentProvider implements ComponentProvider {
+
+ @Override
+ public Class getType() {
+ return TextMapPropagator.class;
+ }
+
+ @Override
+ public String getName() {
+ return "ottrace";
+ }
+
+ @Override
+ public TextMapPropagator create(StructuredConfigProperties config) {
+ return OtTracePropagator.getInstance();
+ }
+}
diff --git a/extensions/trace-propagators/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/extensions/trace-propagators/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
new file mode 100644
index 00000000000..d4194f2b014
--- /dev/null
+++ b/extensions/trace-propagators/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -0,0 +1,4 @@
+io.opentelemetry.extension.trace.propagation.internal.B3ComponentProvider
+io.opentelemetry.extension.trace.propagation.internal.B3MultiComponentProvider
+io.opentelemetry.extension.trace.propagation.internal.JaegerComponentProvider
+io.opentelemetry.extension.trace.propagation.internal.OtTraceComponentProvider
diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java
index 965093d1c6b..b2a212aaa57 100644
--- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java
+++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java
@@ -8,17 +8,13 @@
import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.sdk.autoconfigure.internal.NamedSpiManager;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
import java.io.Closeable;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
final class TextMapPropagatorFactory implements Factory, TextMapPropagator> {
@@ -45,22 +41,15 @@ public TextMapPropagator create(
return TextMapPropagator.noop();
}
- NamedSpiManager spiPropagatorsManager =
- spiHelper.loadConfigurable(
- ConfigurablePropagatorProvider.class,
- ConfigurablePropagatorProvider::getName,
- ConfigurablePropagatorProvider::getPropagator,
- DefaultConfigProperties.createFromMap(Collections.emptyMap()));
- Set propagators = new LinkedHashSet<>();
+ List propagators = new ArrayList<>();
for (String propagator : model) {
- propagators.add(getPropagator(propagator, spiPropagatorsManager));
+ propagators.add(getPropagator(spiHelper, propagator));
}
return TextMapPropagator.composite(propagators);
}
- private static TextMapPropagator getPropagator(
- String name, NamedSpiManager spiPropagatorsManager) {
+ private static TextMapPropagator getPropagator(SpiHelper spiHelper, String name) {
if (name.equals("tracecontext")) {
return W3CTraceContextPropagator.getInstance();
}
@@ -68,10 +57,7 @@ private static TextMapPropagator getPropagator(
return W3CBaggagePropagator.getInstance();
}
- TextMapPropagator spiPropagator = spiPropagatorsManager.getByName(name);
- if (spiPropagator != null) {
- return spiPropagator;
- }
- throw new ConfigurationException("Unrecognized propagator: " + name);
+ return FileConfigUtil.loadComponent(
+ spiHelper, TextMapPropagator.class, name, Collections.emptyMap());
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
index d47ae14eb9a..51f70d930ec 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java
@@ -86,7 +86,10 @@ void parseAndCreate_Examples(@TempDir Path tempDir)
"client_key: .*\n", "client_key: " + clientKeyPath + System.lineSeparator())
.replaceAll(
"client_certificate: .*\n",
- "client_certificate: " + clientCertificatePath + System.lineSeparator());
+ "client_certificate: " + clientCertificatePath + System.lineSeparator())
+ // TODO: remove once ComponentProvider SPI implemented in
+ // https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-xray-propagator
+ .replaceAll("xray,", "");
InputStream is =
new ByteArrayInputStream(rewrittenExampleContent.getBytes(StandardCharsets.UTF_8));
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactoryTest.java
index d2355fda46d..d2a1d5d242d 100644
--- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactoryTest.java
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactoryTest.java
@@ -16,6 +16,8 @@
import io.opentelemetry.extension.trace.propagation.OtTracePropagator;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.component.TextMapPropagatorComponentProvider;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -68,12 +70,28 @@ void create_NoneAndOther() {
}
@Test
- void create_UnknownSpiPropagator() {
+ void create_SpiPropagator_Unknown() {
assertThatThrownBy(
() ->
TextMapPropagatorFactory.getInstance()
.create(Collections.singletonList("foo"), spiHelper, Collections.emptyList()))
.isInstanceOf(ConfigurationException.class)
- .hasMessage("Unrecognized propagator: foo");
+ .hasMessage(
+ "No component provider detected for io.opentelemetry.context.propagation.TextMapPropagator with name \"foo\".");
+ }
+
+ @Test
+ void create_SpiPropagator_Valid() {
+ TextMapPropagator textMapPropagator =
+ TextMapPropagatorFactory.getInstance()
+ .create(Collections.singletonList("test"), spiHelper, new ArrayList<>());
+ assertThat(textMapPropagator)
+ .isInstanceOfSatisfying(
+ TextMapPropagatorComponentProvider.TestTextMapPropagator.class,
+ testTextMapPropagator ->
+ assertThat(testTextMapPropagator.config)
+ .isInstanceOfSatisfying(
+ YamlStructuredConfigProperties.class,
+ config -> assertThat(config.getPropertyKeys()).isEmpty()));
}
}
diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java
new file mode 100644
index 00000000000..a3005beba4b
--- /dev/null
+++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
+import java.util.Collection;
+import java.util.Collections;
+import javax.annotation.Nullable;
+
+public class TextMapPropagatorComponentProvider implements ComponentProvider {
+ @Override
+ public Class getType() {
+ return TextMapPropagator.class;
+ }
+
+ @Override
+ public String getName() {
+ return "test";
+ }
+
+ @Override
+ public TextMapPropagator create(StructuredConfigProperties config) {
+ return new TestTextMapPropagator(config);
+ }
+
+ public static class TestTextMapPropagator implements TextMapPropagator {
+
+ public final StructuredConfigProperties config;
+
+ private TestTextMapPropagator(StructuredConfigProperties config) {
+ this.config = config;
+ }
+
+ @Override
+ public Collection fields() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void inject(Context context, @Nullable C carrier, TextMapSetter setter) {}
+
+ @Override
+ public Context extract(Context context, @Nullable C carrier, TextMapGetter getter) {
+ return context;
+ }
+ }
+}
diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
index 2bc161f4d9c..bf04a784ecd 100644
--- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
+++ b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -1,6 +1,7 @@
io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider
+io.opentelemetry.sdk.extension.incubator.fileconfig.component.TextMapPropagatorComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SamplerComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider
io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider
From 649f963a1aca37289e3e8e6c19e88a2b1c2b3052 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Fri, 30 Aug 2024 10:22:38 -0500
Subject: [PATCH 27/42] Stabilize log any value (#6591)
---
.../io/opentelemetry/api/common/KeyValue.java | 25 ++
.../api/common/KeyValueImpl.java | 18 ++
.../api/common/KeyValueList.java | 75 ++++++
.../io/opentelemetry/api/common/Value.java | 117 +++++++++
.../opentelemetry/api/common/ValueArray.java | 67 ++++++
.../api/common/ValueBoolean.java} | 18 +-
.../opentelemetry/api/common/ValueBytes.java} | 18 +-
.../api/common/ValueDouble.java} | 18 +-
.../opentelemetry/api/common/ValueLong.java} | 18 +-
.../api/common/ValueString.java} | 18 +-
.../opentelemetry/api/common/ValueType.java} | 4 +-
.../opentelemetry/api/logs/DefaultLogger.java | 6 +
.../api/logs/LogRecordBuilder.java | 13 +-
.../api/logs/DefaultLoggerTest.java | 2 +
.../io/opentelemetry/api/logs/ValueTest.java | 215 +++++++++++++++++
api/incubator/README.md | 7 +-
.../incubator/events/DefaultEventLogger.java | 4 +-
.../api/incubator/events/EventBuilder.java | 51 ++--
.../api/incubator/logs/AnyValue.java | 111 ---------
.../api/incubator/logs/AnyValueArray.java | 67 ------
.../logs/ExtendedLogRecordBuilder.java | 4 +-
.../api/incubator/logs/KeyAnyValue.java | 25 --
.../api/incubator/logs/KeyAnyValueImpl.java | 18 --
.../api/incubator/logs/KeyAnyValueList.java | 75 ------
.../events/DefaultEventLoggerTest.java | 12 +-
.../incubator/events/EventApiUsageTest.java | 25 +-
.../api/incubator/logs/AnyValueTest.java | 222 ------------------
.../logs/ExtendedLogsBridgeApiUsageTest.java | 56 -----
.../otel.japicmp-conventions.gradle.kts | 13 +-
.../current_vs_latest/opentelemetry-api.txt | 41 +++-
.../opentelemetry-sdk-logs.txt | 15 +-
.../opentelemetry-sdk-testing.txt | 15 +-
.../logging/SystemOutLogRecordExporter.java | 4 +-
.../otlp/LogsRequestMarshalerBenchmark.java | 7 +-
.../internal/otlp/AnyValueMarshaler.java | 24 +-
.../otlp/AnyValueStatelessMarshaler.java | 18 +-
.../internal/otlp/ArrayAnyValueMarshaler.java | 4 +-
.../otlp/ArrayAnyValueStatelessMarshaler.java | 8 +-
.../otlp/KeyValueListAnyValueMarshaler.java | 6 +-
...eyValueListAnyValueStatelessMarshaler.java | 9 +-
.../internal/otlp/KeyValueMarshaler.java | 21 +-
.../otlp/KeyValueStatelessMarshaler.java | 28 ++-
.../internal/otlp/logs/LogMarshaler.java | 37 +--
.../otlp/logs/LogStatelessMarshaler.java | 67 +-----
...halerTest.java => ValueMarshalerTest.java} | 29 ++-
.../OtlpExporterIntegrationTest.java | 65 ++---
.../sdk/logs/SdkLogRecordBuilder.java | 13 +-
.../sdk/logs/SdkLogRecordData.java | 21 +-
.../sdk/logs/SdkReadWriteLogRecord.java | 8 +-
.../io/opentelemetry/sdk/logs/data/Body.java | 28 ++-
.../sdk/logs/data/EmptyBody.java | 1 +
.../sdk/logs/data/LogRecordData.java | 20 +-
.../sdk/logs/data/StringBody.java | 1 +
.../sdk/logs/internal/AnyValueBody.java | 43 ----
.../sdk/logs/internal/SdkEventBuilder.java | 8 +-
.../sdk/logs/AnyValueBodyTest.java | 156 ------------
.../sdk/logs/ReadWriteLogRecordTest.java | 4 +-
.../sdk/logs/SdkLogRecordBuilderTest.java | 4 +-
.../opentelemetry/sdk/logs/ValueBodyTest.java | 171 ++++++++++++++
.../opentelemetry/sdk/logs/data/BodyTest.java | 1 +
.../internal/SdkEventLoggerProviderTest.java | 69 +++---
.../testing/assertj/LogRecordDataAssert.java | 17 +-
.../sdk/testing/logs/TestLogRecordData.java | 38 ++-
.../testing/junit4/OpenTelemetryRuleTest.java | 9 +-
.../junit5/OpenTelemetryExtensionTest.java | 9 +-
65 files changed, 1185 insertions(+), 1156 deletions(-)
create mode 100644 api/all/src/main/java/io/opentelemetry/api/common/KeyValue.java
create mode 100644 api/all/src/main/java/io/opentelemetry/api/common/KeyValueImpl.java
create mode 100644 api/all/src/main/java/io/opentelemetry/api/common/KeyValueList.java
create mode 100644 api/all/src/main/java/io/opentelemetry/api/common/Value.java
create mode 100644 api/all/src/main/java/io/opentelemetry/api/common/ValueArray.java
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java => all/src/main/java/io/opentelemetry/api/common/ValueBoolean.java} (55%)
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java => all/src/main/java/io/opentelemetry/api/common/ValueBytes.java} (61%)
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java => all/src/main/java/io/opentelemetry/api/common/ValueDouble.java} (56%)
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java => all/src/main/java/io/opentelemetry/api/common/ValueLong.java} (56%)
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java => all/src/main/java/io/opentelemetry/api/common/ValueString.java} (58%)
rename api/{incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java => all/src/main/java/io/opentelemetry/api/common/ValueType.java} (84%)
create mode 100644 api/all/src/test/java/io/opentelemetry/api/logs/ValueTest.java
delete mode 100644 api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java
delete mode 100644 api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java
delete mode 100644 api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValue.java
delete mode 100644 api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueImpl.java
delete mode 100644 api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueList.java
delete mode 100644 api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/AnyValueTest.java
rename exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/{AnyValueMarshalerTest.java => ValueMarshalerTest.java} (89%)
delete mode 100644 sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/AnyValueBody.java
delete mode 100644 sdk/logs/src/test/java/io/opentelemetry/sdk/logs/AnyValueBodyTest.java
create mode 100644 sdk/logs/src/test/java/io/opentelemetry/sdk/logs/ValueBodyTest.java
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/KeyValue.java b/api/all/src/main/java/io/opentelemetry/api/common/KeyValue.java
new file mode 100644
index 00000000000..341b9d1227a
--- /dev/null
+++ b/api/all/src/main/java/io/opentelemetry/api/common/KeyValue.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.common;
+
+/**
+ * Key-value pair of {@link String} key and {@link Value} value.
+ *
+ * @see Value#of(KeyValue...)
+ */
+public interface KeyValue {
+
+ /** Returns a {@link KeyValue} for the given {@code key} and {@code value}. */
+ static KeyValue of(String key, Value value) {
+ return KeyValueImpl.create(key, value);
+ }
+
+ /** Returns the key. */
+ String getKey();
+
+ /** Returns the value. */
+ Value getValue();
+}
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/KeyValueImpl.java b/api/all/src/main/java/io/opentelemetry/api/common/KeyValueImpl.java
new file mode 100644
index 00000000000..1525c3f3c69
--- /dev/null
+++ b/api/all/src/main/java/io/opentelemetry/api/common/KeyValueImpl.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.common;
+
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+abstract class KeyValueImpl implements KeyValue {
+
+ KeyValueImpl() {}
+
+ static KeyValueImpl create(String key, Value value) {
+ return new AutoValue_KeyValueImpl(key, value);
+ }
+}
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/KeyValueList.java b/api/all/src/main/java/io/opentelemetry/api/common/KeyValueList.java
new file mode 100644
index 00000000000..42801205564
--- /dev/null
+++ b/api/all/src/main/java/io/opentelemetry/api/common/KeyValueList.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.common;
+
+import static java.util.stream.Collectors.joining;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+final class KeyValueList implements Value> {
+
+ private final List value;
+
+ private KeyValueList(List value) {
+ this.value = value;
+ }
+
+ static Value> create(KeyValue... value) {
+ Objects.requireNonNull(value, "value must not be null");
+ List list = new ArrayList<>(value.length);
+ list.addAll(Arrays.asList(value));
+ return new KeyValueList(Collections.unmodifiableList(list));
+ }
+
+ static Value> createFromMap(Map> value) {
+ Objects.requireNonNull(value, "value must not be null");
+ KeyValue[] array =
+ value.entrySet().stream()
+ .map(entry -> KeyValue.of(entry.getKey(), entry.getValue()))
+ .toArray(KeyValue[]::new);
+ return create(array);
+ }
+
+ @Override
+ public ValueType getType() {
+ return ValueType.KEY_VALUE_LIST;
+ }
+
+ @Override
+ public List getValue() {
+ return value;
+ }
+
+ @Override
+ public String asString() {
+ return value.stream()
+ .map(item -> item.getKey() + "=" + item.getValue().asString())
+ .collect(joining(", ", "[", "]"));
+ }
+
+ @Override
+ public String toString() {
+ return "KeyValueList{" + asString() + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+}
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/Value.java b/api/all/src/main/java/io/opentelemetry/api/common/Value.java
new file mode 100644
index 00000000000..68da725010b
--- /dev/null
+++ b/api/all/src/main/java/io/opentelemetry/api/common/Value.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.common;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Value mirrors the proto AnyValue
+ * message type, and is used to model any type.
+ *
+ * It can be used to represent:
+ *
+ *
+ * - Primitive values via {@link #of(long)}, {@link #of(String)}, {@link #of(boolean)}, {@link
+ * #of(double)}.
+ *
- String-keyed maps (i.e. associative arrays, dictionaries) via {@link #of(KeyValue...)},
+ * {@link #of(Map)}. Note, because map values are type {@link Value}, maps can be nested
+ * within other maps.
+ *
- Arrays (heterogeneous or homogenous) via {@link #of(Value[])}. Note, because array values
+ * are type {@link Value}, arrays can contain primitives, complex types like maps or arrays,
+ * or any combination.
+ *
- Raw bytes via {@link #of(byte[])}
+ *
+ *
+ * Currently, Value is only used as an argument for {@link
+ * io.opentelemetry.api.logs.LogRecordBuilder#setBody(Value)}.
+ *
+ * @param the type. See {@link #getValue()} for description of types.
+ */
+public interface Value {
+
+ /** Returns an {@link Value} for the {@link String} value. */
+ static Value of(String value) {
+ return ValueString.create(value);
+ }
+
+ /** Returns an {@link Value} for the {@code boolean} value. */
+ static Value of(boolean value) {
+ return ValueBoolean.create(value);
+ }
+
+ /** Returns an {@link Value} for the {@code long} value. */
+ static Value of(long value) {
+ return ValueLong.create(value);
+ }
+
+ /** Returns an {@link Value} for the {@code double} value. */
+ static Value of(double value) {
+ return ValueDouble.create(value);
+ }
+
+ /** Returns an {@link Value} for the {@code byte[]} value. */
+ static Value of(byte[] value) {
+ return ValueBytes.create(value);
+ }
+
+ /** Returns an {@link Value} for the array of {@link Value} values. */
+ static Value>> of(Value... value) {
+ return ValueArray.create(value);
+ }
+
+ /** Returns an {@link Value} for the list of {@link Value} values. */
+ static Value>> of(List> value) {
+ return ValueArray.create(value);
+ }
+
+ /**
+ * Returns an {@link Value} for the array of {@link KeyValue} values. {@link KeyValue#getKey()}
+ * values should not repeat - duplicates may be dropped.
+ */
+ static Value> of(KeyValue... value) {
+ return KeyValueList.create(value);
+ }
+
+ /** Returns an {@link Value} for the {@link Map} of key, {@link Value}. */
+ static Value> of(Map> value) {
+ return KeyValueList.createFromMap(value);
+ }
+
+ /** Returns the type of this {@link Value}. Useful for building switch statements. */
+ ValueType getType();
+
+ /**
+ * Returns the value for this {@link Value}.
+ *
+ * The return type varies by {@link #getType()} as described below:
+ *
+ *
+ * - {@link ValueType#STRING} returns {@link String}
+ *
- {@link ValueType#BOOLEAN} returns {@code boolean}
+ *
- {@link ValueType#LONG} returns {@code long}
+ *
- {@link ValueType#DOUBLE} returns {@code double}
+ *
- {@link ValueType#ARRAY} returns {@link List} of {@link Value}
+ *
- {@link ValueType#KEY_VALUE_LIST} returns {@link List} of {@link KeyValue}
+ *
- {@link ValueType#BYTES} returns read only {@link ByteBuffer}. See {@link
+ * ByteBuffer#asReadOnlyBuffer()}.
+ *
+ */
+ T getValue();
+
+ /**
+ * Return a string encoding of this {@link Value}. This is intended to be a fallback serialized
+ * representation in case there is no suitable encoding that can utilize {@link #getType()} /
+ * {@link #getValue()} to serialize specific types.
+ *
+ * WARNING: No guarantees are made about the encoding of this string response. It MAY change in
+ * a future minor release. If you need a reliable string encoding, write your own serializer.
+ */
+ // TODO(jack-berg): Should this be a JSON encoding?
+ String asString();
+}
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/ValueArray.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueArray.java
new file mode 100644
index 00000000000..55c9e5f42b7
--- /dev/null
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueArray.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.common;
+
+import static java.util.stream.Collectors.joining;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+final class ValueArray implements Value>> {
+
+ private final List> value;
+
+ private ValueArray(List> value) {
+ this.value = value;
+ }
+
+ static Value>> create(Value... value) {
+ Objects.requireNonNull(value, "value must not be null");
+ List> list = new ArrayList<>(value.length);
+ list.addAll(Arrays.asList(value));
+ return new ValueArray(Collections.unmodifiableList(list));
+ }
+
+ static Value>> create(List> value) {
+ return new ValueArray(Collections.unmodifiableList(value));
+ }
+
+ @Override
+ public ValueType getType() {
+ return ValueType.ARRAY;
+ }
+
+ @Override
+ public List> getValue() {
+ return value;
+ }
+
+ @Override
+ public String asString() {
+ return value.stream().map(Value::asString).collect(joining(", ", "[", "]"));
+ }
+
+ @Override
+ public String toString() {
+ return "ValueArray{" + asString() + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueBoolean.java
similarity index 55%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueBoolean.java
index fcaa7525241..a4364d414df 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueBoolean.java
@@ -3,25 +3,25 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
import java.util.Objects;
-final class AnyValueBoolean implements AnyValue {
+final class ValueBoolean implements Value {
private final boolean value;
- private AnyValueBoolean(boolean value) {
+ private ValueBoolean(boolean value) {
this.value = value;
}
- static AnyValue create(boolean value) {
- return new AnyValueBoolean(value);
+ static Value create(boolean value) {
+ return new ValueBoolean(value);
}
@Override
- public AnyValueType getType() {
- return AnyValueType.BOOLEAN;
+ public ValueType getType() {
+ return ValueType.BOOLEAN;
}
@Override
@@ -36,7 +36,7 @@ public String asString() {
@Override
public String toString() {
- return "AnyValueBoolean{" + asString() + "}";
+ return "ValueBoolean{" + asString() + "}";
}
@Override
@@ -44,7 +44,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- return (o instanceof AnyValue) && Objects.equals(this.value, ((AnyValue) o).getValue());
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
}
@Override
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueBytes.java
similarity index 61%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueBytes.java
index 4f572dee172..8d925cd174d 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueBytes.java
@@ -3,29 +3,29 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Base64;
import java.util.Objects;
-final class AnyValueBytes implements AnyValue {
+final class ValueBytes implements Value {
private final byte[] raw;
- private AnyValueBytes(byte[] value) {
+ private ValueBytes(byte[] value) {
this.raw = value;
}
- static AnyValue create(byte[] value) {
+ static Value create(byte[] value) {
Objects.requireNonNull(value, "value must not be null");
- return new AnyValueBytes(Arrays.copyOf(value, value.length));
+ return new ValueBytes(Arrays.copyOf(value, value.length));
}
@Override
- public AnyValueType getType() {
- return AnyValueType.BYTES;
+ public ValueType getType() {
+ return ValueType.BYTES;
}
@Override
@@ -40,7 +40,7 @@ public String asString() {
@Override
public String toString() {
- return "AnyValueBytes{" + asString() + "}";
+ return "ValueBytes{" + asString() + "}";
}
@Override
@@ -48,7 +48,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- return (o instanceof AnyValueBytes) && Arrays.equals(this.raw, ((AnyValueBytes) o).raw);
+ return (o instanceof ValueBytes) && Arrays.equals(this.raw, ((ValueBytes) o).raw);
}
@Override
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueDouble.java
similarity index 56%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueDouble.java
index e1ab55f8528..21f13dd7e78 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueDouble.java
@@ -3,25 +3,25 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
import java.util.Objects;
-final class AnyValueDouble implements AnyValue {
+final class ValueDouble implements Value {
private final double value;
- private AnyValueDouble(double value) {
+ private ValueDouble(double value) {
this.value = value;
}
- static AnyValue create(double value) {
- return new AnyValueDouble(value);
+ static Value create(double value) {
+ return new ValueDouble(value);
}
@Override
- public AnyValueType getType() {
- return AnyValueType.DOUBLE;
+ public ValueType getType() {
+ return ValueType.DOUBLE;
}
@Override
@@ -36,7 +36,7 @@ public String asString() {
@Override
public String toString() {
- return "AnyValueDouble{" + asString() + "}";
+ return "ValueDouble{" + asString() + "}";
}
@Override
@@ -44,7 +44,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- return (o instanceof AnyValue) && Objects.equals(this.value, ((AnyValue) o).getValue());
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
}
@Override
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueLong.java
similarity index 56%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueLong.java
index 0cc1d3beafa..8cd1bca4bf9 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueLong.java
@@ -3,25 +3,25 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
import java.util.Objects;
-final class AnyValueLong implements AnyValue {
+final class ValueLong implements Value {
private final long value;
- private AnyValueLong(long value) {
+ private ValueLong(long value) {
this.value = value;
}
- static AnyValue create(long value) {
- return new AnyValueLong(value);
+ static Value create(long value) {
+ return new ValueLong(value);
}
@Override
- public AnyValueType getType() {
- return AnyValueType.LONG;
+ public ValueType getType() {
+ return ValueType.LONG;
}
@Override
@@ -36,7 +36,7 @@ public String asString() {
@Override
public String toString() {
- return "AnyValueLong{" + asString() + "}";
+ return "ValueLong{" + asString() + "}";
}
@Override
@@ -44,7 +44,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- return (o instanceof AnyValue) && Objects.equals(this.value, ((AnyValue) o).getValue());
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
}
@Override
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueString.java
similarity index 58%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueString.java
index d2b8be2e729..726cb27dee3 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueString.java
@@ -3,26 +3,26 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
import java.util.Objects;
-final class AnyValueString implements AnyValue {
+final class ValueString implements Value {
private final String value;
- private AnyValueString(String value) {
+ private ValueString(String value) {
this.value = value;
}
- static AnyValue create(String value) {
+ static Value create(String value) {
Objects.requireNonNull(value, "value must not be null");
- return new AnyValueString(value);
+ return new ValueString(value);
}
@Override
- public AnyValueType getType() {
- return AnyValueType.STRING;
+ public ValueType getType() {
+ return ValueType.STRING;
}
@Override
@@ -37,7 +37,7 @@ public String asString() {
@Override
public String toString() {
- return "AnyValueString{" + value + "}";
+ return "ValueString{" + value + "}";
}
@Override
@@ -45,7 +45,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- return (o instanceof AnyValue) && Objects.equals(this.value, ((AnyValue) o).getValue());
+ return (o instanceof Value) && Objects.equals(this.value, ((Value) o).getValue());
}
@Override
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java b/api/all/src/main/java/io/opentelemetry/api/common/ValueType.java
similarity index 84%
rename from api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java
rename to api/all/src/main/java/io/opentelemetry/api/common/ValueType.java
index ea41d887094..99980280d2c 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java
+++ b/api/all/src/main/java/io/opentelemetry/api/common/ValueType.java
@@ -3,14 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.api.incubator.logs;
+package io.opentelemetry.api.common;
/**
* AnyValue type options, mirroring AnyValue#value
* options.
*/
-public enum AnyValueType {
+public enum ValueType {
STRING,
BOOLEAN,
LONG,
diff --git a/api/all/src/main/java/io/opentelemetry/api/logs/DefaultLogger.java b/api/all/src/main/java/io/opentelemetry/api/logs/DefaultLogger.java
index 47644104dcb..56284b43cb2 100644
--- a/api/all/src/main/java/io/opentelemetry/api/logs/DefaultLogger.java
+++ b/api/all/src/main/java/io/opentelemetry/api/logs/DefaultLogger.java
@@ -6,6 +6,7 @@
package io.opentelemetry.api.logs;
import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Value;
import io.opentelemetry.context.Context;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
@@ -70,6 +71,11 @@ public LogRecordBuilder setBody(String body) {
return this;
}
+ @Override
+ public LogRecordBuilder setBody(Value body) {
+ return this;
+ }
+
@Override
public LogRecordBuilder setAttribute(AttributeKey key, T value) {
return this;
diff --git a/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java b/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java
index 1b7e24d19a9..392796065d9 100644
--- a/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java
+++ b/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java
@@ -7,6 +7,7 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.Value;
import io.opentelemetry.context.Context;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
@@ -66,9 +67,19 @@ public interface LogRecordBuilder {
/** Set the severity text. */
LogRecordBuilder setSeverityText(String severityText);
- /** Set the body string. */
+ /**
+ * Set the body string.
+ *
+ * Shorthand for calling {@link #setBody(Value)} with {@link Value#of(String)}.
+ */
LogRecordBuilder setBody(String body);
+ /** Set the body {@link Value}. */
+ default LogRecordBuilder setBody(Value body) {
+ setBody(body.asString());
+ return this;
+ }
+
/**
* Sets attributes. If the {@link LogRecordBuilder} previously contained a mapping for any of the
* keys, the old values are replaced by the specified values.
diff --git a/api/all/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java b/api/all/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java
index 9f43ab22b87..ffe68f37e95 100644
--- a/api/all/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java
+++ b/api/all/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java
@@ -9,6 +9,7 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.Value;
import io.opentelemetry.context.Context;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
@@ -30,6 +31,7 @@ void buildAndEmit() {
.setSeverity(Severity.DEBUG)
.setSeverityText("debug")
.setBody("body")
+ .setBody(Value.of("body"))
.setAttribute(AttributeKey.stringKey("key1"), "value1")
.setAllAttributes(Attributes.builder().put("key2", "value2").build())
.emit())
diff --git a/api/all/src/test/java/io/opentelemetry/api/logs/ValueTest.java b/api/all/src/test/java/io/opentelemetry/api/logs/ValueTest.java
new file mode 100644
index 00000000000..ae83e0dd44c
--- /dev/null
+++ b/api/all/src/test/java/io/opentelemetry/api/logs/ValueTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.logs;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import io.opentelemetry.api.common.KeyValue;
+import io.opentelemetry.api.common.Value;
+import io.opentelemetry.api.common.ValueType;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ValueTest {
+
+ @Test
+ void value_OfString() {
+ assertThat(Value.of("foo"))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.STRING);
+ assertThat(value.getValue()).isEqualTo("foo");
+ assertThat(value).hasSameHashCodeAs(Value.of("foo"));
+ });
+ }
+
+ @Test
+ void value_OfBoolean() {
+ assertThat(Value.of(true))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.BOOLEAN);
+ assertThat(value.getValue()).isEqualTo(true);
+ assertThat(value).hasSameHashCodeAs(Value.of(true));
+ });
+ }
+
+ @Test
+ void value_OfLong() {
+ assertThat(Value.of(1L))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.LONG);
+ assertThat(value.getValue()).isEqualTo(1L);
+ assertThat(value).hasSameHashCodeAs(Value.of(1L));
+ });
+ }
+
+ @Test
+ void value_OfDouble() {
+ assertThat(Value.of(1.1))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.DOUBLE);
+ assertThat(value.getValue()).isEqualTo(1.1);
+ assertThat(value).hasSameHashCodeAs(Value.of(1.1));
+ });
+ }
+
+ @Test
+ void value_OfByteArray() {
+ assertThat(Value.of(new byte[] {'a', 'b'}))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.BYTES);
+ ByteBuffer buf = value.getValue();
+ // ValueBytes returns read only view of ByteBuffer
+ assertThatThrownBy(buf::array).isInstanceOf(ReadOnlyBufferException.class);
+ byte[] bytes = new byte[buf.remaining()];
+ buf.get(bytes);
+ assertThat(bytes).isEqualTo(new byte[] {'a', 'b'});
+ assertThat(value).hasSameHashCodeAs(Value.of(new byte[] {'a', 'b'}));
+ });
+ }
+
+ @Test
+ void value_OfvalueArray() {
+ assertThat(Value.of(Value.of(true), Value.of(1L)))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.ARRAY);
+ assertThat(value.getValue()).isEqualTo(Arrays.asList(Value.of(true), Value.of(1L)));
+ assertThat(value).hasSameHashCodeAs(Value.of(Value.of(true), Value.of(1L)));
+ });
+ }
+
+ @Test
+ @SuppressWarnings("DoubleBraceInitialization")
+ void value_OfKeyValueList() {
+ assertThat(Value.of(KeyValue.of("bool", Value.of(true)), KeyValue.of("long", Value.of(1L))))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.KEY_VALUE_LIST);
+ assertThat(value.getValue())
+ .isEqualTo(
+ Arrays.asList(
+ KeyValue.of("bool", Value.of(true)), KeyValue.of("long", Value.of(1L))));
+ assertThat(value)
+ .hasSameHashCodeAs(
+ Value.of(
+ KeyValue.of("bool", Value.of(true)), KeyValue.of("long", Value.of(1L))));
+ });
+
+ assertThat(
+ Value.of(
+ new LinkedHashMap>() {
+ {
+ put("bool", Value.of(true));
+ put("long", Value.of(1L));
+ }
+ }))
+ .satisfies(
+ value -> {
+ assertThat(value.getType()).isEqualTo(ValueType.KEY_VALUE_LIST);
+ assertThat(value.getValue())
+ .isEqualTo(
+ Arrays.asList(
+ KeyValue.of("bool", Value.of(true)), KeyValue.of("long", Value.of(1L))));
+ assertThat(value)
+ .hasSameHashCodeAs(
+ Value.of(
+ new LinkedHashMap>() {
+ {
+ put("bool", Value.of(true));
+ put("long", Value.of(1L));
+ }
+ }));
+ });
+ }
+
+ @Test
+ void value_NullsNotAllowed() {
+ assertThatThrownBy(() -> Value.of((String) null))
+ .isInstanceOf(NullPointerException.class)
+ .hasMessageContaining("value must not be null");
+ assertThatThrownBy(() -> Value.of((byte[]) null))
+ .isInstanceOf(NullPointerException.class)
+ .hasMessageContaining("value must not be null");
+ assertThatThrownBy(() -> Value.of((Value[]) null))
+ .isInstanceOf(NullPointerException.class)
+ .hasMessageContaining("value must not be null");
+ assertThatThrownBy(() -> Value.of((KeyValue[]) null))
+ .isInstanceOf(NullPointerException.class)
+ .hasMessageContaining("value must not be null");
+ assertThatThrownBy(() -> Value.of((Map>) null))
+ .isInstanceOf(NullPointerException.class)
+ .hasMessageContaining("value must not be null");
+ }
+
+ @ParameterizedTest
+ @MethodSource("asStringArgs")
+ void asString(Value value, String expectedAsString) {
+ assertThat(value.asString()).isEqualTo(expectedAsString);
+ }
+
+ @SuppressWarnings("DoubleBraceInitialization")
+ private static Stream asStringArgs() {
+ return Stream.of(
+ // primitives
+ arguments(Value.of("str"), "str"),
+ arguments(Value.of(true), "true"),
+ arguments(Value.of(1), "1"),
+ arguments(Value.of(1.1), "1.1"),
+ // heterogeneous array
+ arguments(
+ Value.of(Value.of("str"), Value.of(true), Value.of(1), Value.of(1.1)),
+ "[str, true, 1, 1.1]"),
+ // key value list from KeyValue array
+ arguments(
+ Value.of(KeyValue.of("key1", Value.of("val1")), KeyValue.of("key2", Value.of(2))),
+ "[key1=val1, key2=2]"),
+ // key value list from map
+ arguments(
+ Value.of(
+ new LinkedHashMap>() {
+ {
+ put("key1", Value.of("val1"));
+ put("key2", Value.of(2));
+ }
+ }),
+ "[key1=val1, key2=2]"),
+ // map of map
+ arguments(
+ Value.of(
+ Collections.singletonMap(
+ "child", Value.of(Collections.singletonMap("grandchild", Value.of("str"))))),
+ "[child=[grandchild=str]]"),
+ // bytes
+ arguments(Value.of("hello world".getBytes(StandardCharsets.UTF_8)), "aGVsbG8gd29ybGQ="));
+ }
+
+ @Test
+ void valueByteAsString() {
+ // TODO: add more test cases
+ String str = "hello world";
+ String base64Encoded = Value.of(str.getBytes(StandardCharsets.UTF_8)).asString();
+ byte[] decodedBytes = Base64.getDecoder().decode(base64Encoded);
+ assertThat(new String(decodedBytes, StandardCharsets.UTF_8)).isEqualTo(str);
+ }
+}
diff --git a/api/incubator/README.md b/api/incubator/README.md
index ccd4678df43..ee29241f9fe 100644
--- a/api/incubator/README.md
+++ b/api/incubator/README.md
@@ -14,8 +14,7 @@ See [EventApiUsageTest](./src/test/java/io/opentelemetry/api/incubator/events/Ev
Features:
-* Check if logger is enabled before emitting logs to avoid uneccessary computation
-* Set AnyValue log record body with arbitrarily complex data
+* Check if logger is enabled before emitting logs to avoid unnecessary computation
See [ExtendedLogsBridgeApiUsageTest](./src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java).
@@ -31,7 +30,7 @@ See [ExtendedMetricsApiUsageTest](./src/test/java/io/opentelemetry/api/incubator
Features:
-* Check if instrument is enabled before recording measurements to avoid uneccessary computation
+* Check if instrument is enabled before recording measurements to avoid unnecessary computation
* Simplified injection / extraction of context
See [ExtendedContextPropagatorsUsageTest](./src/test/java/io/opentelemetry/api/incubator/propagation/ExtendedContextPropagatorsUsageTest.java).
@@ -40,7 +39,7 @@ See [ExtendedContextPropagatorsUsageTest](./src/test/java/io/opentelemetry/api/i
Features:
-* Check if tracer is enabled before starting spans to avoid uneccessary computation
+* Check if tracer is enabled before starting spans to avoid unnecessary computation
* Utility methods to reduce boilerplace using span API, including extracting context, and wrapping runnables / callables with spans
See [ExtendedTraceApiUsageTest](./src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java).
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventLogger.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventLogger.java
index 8017965bf00..c0c795c584b 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventLogger.java
+++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventLogger.java
@@ -6,7 +6,7 @@
package io.opentelemetry.api.incubator.events;
import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.incubator.logs.AnyValue;
+import io.opentelemetry.api.common.Value;
import io.opentelemetry.api.logs.Severity;
import io.opentelemetry.context.Context;
import java.time.Instant;
@@ -32,7 +32,7 @@ private static class NoOpEventBuilder implements EventBuilder {
public static final EventBuilder INSTANCE = new NoOpEventBuilder();
@Override
- public EventBuilder put(String key, AnyValue value) {
+ public EventBuilder put(String key, Value value) {
return this;
}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java
index 9aca02b3077..a2c43a47a0e 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java
+++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java
@@ -9,7 +9,7 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.incubator.logs.AnyValue;
+import io.opentelemetry.api.common.Value;
import io.opentelemetry.api.logs.Severity;
import io.opentelemetry.context.Context;
import java.time.Instant;
@@ -22,58 +22,58 @@ public interface EventBuilder {
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, String value) {
- return put(key, AnyValue.of(value));
+ return put(key, Value.of(value));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, long value) {
- return put(key, AnyValue.of(value));
+ return put(key, Value.of(value));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, double value) {
- return put(key, AnyValue.of(value));
+ return put(key, Value.of(value));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, boolean value) {
- return put(key, AnyValue.of(value));
+ return put(key, Value.of(value));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, String... value) {
- List> values = new ArrayList<>(value.length);
+ List> values = new ArrayList<>(value.length);
for (String val : value) {
- values.add(AnyValue.of(val));
+ values.add(Value.of(val));
}
- return put(key, AnyValue.of(values));
+ return put(key, Value.of(values));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, long... value) {
- List> values = new ArrayList<>(value.length);
+ List> values = new ArrayList<>(value.length);
for (long val : value) {
- values.add(AnyValue.of(val));
+ values.add(Value.of(val));
}
- return put(key, AnyValue.of(values));
+ return put(key, Value.of(values));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, double... value) {
- List> values = new ArrayList<>(value.length);
+ List> values = new ArrayList<>(value.length);
for (double val : value) {
- values.add(AnyValue.of(val));
+ values.add(Value.of(val));
}
- return put(key, AnyValue.of(values));
+ return put(key, Value.of(values));
}
/** Put the given {@code key} and {@code value} in the payload. */
default EventBuilder put(String key, boolean... value) {
- List> values = new ArrayList<>(value.length);
+ List> values = new ArrayList<>(value.length);
for (boolean val : value) {
- values.add(AnyValue.of(val));
+ values.add(Value.of(val));
}
- return put(key, AnyValue.of(values));
+ return put(key, Value.of(values));
}
/**
@@ -97,25 +97,24 @@ default EventBuilder put(AttributeKey key, T value) {
case STRING_ARRAY:
return put(
key.getKey(),
- AnyValue.of(((List) value).stream().map(AnyValue::of).collect(toList())));
+ Value.of(((List) value).stream().map(Value::of).collect(toList())));
case BOOLEAN_ARRAY:
return put(
key.getKey(),
- AnyValue.of(((List) value).stream().map(AnyValue::of).collect(toList())));
+ Value.of(((List) value).stream().map(Value::of).collect(toList())));
case LONG_ARRAY:
return put(
- key.getKey(),
- AnyValue.of(((List) value).stream().map(AnyValue::of).collect(toList())));
+ key.getKey(), Value.of(((List) value).stream().map(Value::of).collect(toList())));
case DOUBLE_ARRAY:
return put(
key.getKey(),
- AnyValue.of(((List) value).stream().map(AnyValue::of).collect(toList())));
+ Value.of(((List) value).stream().map(Value::of).collect(toList())));
}
return this;
}
/** Put the given {@code key} and {@code value} in the payload. */
- EventBuilder put(String key, AnyValue value);
+ EventBuilder put(String key, Value value);
/**
* Set the epoch {@code timestamp}, using the timestamp and unit.
@@ -143,9 +142,9 @@ default EventBuilder put(AttributeKey key, T value) {
* Set the attributes.
*
* Event {@link io.opentelemetry.api.common.Attributes} provide additional details about the
- * Event which are not part of the well-defined {@link AnyValue} payload. Setting event attributes
- * is less common than adding entries to the event payload. Most users will want to call one of
- * the {@code #put(String, ?)} methods instead.
+ * Event which are not part of the well-defined {@link Value} payload. Setting event attributes is
+ * less common than adding entries to the event payload. Most users will want to call one of the
+ * {@code #put(String, ?)} methods instead.
*/
EventBuilder setAttributes(Attributes attributes);
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java
deleted file mode 100644
index 602e9e289b7..00000000000
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.api.incubator.logs;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AnyValue mirrors the proto AnyValue
- * message type, and is used to model any type.
- *
- *
It can be used to represent:
- *
- *
- * - Primitive values via {@link #of(long)}, {@link #of(String)}, {@link #of(boolean)}, {@link
- * #of(double)}.
- *
- String-keyed maps (i.e. associative arrays, dictionaries) via {@link #of(KeyAnyValue...)},
- * {@link #of(Map)}. Note, because map values are type {@link AnyValue}, maps can be nested
- * within other maps.
- *
- Arrays (heterogeneous or homogenous) via {@link #of(AnyValue[])}. Note, because array
- * values are type {@link AnyValue}, arrays can contain primitives, complex types like maps or
- * arrays, or any combination.
- *
- Raw bytes via {@link #of(byte[])}
- *
- *
- * @param the type. See {@link #getValue()} for description of types.
- */
-public interface AnyValue {
-
- /** Returns an {@link AnyValue} for the {@link String} value. */
- static AnyValue of(String value) {
- return AnyValueString.create(value);
- }
-
- /** Returns an {@link AnyValue} for the {@code boolean} value. */
- static AnyValue of(boolean value) {
- return AnyValueBoolean.create(value);
- }
-
- /** Returns an {@link AnyValue} for the {@code long} value. */
- static AnyValue of(long value) {
- return AnyValueLong.create(value);
- }
-
- /** Returns an {@link AnyValue} for the {@code double} value. */
- static AnyValue of(double value) {
- return AnyValueDouble.create(value);
- }
-
- /** Returns an {@link AnyValue} for the {@code byte[]} value. */
- static AnyValue of(byte[] value) {
- return AnyValueBytes.create(value);
- }
-
- /** Returns an {@link AnyValue} for the array of {@link AnyValue} values. */
- static AnyValue>> of(AnyValue... value) {
- return AnyValueArray.create(value);
- }
-
- /** Returns an {@link AnyValue} for the list of {@link AnyValue} values. */
- static AnyValue>> of(List> value) {
- return AnyValueArray.create(value);
- }
-
- /**
- * Returns an {@link AnyValue} for the array of {@link KeyAnyValue} values. {@link
- * KeyAnyValue#getKey()} values should not repeat - duplicates may be dropped.
- */
- static AnyValue> of(KeyAnyValue... value) {
- return KeyAnyValueList.create(value);
- }
-
- /** Returns an {@link AnyValue} for the {@link Map} of key, {@link AnyValue}. */
- static AnyValue> of(Map> value) {
- return KeyAnyValueList.createFromMap(value);
- }
-
- /** Returns the type of this {@link AnyValue}. Useful for building switch statements. */
- AnyValueType getType();
-
- /**
- * Returns the value for this {@link AnyValue}.
- *
- * The return type varies by {@link #getType()} as described below:
- *
- *
- * - {@link AnyValueType#STRING} returns {@link String}
- *
- {@link AnyValueType#BOOLEAN} returns {@code boolean}
- *
- {@link AnyValueType#LONG} returns {@code long}
- *
- {@link AnyValueType#DOUBLE} returns {@code double}
- *
- {@link AnyValueType#ARRAY} returns {@link List} of {@link AnyValue}
- *
- {@link AnyValueType#KEY_VALUE_LIST} returns {@link List} of {@link KeyAnyValue}
- *
- {@link AnyValueType#BYTES} returns read only {@link ByteBuffer}. See {@link
- * ByteBuffer#asReadOnlyBuffer()}.
- *
- */
- T getValue();
-
- /**
- * Return a string encoding of this {@link AnyValue}. This is intended to be a fallback serialized
- * representation in case there is no suitable encoding that can utilize {@link #getType()} /
- * {@link #getValue()} to serialize specific types.
- */
- // TODO(jack-berg): Should this be a JSON encoding?
- String asString();
-}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java
deleted file mode 100644
index 2332c253392..00000000000
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.api.incubator.logs;
-
-import static java.util.stream.Collectors.joining;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-final class AnyValueArray implements AnyValue>> {
-
- private final List> value;
-
- private AnyValueArray(List> value) {
- this.value = value;
- }
-
- static AnyValue>> create(AnyValue... value) {
- Objects.requireNonNull(value, "value must not be null");
- List> list = new ArrayList<>(value.length);
- list.addAll(Arrays.asList(value));
- return new AnyValueArray(Collections.unmodifiableList(list));
- }
-
- static AnyValue>> create(List> value) {
- return new AnyValueArray(Collections.unmodifiableList(value));
- }
-
- @Override
- public AnyValueType getType() {
- return AnyValueType.ARRAY;
- }
-
- @Override
- public List> getValue() {
- return value;
- }
-
- @Override
- public String asString() {
- return value.stream().map(AnyValue::asString).collect(joining(", ", "[", "]"));
- }
-
- @Override
- public String toString() {
- return "AnyValueArray{" + asString() + "}";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- return (o instanceof AnyValue) && Objects.equals(this.value, ((AnyValue) o).getValue());
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java
index d0a48afaf56..4e8af8eee70 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java
+++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java
@@ -10,6 +10,6 @@
/** Extended {@link LogRecordBuilder} with experimental APIs. */
public interface ExtendedLogRecordBuilder extends LogRecordBuilder {
- /** Set the body {@link AnyValue}. */
- LogRecordBuilder setBody(AnyValue body);
+ // Nothing at the moment, but experimental methods may be added in the future.
+
}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValue.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValue.java
deleted file mode 100644
index e6cc24ad250..00000000000
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValue.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.api.incubator.logs;
-
-/**
- * Key-value pair of {@link String} key and {@link AnyValue} value.
- *
- * @see AnyValue#of(KeyAnyValue...)
- */
-public interface KeyAnyValue {
-
- /** Returns a {@link KeyAnyValue} for the given {@code key} and {@code value}. */
- static KeyAnyValue of(String key, AnyValue value) {
- return KeyAnyValueImpl.create(key, value);
- }
-
- /** Returns the key. */
- String getKey();
-
- /** Returns the value. */
- AnyValue getAnyValue();
-}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueImpl.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueImpl.java
deleted file mode 100644
index 3792353e717..00000000000
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.api.incubator.logs;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-abstract class KeyAnyValueImpl implements KeyAnyValue {
-
- KeyAnyValueImpl() {}
-
- static KeyAnyValueImpl create(String key, AnyValue value) {
- return new AutoValue_KeyAnyValueImpl(key, value);
- }
-}
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueList.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueList.java
deleted file mode 100644
index caddcbe7f46..00000000000
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueList.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.api.incubator.logs;
-
-import static java.util.stream.Collectors.joining;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-final class KeyAnyValueList implements AnyValue> {
-
- private final List value;
-
- private KeyAnyValueList(List