Skip to content

Commit 0731812

Browse files
committed
chore: update udp exporter package name to include distro
1 parent 8632951 commit 0731812

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

.github/workflows/release-udp-exporter.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
type: string
1010
env:
1111
AWS_DEFAULT_REGION: us-east-1
12-
ARTIFACT_NAME: aws_otel_otlp_udp_exporter-${{ github.event.inputs.version }}-py3-none-any.whl
12+
ARTIFACT_NAME: aws_distro_otel_otlp_udp_exporter-${{ github.event.inputs.version }}-py3-none-any.whl
1313

1414
permissions:
1515
id-token: write
@@ -32,7 +32,7 @@ jobs:
3232
pip install hatch pytest flask
3333
3434
- name: Build package
35-
working-directory: exporters/aws-otel-otlp-udp-exporter
35+
working-directory: exporters/aws-distro-otel-otlp-udp-exporter
3636
run: hatch build
3737

3838
- name: Download and run X-Ray Daemon
@@ -45,11 +45,11 @@ jobs:
4545
4646
- name: Install UDP Exporter
4747
run: |
48-
pip install ./exporters/aws-otel-otlp-udp-exporter/dist/*.whl
48+
pip install ./exporters/aws-distro-otel-otlp-udp-exporter/dist/*.whl
4949
5050
- name: Ensure Unit Tests are passing
5151
run: |
52-
pytest exporters/aws-otel-otlp-udp-exporter/tests/
52+
pytest exporters/aws-distro-otel-otlp-udp-exporter/tests/
5353
5454
- name: Run Sample App in Background
5555
working-directory: sample-applications/integ-test-app
@@ -106,12 +106,12 @@ jobs:
106106
TWINE_USERNAME: '__token__'
107107
TWINE_PASSWORD: ${{ env.TEST_PYPI_TOKEN_API_TOKEN }}
108108
run: |
109-
twine upload --repository testpypi --skip-existing --verbose exporters/aws-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}
109+
twine upload --repository testpypi --skip-existing --verbose exporters/aws-distro-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}
110110
111111
# Publish to prod PyPI
112112
- name: Publish to PyPI
113113
env:
114114
TWINE_USERNAME: '__token__'
115115
TWINE_PASSWORD: ${{ env.PROD_PYPI_TOKEN_API_TOKEN }}
116116
run: |
117-
twine upload --skip-existing --verbose exporters/aws-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}
117+
twine upload --skip-existing --verbose exporters/aws-distro-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}

exporters/aws-otel-otlp-udp-exporter/README.rst renamed to exporters/aws-distro-otel-otlp-udp-exporter/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Installation
66

77
::
88

9-
pip install aws-otel-otlp-udp-exporter
9+
pip install aws-distro-otel-otlp-udp-exporter
1010

1111

1212
This package provides a UDP exporter for OpenTelemetry.

exporters/aws-otel-otlp-udp-exporter/pyproject.toml renamed to exporters/aws-distro-otel-otlp-udp-exporter/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = ["hatchling"]
33
build-backend = "hatchling.build"
44

55
[project]
6-
name = "aws-otel-otlp-udp-exporter"
6+
name = "aws-distro-otel-otlp-udp-exporter"
77
version = "0.1.0"
88
description = "OTLP UDP Exporter for OpenTelemetry"
99
readme = "README.rst"
@@ -30,7 +30,7 @@ dependencies = [
3030
]
3131

3232
[project.urls]
33-
Homepage = "https://github.com/aws-observability/aws-otel-python-instrumentation/tree/main/exporters/aws-otel-otlp-udp-exporter"
33+
Homepage = "https://github.com/aws-observability/aws-otel-python-instrumentation/tree/main/exporters/aws-distro-otel-otlp-udp-exporter"
3434

3535
[tool.hatch.build.targets.wheel]
3636
packages = ["src/amazon"]

exporters/aws-otel-otlp-udp-exporter/tests/test_exporter.py renamed to exporters/aws-distro-otel-otlp-udp-exporter/tests/test_exporter.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from unittest import TestCase
77
from unittest.mock import MagicMock, patch
88

9-
from amazon.opentelemetry.exporters.otlp.udp import (
9+
from amazon.distro.opentelemetry.exporters.otlp.udp import (
1010
DEFAULT_ENDPOINT,
1111
FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX,
1212
FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX,
@@ -19,7 +19,7 @@
1919

2020
class TestUdpExporter(TestCase):
2121

22-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
22+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
2323
def test_udp_exporter_init_default(self, mock_socket):
2424
exporter = UdpExporter()
2525
self.assertEqual(exporter._endpoint, DEFAULT_ENDPOINT)
@@ -28,7 +28,7 @@ def test_udp_exporter_init_default(self, mock_socket):
2828
mock_socket.assert_called_once_with(socket.AF_INET, socket.SOCK_DGRAM)
2929
mock_socket().setblocking.assert_called_once_with(False)
3030

31-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
31+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
3232
def test_udp_exporter_init_with_endpoint(self, mock_socket):
3333
exporter = UdpExporter(endpoint="localhost:5000")
3434
self.assertNotEqual(exporter._endpoint, DEFAULT_ENDPOINT)
@@ -37,13 +37,13 @@ def test_udp_exporter_init_with_endpoint(self, mock_socket):
3737
mock_socket.assert_called_once_with(socket.AF_INET, socket.SOCK_DGRAM)
3838
mock_socket().setblocking.assert_called_once_with(False)
3939

40-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
40+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
4141
def test_udp_exporter_init_invalid_endpoint(self, mock_socket):
4242
with self.assertRaises(ValueError):
4343
UdpExporter(endpoint="invalidEndpoint:port")
4444

4545
# pylint: disable=no-self-use
46-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
46+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
4747
def test_send_data(self, mock_socket):
4848
mock_socket_instance = mock_socket.return_value
4949
exporter = UdpExporter()
@@ -53,7 +53,7 @@ def test_send_data(self, mock_socket):
5353
expected_message = PROTOCOL_HEADER + "signal_prefix" + encoded_bytes.decode("utf-8")
5454
mock_socket_instance.sendto.assert_called_once_with(expected_message.encode("utf-8"), ("127.0.0.1", 2000))
5555

56-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
56+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.socket.socket")
5757
def test_shutdown(self, mock_socket):
5858
mock_socket_instance = mock_socket.return_value
5959
exporter = UdpExporter()
@@ -63,8 +63,8 @@ def test_shutdown(self, mock_socket):
6363

6464
class TestOTLPUdpSpanExporter(unittest.TestCase):
6565

66-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
67-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
66+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
67+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
6868
def test_export_unsampled_span(self, mock_udp_exporter, mock_encode_spans):
6969
mock_udp_exporter_instance = mock_udp_exporter.return_value
7070
mock_encoded_data = MagicMock()
@@ -76,8 +76,8 @@ def test_export_unsampled_span(self, mock_udp_exporter, mock_encode_spans):
7676
)
7777
self.assertEqual(result, SpanExportResult.SUCCESS)
7878

79-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
80-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
79+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
80+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
8181
def test_export_sampled_span(self, mock_udp_exporter, mock_encode_spans):
8282
mock_udp_exporter_instance = mock_udp_exporter.return_value
8383
mock_encoded_data = MagicMock()
@@ -89,8 +89,8 @@ def test_export_sampled_span(self, mock_udp_exporter, mock_encode_spans):
8989
)
9090
self.assertEqual(result, SpanExportResult.SUCCESS)
9191

92-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
93-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
92+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.encode_spans")
93+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
9494
def test_export_with_exception(self, mock_udp_exporter, mock_encode_spans):
9595
mock_udp_exporter_instance = mock_udp_exporter.return_value
9696
mock_encoded_data = MagicMock()
@@ -101,7 +101,7 @@ def test_export_with_exception(self, mock_udp_exporter, mock_encode_spans):
101101
self.assertEqual(result, SpanExportResult.FAILURE)
102102

103103
# pylint: disable=no-self-use
104-
@patch("amazon.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
104+
@patch("amazon.distro.opentelemetry.exporters.otlp.udp.exporter.UdpExporter")
105105
def test_shutdown(self, mock_udp_exporter):
106106
mock_udp_exporter_instance = mock_udp_exporter.return_value
107107
exporter = OTLPUdpSpanExporter()

sample-applications/integ-test-app/udp_exporter_validation_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from flask import Flask
22

3-
from amazon.opentelemetry.exporters.otlp.udp import OTLPUdpSpanExporter
3+
from amazon.distro.opentelemetry.exporters.otlp.udp import OTLPUdpSpanExporter
44
from opentelemetry import trace
55
from opentelemetry.sdk.trace import TracerProvider
66
from opentelemetry.sdk.trace.export import BatchSpanProcessor

0 commit comments

Comments
 (0)