-
Notifications
You must be signed in to change notification settings - Fork 25
Add OTLP UDP exporter #232
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 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
570def6
udp exporter basic implementation
srprash a8a895c
some refactoring
srprash 4ba5ae2
adding unit tests
srprash faa55db
get udp exporter address from env var
srprash 07eae1f
some fixes for linting and unit tests
srprash e8fc471
update udp message schema
srprash 0e4052c
lint + added unit test case for better coverage
srprash dcb17d0
lint
srprash bed6734
lint
srprash aebabf3
Merge branch 'main' into lambda_exporter
srprash 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
109 changes: 109 additions & 0 deletions
109
aws-opentelemetry-distro/src/amazon/opentelemetry/distro/otlp_udp_exporter.py
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,109 @@ | ||
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
# SPDX-License-Identifier: Apache-2.0 | ||
import socket | ||
from logging import Logger, getLogger | ||
from typing import Dict, Optional, Sequence, Tuple | ||
|
||
from typing_extensions import override | ||
|
||
from opentelemetry.exporter.otlp.proto.common.metrics_encoder import encode_metrics | ||
from opentelemetry.exporter.otlp.proto.common.trace_encoder import encode_spans | ||
from opentelemetry.sdk.metrics._internal.aggregation import AggregationTemporality | ||
from opentelemetry.sdk.metrics._internal.export import MetricExportResult | ||
from opentelemetry.sdk.metrics._internal.point import MetricsData | ||
from opentelemetry.sdk.metrics.export import MetricExporter | ||
from opentelemetry.sdk.metrics.view import Aggregation | ||
from opentelemetry.sdk.trace import ReadableSpan | ||
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult | ||
|
||
DEFAULT_ENDPOINT = "127.0.0.1:2000" | ||
PROTOCOL_HEADER = '{"format":"json","version":1}\n' | ||
PROTOCOL_DELIMITER = "\n" | ||
|
||
_logger: Logger = getLogger(__name__) | ||
|
||
|
||
class UdpExporter: | ||
srprash marked this conversation as resolved.
Show resolved
Hide resolved
|
||
def __init__(self, endpoint: Optional[str] = None): | ||
self._endpoint = endpoint or DEFAULT_ENDPOINT # TODO: read from some env var?? | ||
self._host, self._port = self._parse_endpoint(self._endpoint) | ||
self._socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) | ||
self._socket.setblocking(False) | ||
|
||
def send_data(self, data: str, signal_format: str): | ||
udp_data = f'{{"format":"{signal_format}","data":{data}}}' | ||
message = PROTOCOL_HEADER + udp_data | ||
|
||
try: | ||
print("Sending UDP data: ", message) # TODO: remove | ||
self._socket.sendto(message.encode("utf-8"), (self._host, int(self._port))) | ||
except Exception as exc: # pylint: disable=broad-except | ||
_logger.error("Error sending UDP data: %s", exc) | ||
|
||
def shutdown(self): | ||
self._socket.close() | ||
|
||
# pylint: disable=no-self-use | ||
def _parse_endpoint(self, endpoint: str) -> Tuple[str, int]: | ||
try: | ||
vals = endpoint.split(":") | ||
host = vals[0] | ||
port = int(vals[1]) | ||
except Exception as exc: # pylint: disable=broad-except | ||
raise ValueError(f"Invalid endpoint: {endpoint}") from exc | ||
|
||
return host, port | ||
|
||
|
||
class OtlpUdpMetricExporter(MetricExporter): | ||
def __init__( | ||
self, | ||
endpoint: Optional[str] = None, | ||
preferred_temporality: Dict[type, AggregationTemporality] = None, | ||
preferred_aggregation: Dict[type, Aggregation] = None, | ||
): | ||
super().__init__( | ||
preferred_temporality=preferred_temporality, | ||
preferred_aggregation=preferred_aggregation, | ||
) | ||
self._udp_exporter = UdpExporter(endpoint=endpoint) | ||
|
||
@override | ||
def export( | ||
self, | ||
metrics_data: MetricsData, | ||
timeout_millis: float = 10_000, | ||
**kwargs, | ||
) -> MetricExportResult: | ||
serialized_data = encode_metrics(metrics_data).SerializeToString() | ||
self._udp_exporter.send_data(data=serialized_data, signal_format="OTEL_V1_METRICS") # TODO: Convert to constant | ||
return MetricExportResult.SUCCESS # TODO: send appropriate status back. Need to?? | ||
|
||
# pylint: disable=no-self-use | ||
def force_flush(self, timeout_millis: float = 10_000) -> bool: | ||
# TODO: implement force flush | ||
return True | ||
|
||
def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None: | ||
self._udp_exporter.shutdown() | ||
|
||
|
||
class OtlpUdpSpanExporter(SpanExporter): | ||
def __init__(self, endpoint: Optional[str] = None): | ||
self._udp_exporter = UdpExporter(endpoint=endpoint) | ||
|
||
@override | ||
def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult: | ||
serialized_data = encode_spans(spans).SerializeToString() | ||
self._udp_exporter.send_data(data=serialized_data, signal_format="OTEL_V1_TRACES") # TODO: Convert to constant | ||
return SpanExportResult.SUCCESS # TODO: send appropriate status back. Need to?? | ||
|
||
# pylint: disable=no-self-use | ||
@override | ||
def force_flush(self, timeout_millis: int = 30000) -> bool: | ||
# TODO: implement force flush | ||
return True | ||
|
||
@override | ||
def shutdown(self) -> None: | ||
self._udp_exporter.shutdown() |
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
111 changes: 111 additions & 0 deletions
111
aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_otlp_udp_exporter.py
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,111 @@ | ||
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
# SPDX-License-Identifier: Apache-2.0 | ||
import socket | ||
import unittest | ||
from unittest import TestCase | ||
from unittest.mock import MagicMock, patch | ||
|
||
from amazon.opentelemetry.distro.otlp_udp_exporter import ( | ||
DEFAULT_ENDPOINT, | ||
PROTOCOL_HEADER, | ||
OtlpUdpMetricExporter, | ||
OtlpUdpSpanExporter, | ||
UdpExporter, | ||
) | ||
from opentelemetry.sdk.metrics._internal.export import MetricExportResult | ||
from opentelemetry.sdk.trace.export import SpanExportResult | ||
|
||
|
||
class TestUdpExporter(TestCase): | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.socket.socket") | ||
def test_udp_exporter_init_default(self, mock_socket): | ||
exporter = UdpExporter() | ||
self.assertEqual(exporter._endpoint, DEFAULT_ENDPOINT) | ||
self.assertEqual(exporter._host, "127.0.0.1") | ||
self.assertEqual(exporter._port, 2000) | ||
mock_socket.assert_called_once_with(socket.AF_INET, socket.SOCK_DGRAM) | ||
mock_socket().setblocking.assert_called_once_with(False) | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.socket.socket") | ||
def test_udp_exporter_init_with_endpoint(self, mock_socket): | ||
exporter = UdpExporter(endpoint="localhost:5000") | ||
self.assertNotEqual(exporter._endpoint, DEFAULT_ENDPOINT) | ||
self.assertEqual(exporter._host, "localhost") | ||
self.assertEqual(exporter._port, 5000) | ||
mock_socket.assert_called_once_with(socket.AF_INET, socket.SOCK_DGRAM) | ||
mock_socket().setblocking.assert_called_once_with(False) | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.socket.socket") | ||
def test_udp_exporter_init_invalid_endpoint(self, mock_socket): | ||
with self.assertRaises(ValueError): | ||
UdpExporter(endpoint="invalidEndpoint:port") | ||
|
||
# pylint: disable=no-self-use | ||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.socket.socket") | ||
def test_send_data(self, mock_socket): | ||
mock_socket_instance = mock_socket.return_value | ||
exporter = UdpExporter() | ||
exporter.send_data("encoded_data", "signal") | ||
expected_message = PROTOCOL_HEADER + '{"format":"signal","data":encoded_data}' | ||
mock_socket_instance.sendto.assert_called_once_with(expected_message.encode("utf-8"), ("127.0.0.1", 2000)) | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.socket.socket") | ||
def test_shutdown(self, mock_socket): | ||
mock_socket_instance = mock_socket.return_value | ||
exporter = UdpExporter() | ||
exporter.shutdown() | ||
mock_socket_instance.close.assert_called_once() | ||
|
||
|
||
class TestOtlpUdpMetricExporter(unittest.TestCase): | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.encode_metrics") | ||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.UdpExporter") | ||
def test_export(self, mock_udp_exporter, mock_encode_metrics): | ||
mock_udp_exporter_instance = mock_udp_exporter.return_value | ||
mock_encoded_data = MagicMock() | ||
mock_encode_metrics.return_value.SerializeToString.return_value = mock_encoded_data | ||
exporter = OtlpUdpMetricExporter() | ||
result = exporter.export(MagicMock()) | ||
mock_udp_exporter_instance.send_data.assert_called_once_with( | ||
data=mock_encoded_data, signal_format="OTEL_V1_METRICS" | ||
) | ||
self.assertEqual(result, MetricExportResult.SUCCESS) | ||
|
||
# pylint: disable=no-self-use | ||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.UdpExporter") | ||
def test_shutdown(self, mock_udp_exporter): | ||
mock_udp_exporter_instance = mock_udp_exporter.return_value | ||
exporter = OtlpUdpMetricExporter() | ||
exporter.shutdown() | ||
mock_udp_exporter_instance.shutdown.assert_called_once() | ||
|
||
|
||
class TestOtlpUdpSpanExporter(unittest.TestCase): | ||
|
||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.encode_spans") | ||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.UdpExporter") | ||
def test_export(self, mock_udp_exporter, mock_encode_spans): | ||
mock_udp_exporter_instance = mock_udp_exporter.return_value | ||
mock_encoded_data = MagicMock() | ||
mock_encode_spans.return_value.SerializeToString.return_value = mock_encoded_data | ||
exporter = OtlpUdpSpanExporter() | ||
result = exporter.export(MagicMock()) | ||
mock_udp_exporter_instance.send_data.assert_called_once_with( | ||
data=mock_encoded_data, signal_format="OTEL_V1_TRACES" | ||
) | ||
self.assertEqual(result, SpanExportResult.SUCCESS) | ||
|
||
# pylint: disable=no-self-use | ||
@patch("amazon.opentelemetry.distro.otlp_udp_exporter.UdpExporter") | ||
def test_shutdown(self, mock_udp_exporter): | ||
mock_udp_exporter_instance = mock_udp_exporter.return_value | ||
exporter = OtlpUdpSpanExporter() | ||
exporter.shutdown() | ||
mock_udp_exporter_instance.shutdown.assert_called_once() | ||
|
||
|
||
# TODO: remove this line for final PR | ||
if __name__ == "__main__": | ||
unittest.main() |
srprash marked this conversation as resolved.
Show resolved
Hide resolved
|
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,15 @@ | ||
# test script for appsignals lambda behavior | ||
|
||
from time import sleep | ||
|
||
from opentelemetry import trace | ||
|
||
if __name__ == "__main__": | ||
tracer = trace.get_tracer("test-tracer") | ||
with tracer.start_as_current_span("parent"): | ||
# Attach a new child and update the current span | ||
with tracer.start_as_current_span("child"): | ||
# sleep for 1s | ||
sleep(1) | ||
# Close child span, set parent as current | ||
# Close parent span, set default span as current |
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.