generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 67
Contribute OTLP UDP Exporter #1035
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
9bae8df
Contribute OTLP UDP Exporter
3dbbae0
Fixing formatting issues
57cf7b3
Adding additional check to SpanExporterBuilder to see if we are alrea…
c8580e2
Adding the unit test for Lambda environment variables and fixing the …
6fb094a
Removing the redundant dependencies
e5380f7
Renaming the package name and making changes to path respectively
a6c9a92
Updating the version of opentelemetry-bom to match with our lambda layer
a24e2a5
Reverting back to actual bom dependency
e1889b0
Removing exporter from our rott folder settings.gradle file and addin…
ca3e1d6
Updating the build.gradle file
b46392f
Removing license comment
cfd4533
Removing the proto dependency and testing it
a5057df
Changing the bom dependency
a1753a2
Changing certain dependencies from implementation to compilOnly and t…
09102ea
Testing with changing dependency of compileOnly to testImplementation
85d21b9
Reverting back the dependencies from testImplementation to implementa…
838a1e3
Testing the same dependencies with both compileOnly and testImplement…
507f227
Fixing redundant code in OtlpUdpSpanExporterBuilder file to make a pr…
47b8655
Changing the file and directory names acoording to new naming convent…
d997980
Testing
074a7d3
Merge branch 'main' into contribute-udp-exporter
Jeel-mehta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| plugins { | ||
| id("java") | ||
| id("java-library") | ||
| id("maven-publish") | ||
| } | ||
|
|
||
| group = "software.opentelemetry.exporters.otlp.udp" | ||
| version = "1.0-SNAPSHOT" | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| } | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| dependencies { | ||
jj22ee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| implementation(platform("io.opentelemetry:opentelemetry-bom:1.44.1")) | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| implementation("io.opentelemetry:opentelemetry-api") | ||
| implementation("io.opentelemetry:opentelemetry-sdk") | ||
| implementation("io.opentelemetry:opentelemetry-exporter-otlp") | ||
| implementation("io.opentelemetry:opentelemetry-exporter-otlp-common") | ||
| implementation("io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha") | ||
| implementation("com.google.code.findbugs:jsr305:3.0.2") | ||
| implementation("org.apache.logging.log4j:log4j-api:2.24.1") | ||
| implementation("org.apache.logging.log4j:log4j-core:2.24.1") | ||
| implementation("org.slf4j:slf4j-simple:2.0.16") | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| testImplementation(platform("org.junit:junit-bom:5.9.2")) | ||
| testImplementation("org.junit.jupiter:junit-jupiter-api") | ||
| testImplementation("org.junit.jupiter:junit-jupiter-engine") | ||
| testImplementation("org.mockito:mockito-core:5.3.1") | ||
| testImplementation("org.assertj:assertj-core:3.24.2") | ||
| testImplementation("org.mockito:mockito-junit-jupiter:5.3.1") | ||
| } | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
| withJavadocJar() | ||
| } | ||
|
|
||
| tasks.javadoc { | ||
| options { | ||
| (this as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet") | ||
| } | ||
| isFailOnError = false | ||
| } | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDirs("src/main/java") | ||
| } | ||
| resources { | ||
| srcDirs("src/main/resources") | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| test { | ||
| java { | ||
| srcDirs("src/test/java") | ||
| } | ||
| resources { | ||
| srcDirs("src/test/resources") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.test { | ||
| useJUnitPlatform() | ||
| testLogging { | ||
| events("passed", "skipped", "failed") | ||
| } | ||
| } | ||
|
|
||
| tasks.jar { | ||
| manifest { | ||
| attributes( | ||
| "Implementation-Title" to project.name, | ||
| "Implementation-Version" to project.version, | ||
| ) | ||
| } | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| } | ||
|
|
||
| tasks.named<Jar>("javadocJar") { | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| } | ||
|
|
||
| tasks.named<Jar>("sourcesJar") { | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| create<MavenPublication>("mavenJava") { | ||
| from(components["java"]) | ||
| groupId = project.group.toString() | ||
| artifactId = "aws-otel-otlp-udp-exporter" | ||
| version = project.version.toString() | ||
| } | ||
| } | ||
| } | ||
97 changes: 97 additions & 0 deletions
97
...exporter/src/main/java/software/opentelemetry/exporters/otlp/udp/OtlpUdpSpanExporter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.opentelemetry.exporters.otlp.udp; | ||
|
|
||
| import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler; | ||
| import io.opentelemetry.sdk.common.CompletableResultCode; | ||
| import io.opentelemetry.sdk.trace.data.SpanData; | ||
| import io.opentelemetry.sdk.trace.export.SpanExporter; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Base64; | ||
| import java.util.Collection; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
| import javax.annotation.concurrent.Immutable; | ||
|
|
||
| /** | ||
| * Exports spans via UDP, using OpenTelemetry's protobuf model. The protobuf modelled spans are | ||
| * Base64 encoded and prefixed with AWS X-Ray specific information before being sent over to {@link | ||
| * UdpSender}. | ||
| * | ||
| * <p>This exporter is NOT meant for generic use since the payload is prefixed with AWS X-Ray | ||
| * specific information. | ||
| */ | ||
| @Immutable | ||
| public class OtlpUdpSpanExporter implements SpanExporter { | ||
|
|
||
| private static final Logger logger = Logger.getLogger(OtlpUdpSpanExporter.class.getName()); | ||
|
|
||
| private final AtomicBoolean isShutdown = new AtomicBoolean(); | ||
|
|
||
| private final UdpSender sender; | ||
| private final String payloadPrefix; | ||
|
|
||
| OtlpUdpSpanExporter(UdpSender sender, String payloadPrefix) { | ||
| this.sender = sender; | ||
| this.payloadPrefix = payloadPrefix; | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode export(Collection<SpanData> spans) { | ||
| if (isShutdown.get()) { | ||
| return CompletableResultCode.ofFailure(); | ||
| } | ||
|
|
||
| TraceRequestMarshaler exportRequest = TraceRequestMarshaler.create(spans); | ||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| try { | ||
| exportRequest.writeBinaryTo(baos); | ||
| String payload = payloadPrefix + Base64.getEncoder().encodeToString(baos.toByteArray()); | ||
| sender.send(payload.getBytes(StandardCharsets.UTF_8)); | ||
| return CompletableResultCode.ofSuccess(); | ||
| } catch (Exception e) { | ||
| logger.log(Level.SEVERE, "Failed to export spans. Error: " + e.getMessage(), e); | ||
| return CompletableResultCode.ofFailure(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode flush() { | ||
| // TODO: implement | ||
| return CompletableResultCode.ofSuccess(); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode shutdown() { | ||
| if (!isShutdown.compareAndSet(false, true)) { | ||
| logger.log(Level.INFO, "Calling shutdown() multiple times."); | ||
| return CompletableResultCode.ofSuccess(); | ||
| } | ||
| return sender.shutdown(); | ||
| } | ||
|
|
||
| // Visible for testing | ||
| UdpSender getSender() { | ||
| return sender; | ||
| } | ||
|
|
||
| // Visible for testing | ||
| String getPayloadPrefix() { | ||
| return payloadPrefix; | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
...r/src/main/java/software/opentelemetry/exporters/otlp/udp/OtlpUdpSpanExporterBuilder.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.opentelemetry.exporters.otlp.udp; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public final class OtlpUdpSpanExporterBuilder { | ||
|
|
||
| private static final String DEFAULT_HOST = "127.0.0.1"; | ||
| private static final int DEFAULT_PORT = 2000; | ||
|
|
||
| // The protocol header and delimiter is required for sending data to X-Ray Daemon or when running | ||
| // in Lambda. | ||
| // https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-daemon | ||
| private static final String PROTOCOL_HEADER = "{\"format\": \"json\", \"version\": 1}"; | ||
| private static final char PROTOCOL_DELIMITER = '\n'; | ||
|
|
||
| // These prefixes help the backend identify if the spans payload is sampled or not. | ||
| private static final String FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX = "T1S"; | ||
| private static final String FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX = "T1U"; | ||
|
|
||
| private UdpSender sender; | ||
| private String tracePayloadPrefix = FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX; | ||
|
|
||
| public OtlpUdpSpanExporterBuilder setEndpoint(String endpoint) { | ||
| requireNonNull(endpoint, "endpoint must not be null"); | ||
| try { | ||
| String[] parts = endpoint.split(":"); | ||
| String host = parts[0]; | ||
| int port = Integer.parseInt(parts[1]); | ||
| this.sender = new UdpSender(host, port); | ||
| } catch (Exception e) { | ||
| throw new IllegalArgumentException("Invalid endpoint, must be a valid URL: " + endpoint, e); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
| public OtlpUdpSpanExporterBuilder setPayloadSampleDecision(TracePayloadSampleDecision decision) { | ||
| this.tracePayloadPrefix = | ||
| decision == TracePayloadSampleDecision.SAMPLED | ||
| ? FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX | ||
| : FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX; | ||
| return this; | ||
| } | ||
|
|
||
| public OtlpUdpSpanExporter build() { | ||
| if (sender == null) { | ||
| this.sender = new UdpSender(DEFAULT_HOST, DEFAULT_PORT); | ||
| } | ||
Jeel-mehta marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return new OtlpUdpSpanExporter( | ||
| this.sender, PROTOCOL_HEADER + PROTOCOL_DELIMITER + tracePayloadPrefix); | ||
| } | ||
|
|
||
| // Only for testing | ||
| OtlpUdpSpanExporterBuilder setSender(UdpSender sender) { | ||
| this.sender = sender; | ||
| return this; | ||
| } | ||
| } | ||
|
|
||
| enum TracePayloadSampleDecision { | ||
| SAMPLED, | ||
| UNSAMPLED | ||
| } | ||
76 changes: 76 additions & 0 deletions
76
...-otlp-udp-exporter/src/main/java/software/opentelemetry/exporters/otlp/udp/UdpSender.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.opentelemetry.exporters.otlp.udp; | ||
|
|
||
| import io.opentelemetry.sdk.common.CompletableResultCode; | ||
| import java.io.IOException; | ||
| import java.net.DatagramPacket; | ||
| import java.net.DatagramSocket; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.SocketException; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| /** | ||
| * This class represents a UDP sender that sends data to a specified endpoint. It is used to send | ||
| * data to a remote host and port using UDP protocol. | ||
| */ | ||
| public class UdpSender { | ||
| private static final Logger logger = Logger.getLogger(UdpSender.class.getName()); | ||
|
|
||
| private DatagramSocket socket; | ||
| private final InetSocketAddress endpoint; | ||
|
|
||
| public UdpSender(String host, int port) { | ||
| this.endpoint = new InetSocketAddress(host, port); | ||
| try { | ||
| this.socket = new DatagramSocket(); | ||
| } catch (SocketException e) { | ||
| logger.log(Level.SEVERE, "Exception while instantiating UdpSender socket.", e); | ||
| } | ||
| } | ||
|
|
||
| public CompletableResultCode shutdown() { | ||
| try { | ||
| if (socket == null) { | ||
| return CompletableResultCode.ofSuccess(); | ||
| } | ||
| socket.close(); | ||
| return CompletableResultCode.ofSuccess(); | ||
| } catch (Exception e) { | ||
| logger.log(Level.SEVERE, "Exception while closing UdpSender socket.", e); | ||
| return CompletableResultCode.ofFailure(); | ||
| } | ||
| } | ||
|
|
||
| public void send(byte[] data) { | ||
| if (socket == null) { | ||
| logger.log(Level.WARNING, "UdpSender socket is null. Cannot send data."); | ||
| return; | ||
| } | ||
| DatagramPacket packet = new DatagramPacket(data, data.length, endpoint); | ||
| try { | ||
| socket.send(packet); | ||
| } catch (IOException e) { | ||
| logger.log(Level.SEVERE, "Exception while sending data.", e); | ||
| } | ||
| } | ||
|
|
||
| // Visible for testing | ||
| InetSocketAddress getEndpoint() { | ||
| return endpoint; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.