Skip to content

Commit 2493c1c

Browse files
committed
move sampler into aws sdk-extensions
1 parent 8b62fec commit 2493c1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+77
-728
lines changed

.github/component_owners.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ components:
3232
propagator/opentelemetry-propagator-aws-xray:
3333
- NathanielRN
3434

35-
sampler/opentelemetry-sampler-aws-xray:
36-
- jj22ee
37-
3835
sdk-extension/opentelemetry-sdk-extension-aws:
3936
- NathanielRN
4037
- Kausik-A
4138
- srprash
39+
- jj22ee
4240

4341
instrumentation/opentelemetry-instrumentation-tortoiseorm:
4442
- tonybaloney

.github/workflows/core_contrib_test_0.yml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,50 +1801,6 @@ jobs:
18011801
- name: Run tests
18021802
run: tox -e py38-test-propagator-ot-trace -- -ra
18031803

1804-
py38-test-sampler-aws-xray-0:
1805-
name: sampler-aws-xray-0
1806-
runs-on: ubuntu-latest
1807-
steps:
1808-
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1809-
uses: actions/checkout@v4
1810-
with:
1811-
repository: open-telemetry/opentelemetry-python-contrib
1812-
ref: ${{ env.CONTRIB_REPO_SHA }}
1813-
1814-
- name: Set up Python 3.8
1815-
uses: actions/setup-python@v5
1816-
with:
1817-
python-version: "3.8"
1818-
architecture: "x64"
1819-
1820-
- name: Install tox
1821-
run: pip install tox-uv
1822-
1823-
- name: Run tests
1824-
run: tox -e py38-test-sampler-aws-xray-0 -- -ra
1825-
1826-
py38-test-sampler-aws-xray-1:
1827-
name: sampler-aws-xray-1
1828-
runs-on: ubuntu-latest
1829-
steps:
1830-
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1831-
uses: actions/checkout@v4
1832-
with:
1833-
repository: open-telemetry/opentelemetry-python-contrib
1834-
ref: ${{ env.CONTRIB_REPO_SHA }}
1835-
1836-
- name: Set up Python 3.8
1837-
uses: actions/setup-python@v5
1838-
with:
1839-
python-version: "3.8"
1840-
architecture: "x64"
1841-
1842-
- name: Install tox
1843-
run: pip install tox-uv
1844-
1845-
- name: Run tests
1846-
run: tox -e py38-test-sampler-aws-xray-1 -- -ra
1847-
18481804
py38-test-instrumentation-sio-pika-0:
18491805
name: instrumentation-sio-pika-0
18501806
runs-on: ubuntu-latest

.github/workflows/lint_0.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,24 +1024,6 @@ jobs:
10241024
- name: Run tests
10251025
run: tox -e lint-propagator-ot-trace
10261026

1027-
lint-sampler-aws-xray:
1028-
name: sampler-aws-xray
1029-
runs-on: ubuntu-latest
1030-
steps:
1031-
- name: Checkout repo @ SHA - ${{ github.sha }}
1032-
uses: actions/checkout@v4
1033-
1034-
- name: Set up Python 3.13
1035-
uses: actions/setup-python@v5
1036-
with:
1037-
python-version: "3.13"
1038-
1039-
- name: Install tox
1040-
run: pip install tox-uv
1041-
1042-
- name: Run tests
1043-
run: tox -e lint-sampler-aws-xray
1044-
10451027
lint-instrumentation-sio-pika:
10461028
name: instrumentation-sio-pika
10471029
runs-on: ubuntu-latest

.github/workflows/test_2.yml

Lines changed: 0 additions & 252 deletions
Original file line numberDiff line numberDiff line change
@@ -916,258 +916,6 @@ jobs:
916916
- name: Run tests
917917
run: tox -e pypy3-test-propagator-ot-trace -- -ra
918918

919-
py38-test-sampler-aws-xray-0_ubuntu-latest:
920-
name: sampler-aws-xray-0 3.8 Ubuntu
921-
runs-on: ubuntu-latest
922-
steps:
923-
- name: Checkout repo @ SHA - ${{ github.sha }}
924-
uses: actions/checkout@v4
925-
926-
- name: Set up Python 3.8
927-
uses: actions/setup-python@v5
928-
with:
929-
python-version: "3.8"
930-
931-
- name: Install tox
932-
run: pip install tox-uv
933-
934-
- name: Run tests
935-
run: tox -e py38-test-sampler-aws-xray-0 -- -ra
936-
937-
py38-test-sampler-aws-xray-1_ubuntu-latest:
938-
name: sampler-aws-xray-1 3.8 Ubuntu
939-
runs-on: ubuntu-latest
940-
steps:
941-
- name: Checkout repo @ SHA - ${{ github.sha }}
942-
uses: actions/checkout@v4
943-
944-
- name: Set up Python 3.8
945-
uses: actions/setup-python@v5
946-
with:
947-
python-version: "3.8"
948-
949-
- name: Install tox
950-
run: pip install tox-uv
951-
952-
- name: Run tests
953-
run: tox -e py38-test-sampler-aws-xray-1 -- -ra
954-
955-
py39-test-sampler-aws-xray-0_ubuntu-latest:
956-
name: sampler-aws-xray-0 3.9 Ubuntu
957-
runs-on: ubuntu-latest
958-
steps:
959-
- name: Checkout repo @ SHA - ${{ github.sha }}
960-
uses: actions/checkout@v4
961-
962-
- name: Set up Python 3.9
963-
uses: actions/setup-python@v5
964-
with:
965-
python-version: "3.9"
966-
967-
- name: Install tox
968-
run: pip install tox-uv
969-
970-
- name: Run tests
971-
run: tox -e py39-test-sampler-aws-xray-0 -- -ra
972-
973-
py39-test-sampler-aws-xray-1_ubuntu-latest:
974-
name: sampler-aws-xray-1 3.9 Ubuntu
975-
runs-on: ubuntu-latest
976-
steps:
977-
- name: Checkout repo @ SHA - ${{ github.sha }}
978-
uses: actions/checkout@v4
979-
980-
- name: Set up Python 3.9
981-
uses: actions/setup-python@v5
982-
with:
983-
python-version: "3.9"
984-
985-
- name: Install tox
986-
run: pip install tox-uv
987-
988-
- name: Run tests
989-
run: tox -e py39-test-sampler-aws-xray-1 -- -ra
990-
991-
py310-test-sampler-aws-xray-0_ubuntu-latest:
992-
name: sampler-aws-xray-0 3.10 Ubuntu
993-
runs-on: ubuntu-latest
994-
steps:
995-
- name: Checkout repo @ SHA - ${{ github.sha }}
996-
uses: actions/checkout@v4
997-
998-
- name: Set up Python 3.10
999-
uses: actions/setup-python@v5
1000-
with:
1001-
python-version: "3.10"
1002-
1003-
- name: Install tox
1004-
run: pip install tox-uv
1005-
1006-
- name: Run tests
1007-
run: tox -e py310-test-sampler-aws-xray-0 -- -ra
1008-
1009-
py310-test-sampler-aws-xray-1_ubuntu-latest:
1010-
name: sampler-aws-xray-1 3.10 Ubuntu
1011-
runs-on: ubuntu-latest
1012-
steps:
1013-
- name: Checkout repo @ SHA - ${{ github.sha }}
1014-
uses: actions/checkout@v4
1015-
1016-
- name: Set up Python 3.10
1017-
uses: actions/setup-python@v5
1018-
with:
1019-
python-version: "3.10"
1020-
1021-
- name: Install tox
1022-
run: pip install tox-uv
1023-
1024-
- name: Run tests
1025-
run: tox -e py310-test-sampler-aws-xray-1 -- -ra
1026-
1027-
py311-test-sampler-aws-xray-0_ubuntu-latest:
1028-
name: sampler-aws-xray-0 3.11 Ubuntu
1029-
runs-on: ubuntu-latest
1030-
steps:
1031-
- name: Checkout repo @ SHA - ${{ github.sha }}
1032-
uses: actions/checkout@v4
1033-
1034-
- name: Set up Python 3.11
1035-
uses: actions/setup-python@v5
1036-
with:
1037-
python-version: "3.11"
1038-
1039-
- name: Install tox
1040-
run: pip install tox-uv
1041-
1042-
- name: Run tests
1043-
run: tox -e py311-test-sampler-aws-xray-0 -- -ra
1044-
1045-
py311-test-sampler-aws-xray-1_ubuntu-latest:
1046-
name: sampler-aws-xray-1 3.11 Ubuntu
1047-
runs-on: ubuntu-latest
1048-
steps:
1049-
- name: Checkout repo @ SHA - ${{ github.sha }}
1050-
uses: actions/checkout@v4
1051-
1052-
- name: Set up Python 3.11
1053-
uses: actions/setup-python@v5
1054-
with:
1055-
python-version: "3.11"
1056-
1057-
- name: Install tox
1058-
run: pip install tox-uv
1059-
1060-
- name: Run tests
1061-
run: tox -e py311-test-sampler-aws-xray-1 -- -ra
1062-
1063-
py312-test-sampler-aws-xray-0_ubuntu-latest:
1064-
name: sampler-aws-xray-0 3.12 Ubuntu
1065-
runs-on: ubuntu-latest
1066-
steps:
1067-
- name: Checkout repo @ SHA - ${{ github.sha }}
1068-
uses: actions/checkout@v4
1069-
1070-
- name: Set up Python 3.12
1071-
uses: actions/setup-python@v5
1072-
with:
1073-
python-version: "3.12"
1074-
1075-
- name: Install tox
1076-
run: pip install tox-uv
1077-
1078-
- name: Run tests
1079-
run: tox -e py312-test-sampler-aws-xray-0 -- -ra
1080-
1081-
py312-test-sampler-aws-xray-1_ubuntu-latest:
1082-
name: sampler-aws-xray-1 3.12 Ubuntu
1083-
runs-on: ubuntu-latest
1084-
steps:
1085-
- name: Checkout repo @ SHA - ${{ github.sha }}
1086-
uses: actions/checkout@v4
1087-
1088-
- name: Set up Python 3.12
1089-
uses: actions/setup-python@v5
1090-
with:
1091-
python-version: "3.12"
1092-
1093-
- name: Install tox
1094-
run: pip install tox-uv
1095-
1096-
- name: Run tests
1097-
run: tox -e py312-test-sampler-aws-xray-1 -- -ra
1098-
1099-
py313-test-sampler-aws-xray-0_ubuntu-latest:
1100-
name: sampler-aws-xray-0 3.13 Ubuntu
1101-
runs-on: ubuntu-latest
1102-
steps:
1103-
- name: Checkout repo @ SHA - ${{ github.sha }}
1104-
uses: actions/checkout@v4
1105-
1106-
- name: Set up Python 3.13
1107-
uses: actions/setup-python@v5
1108-
with:
1109-
python-version: "3.13"
1110-
1111-
- name: Install tox
1112-
run: pip install tox-uv
1113-
1114-
- name: Run tests
1115-
run: tox -e py313-test-sampler-aws-xray-0 -- -ra
1116-
1117-
py313-test-sampler-aws-xray-1_ubuntu-latest:
1118-
name: sampler-aws-xray-1 3.13 Ubuntu
1119-
runs-on: ubuntu-latest
1120-
steps:
1121-
- name: Checkout repo @ SHA - ${{ github.sha }}
1122-
uses: actions/checkout@v4
1123-
1124-
- name: Set up Python 3.13
1125-
uses: actions/setup-python@v5
1126-
with:
1127-
python-version: "3.13"
1128-
1129-
- name: Install tox
1130-
run: pip install tox-uv
1131-
1132-
- name: Run tests
1133-
run: tox -e py313-test-sampler-aws-xray-1 -- -ra
1134-
1135-
pypy3-test-sampler-aws-xray-0_ubuntu-latest:
1136-
name: sampler-aws-xray-0 pypy-3.8 Ubuntu
1137-
runs-on: ubuntu-latest
1138-
steps:
1139-
- name: Checkout repo @ SHA - ${{ github.sha }}
1140-
uses: actions/checkout@v4
1141-
1142-
- name: Set up Python pypy-3.8
1143-
uses: actions/setup-python@v5
1144-
with:
1145-
python-version: "pypy-3.8"
1146-
1147-
- name: Install tox
1148-
run: pip install tox-uv
1149-
1150-
- name: Run tests
1151-
run: tox -e pypy3-test-sampler-aws-xray-0 -- -ra
1152-
1153-
pypy3-test-sampler-aws-xray-1_ubuntu-latest:
1154-
name: sampler-aws-xray-1 pypy-3.8 Ubuntu
1155-
runs-on: ubuntu-latest
1156-
steps:
1157-
- name: Checkout repo @ SHA - ${{ github.sha }}
1158-
uses: actions/checkout@v4
1159-
1160-
- name: Set up Python pypy-3.8
1161-
uses: actions/setup-python@v5
1162-
with:
1163-
python-version: "pypy-3.8"
1164-
1165-
- name: Install tox
1166-
run: pip install tox-uv
1167-
1168-
- name: Run tests
1169-
run: tox -e pypy3-test-sampler-aws-xray-1 -- -ra
1170-
1171919
py38-test-instrumentation-sio-pika-0_ubuntu-latest:
1172920
name: instrumentation-sio-pika-0 3.8 Ubuntu
1173921
runs-on: ubuntu-latest

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ dependencies = [
6161
"opentelemetry-instrumentation-wsgi",
6262
"opentelemetry-propagator-ot-trace",
6363
"opentelemetry-propagator-aws-xray",
64-
"opentelemetry-sampler-aws-xray",
6564
"opentelemetry-util-http",
6665
"opentelemetry-instrumentation-vertexai[instruments]",
6766
"opentelemetry-instrumentation-openai-v2[instruments]",
@@ -131,7 +130,6 @@ opentelemetry-instrumentation-urllib3 = { workspace = true }
131130
opentelemetry-instrumentation-wsgi = { workspace = true }
132131
opentelemetry-propagator-ot-trace = { workspace = true }
133132
opentelemetry-propagator-aws-xray = { workspace = true }
134-
opentelemetry-sampler-aws-xray = { workspace = true }
135133
opentelemetry-util-http = { workspace = true }
136134
opentelemetry-instrumentation-vertexai = { workspace = true }
137135
opentelemetry-instrumentation-openai-v2 = { workspace = true }
@@ -144,7 +142,6 @@ members = [
144142
"exporter/*",
145143
"opentelemetry-instrumentation",
146144
"propagator/*",
147-
"sampler/*",
148145
"util/opentelemetry-util-http",
149146
]
150147
# TODO: remove after python 3.8 is dropped

sampler/opentelemetry-sampler-aws-xray/CHANGELOG.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)