Skip to content

Commit 52c77a0

Browse files
wconti27wconti27
authored
Merge branch 'main' into munir/skip-flaky-freeze-gun-gunicorn-tests
2 parents ce39719 + 02341fe commit 52c77a0

File tree

15 files changed

+338
-45
lines changed

15 files changed

+338
-45
lines changed

‎.github/workflows/unit_tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ jobs:
4646
sudo apt-get install -y python3.13 python3.13-dev
4747
4848
- name: Run tests
49+
# Currently failing to build the project on Windows 3.13, but only for this job, "Build" workflow is successful
50+
if: matrix.os != 'windows-latest' && matrix.python-version != '3.13'
4951
run: hatch run +py=${{ matrix.python-version }} multiple_os_tests:test
50-
52+
5153
finished:
5254
name: Multiple OS Tests Finished
5355
runs-on: ubuntu-latest
@@ -58,4 +60,4 @@ jobs:
5860
run: exit 0
5961
- name: Fails if anything else failed
6062
if: needs.multiple_os_tests.result != 'success'
61-
run: exit 1
63+
run: exit 1

‎.riot/requirements/190cae7.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/190cae7.in
6+
#
7+
aiosqlite==0.21.0
8+
attrs==25.3.0
9+
blinker==1.9.0
10+
certifi==2025.4.26
11+
charset-normalizer==3.4.2
12+
click==8.2.1
13+
coverage[toml]==7.9.0
14+
exceptiongroup==1.3.0
15+
flask==3.1.1
16+
greenlet==3.2.3
17+
hypothesis==6.45.0
18+
idna==3.10
19+
iniconfig==2.1.0
20+
iso8601==2.1.0
21+
itsdangerous==2.2.0
22+
jinja2==3.1.6
23+
markupsafe==3.0.2
24+
mock==5.2.0
25+
opentracing==2.4.0
26+
packaging==25.0
27+
peewee==3.18.1
28+
pluggy==1.6.0
29+
pony==0.7.19
30+
pycryptodome==3.23.0
31+
pygments==2.19.1
32+
pypika-tortoise==0.6.1
33+
pytest==8.4.0
34+
pytest-cov==6.2.1
35+
pytest-mock==3.14.1
36+
pytz==2025.2
37+
requests==2.32.4
38+
sortedcontainers==2.4.0
39+
sqlalchemy==2.0.41
40+
tomli==2.2.1
41+
tortoise-orm==0.25.1
42+
typing-extensions==4.14.0
43+
urllib3==2.4.0
44+
werkzeug==3.1.3

‎.riot/requirements/25712c4.txt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/25712c4.in
6+
#
7+
aiosqlite==0.21.0
8+
attrs==25.3.0
9+
blinker==1.9.0
10+
certifi==2025.4.26
11+
charset-normalizer==3.4.2
12+
click==8.1.8
13+
coverage[toml]==7.9.0
14+
exceptiongroup==1.3.0
15+
flask==3.1.1
16+
greenlet==3.2.3
17+
hypothesis==6.45.0
18+
idna==3.10
19+
importlib-metadata==8.7.0
20+
iniconfig==2.1.0
21+
iso8601==2.1.0
22+
itsdangerous==2.2.0
23+
jinja2==3.1.6
24+
markupsafe==3.0.2
25+
mock==5.2.0
26+
opentracing==2.4.0
27+
packaging==25.0
28+
peewee==3.18.1
29+
pluggy==1.6.0
30+
pony==0.7.19
31+
pycryptodome==3.23.0
32+
pygments==2.19.1
33+
pypika-tortoise==0.6.1
34+
pytest==8.4.0
35+
pytest-cov==6.2.1
36+
pytest-mock==3.14.1
37+
pytz==2025.2
38+
requests==2.32.4
39+
sortedcontainers==2.4.0
40+
sqlalchemy==2.0.41
41+
tomli==2.2.1
42+
tortoise-orm==0.25.1
43+
typing-extensions==4.14.0
44+
urllib3==2.4.0
45+
werkzeug==3.1.3
46+
zipp==3.23.0

‎.riot/requirements/64169ed.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/64169ed.in
6+
#
7+
aiosqlite==0.21.0
8+
attrs==25.3.0
9+
blinker==1.9.0
10+
certifi==2025.4.26
11+
charset-normalizer==3.4.2
12+
click==8.2.1
13+
coverage[toml]==7.9.0
14+
flask==3.1.1
15+
greenlet==3.2.3
16+
hypothesis==6.45.0
17+
idna==3.10
18+
iniconfig==2.1.0
19+
iso8601==2.1.0
20+
itsdangerous==2.2.0
21+
jinja2==3.1.6
22+
markupsafe==3.0.2
23+
mock==5.2.0
24+
opentracing==2.4.0
25+
packaging==25.0
26+
peewee==3.18.1
27+
pluggy==1.6.0
28+
pony==0.7.19
29+
pycryptodome==3.23.0
30+
pygments==2.19.1
31+
pypika-tortoise==0.6.1
32+
pytest==8.4.0
33+
pytest-cov==6.2.1
34+
pytest-mock==3.14.1
35+
pytz==2025.2
36+
requests==2.32.4
37+
sortedcontainers==2.4.0
38+
sqlalchemy==2.0.41
39+
tortoise-orm==0.25.1
40+
typing-extensions==4.14.0
41+
urllib3==2.4.0
42+
werkzeug==3.1.3

‎.riot/requirements/77830bc.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/77830bc.in
6+
#
7+
aiosqlite==0.21.0
8+
attrs==25.3.0
9+
blinker==1.9.0
10+
certifi==2025.4.26
11+
charset-normalizer==3.4.2
12+
click==8.2.1
13+
coverage[toml]==7.9.0
14+
flask==3.1.1
15+
greenlet==3.2.3
16+
hypothesis==6.45.0
17+
idna==3.10
18+
iniconfig==2.1.0
19+
iso8601==2.1.0
20+
itsdangerous==2.2.0
21+
jinja2==3.1.6
22+
markupsafe==3.0.2
23+
mock==5.2.0
24+
opentracing==2.4.0
25+
packaging==25.0
26+
peewee==3.18.1
27+
pluggy==1.6.0
28+
pony==0.7.19
29+
pycryptodome==3.23.0
30+
pygments==2.19.1
31+
pypika-tortoise==0.6.1
32+
pytest==8.4.0
33+
pytest-cov==6.2.1
34+
pytest-mock==3.14.1
35+
pytz==2025.2
36+
requests==2.32.4
37+
sortedcontainers==2.4.0
38+
sqlalchemy==2.0.41
39+
tortoise-orm==0.25.1
40+
typing-extensions==4.14.0
41+
urllib3==2.4.0
42+
werkzeug==3.1.3

‎.riot/requirements/b1ef26d.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.13
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/b1ef26d.in
6+
#
7+
aiosqlite==0.21.0
8+
attrs==25.3.0
9+
blinker==1.9.0
10+
certifi==2025.4.26
11+
charset-normalizer==3.4.2
12+
click==8.2.1
13+
coverage[toml]==7.9.0
14+
flask==3.1.1
15+
greenlet==3.2.3
16+
hypothesis==6.45.0
17+
idna==3.10
18+
iniconfig==2.1.0
19+
iso8601==2.1.0
20+
itsdangerous==2.2.0
21+
jinja2==3.1.6
22+
markupsafe==3.0.2
23+
mock==5.2.0
24+
opentracing==2.4.0
25+
packaging==25.0
26+
peewee==3.18.1
27+
pluggy==1.6.0
28+
pony==0.7.19
29+
pycryptodome==3.23.0
30+
pygments==2.19.1
31+
pypika-tortoise==0.6.1
32+
pytest==8.4.0
33+
pytest-cov==6.2.1
34+
pytest-mock==3.14.1
35+
pytz==2025.2
36+
requests==2.32.4
37+
sortedcontainers==2.4.0
38+
sqlalchemy==2.0.41
39+
tortoise-orm==0.25.1
40+
typing-extensions==4.14.0
41+
urllib3==2.4.0
42+
werkzeug==3.1.3

‎ddtrace/data_streams.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,25 @@
22
from ddtrace.internal.datastreams.processor import PROPAGATION_KEY_BASE_64
33

44

5-
def set_consume_checkpoint(typ, source, carrier_get):
5+
def set_consume_checkpoint(typ, source, carrier_get, manual_checkpoint=True):
66
"""
77
:param typ: The type of the checkpoint, usually the streaming technology being used.
88
Examples include kafka, kinesis, sns etc. (str)
99
:param source: The source of data. This can be a topic, exchange or stream name. (str)
1010
:param carrier_get: A function used to extract context from the carrier (function (str) -> str)
11+
:param manual_checkpoint: Whether this checkpoint was manually set. Keep true if manually instrumenting.
12+
Manual instrumentation always overrides automatic instrumentation in the case a call is both
13+
manually and automatically instrumented. (bool)
1114
1215
:returns DataStreamsCtx | None
1316
"""
1417
if ddtrace.config._data_streams_enabled:
1518
processor = ddtrace.tracer.data_streams_processor
1619
processor.decode_pathway_b64(carrier_get(PROPAGATION_KEY_BASE_64))
17-
return processor.set_checkpoint(["type:" + typ, "topic:" + source, "direction:in", "manual_checkpoint:true"])
20+
tags = ["type:" + typ, "topic:" + source, "direction:in"]
21+
if manual_checkpoint:
22+
tags.append("manual_checkpoint:true")
23+
return processor.set_checkpoint(tags)
1824

1925

2026
def set_produce_checkpoint(typ, target, carrier_set):

‎hatch.toml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -306,41 +306,6 @@ test = [
306306
[[envs.appsec_iast_native.matrix]]
307307
python = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
308308

309-
## ASM iast_tdd_propagation
310-
311-
[envs.iast_tdd_propagation]
312-
template = "iast_tdd_propagation"
313-
dependencies = [
314-
"pytest",
315-
"pytest-cov",
316-
"requests",
317-
"hypothesis",
318-
"flask",
319-
"pycryptodome",
320-
"sqlalchemy~=2.0.23",
321-
"pony",
322-
"aiosqlite",
323-
"tortoise-orm",
324-
"peewee",
325-
"aiosqlite",
326-
]
327-
328-
[envs.iast_tdd_propagation.env-vars]
329-
_DD_IAST_PATCH_MODULES = "benchmarks.,tests.appsec."
330-
DD_IAST_REQUEST_SAMPLING = "100"
331-
DD_IAST_VULNERABILITIES_PER_REQUEST = "100000"
332-
DD_IAST_DEDUPLICATION_ENABLED = "false"
333-
334-
[envs.iast_tdd_propagation.scripts]
335-
test = [
336-
"uname -a",
337-
"pip freeze",
338-
"python -m pytest tests/appsec/iast_tdd_propagation",
339-
]
340-
341-
[[envs.iast_tdd_propagation.matrix]]
342-
python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
343-
344309
## IAST packages integrations
345310

346311
[envs.appsec_integrations_packages]

‎lib-injection/sources/min_compatible_versions.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ opensearch-py[requests],~=1.1.0
126126
opentelemetry-api,~=1.0.0
127127
opentelemetry-instrumentation-flask,0
128128
opentracing,0
129+
peewee,0
129130
pika,0
130131
pinecone-client,0
132+
pony,0
131133
protobuf,>3
132134
psutil,0
133135
psycopg,~=3.0.0
@@ -181,6 +183,7 @@ structlog,~=20.2.0
181183
tests/contrib/pyramid/pserve_app,0
182184
tiktoken,0
183185
tornado,~=4.5.0
186+
tortoise-orm,0
184187
typing-extensions,0
185188
urllib3,~=1.0
186189
uwsgi,0

‎min_compatible_versions.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ opensearch-py[requests],~=1.1.0
126126
opentelemetry-api,~=1.0.0
127127
opentelemetry-instrumentation-flask,0
128128
opentracing,0
129+
peewee,0
129130
pika,0
130131
pinecone-client,0
132+
pony,0
131133
protobuf,>3
132134
psutil,0
133135
psycopg,~=3.0.0
@@ -181,6 +183,7 @@ structlog,~=20.2.0
181183
tests/contrib/pyramid/pserve_app,0
182184
tiktoken,0
183185
tornado,~=4.5.0
186+
tortoise-orm,0
184187
typing-extensions,0
185188
urllib3,~=1.0
186189
uwsgi,0

0 commit comments

Comments
 (0)