Skip to content

chore(lib-injection): change ssi code to use safe instrumentation configuration #13617

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 118 commits into from
Jun 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
c30d9da
add basic guardrails poc
wconti27 May 22, 2025
8a10a6d
fixes
wconti27 May 22, 2025
6dda424
add tests
wconti27 May 27, 2025
93b1027
min fastapi customer used version
wconti27 May 27, 2025
e0f4494
add dependenceny
wconti27 May 27, 2025
5813f2d
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 27, 2025
31e8788
update lockfiles and some other tings
wconti27 May 27, 2025
e42c23b
fix precheck
wconti27 May 27, 2025
2b61f01
more changes
wconti27 May 27, 2025
468251a
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 27, 2025
d94b33a
revert fastapi
wconti27 May 27, 2025
c9617a8
removing packaging dependency
wconti27 May 27, 2025
cf2f410
write custom version specs
wconti27 May 27, 2025
e9f1f8e
update min compatabile versions
wconti27 May 27, 2025
22b9a3b
add supported versions functions to integrations
wconti27 May 28, 2025
e4df435
add patch test case
wconti27 May 28, 2025
c1291fd
add to missing integrations
wconti27 May 28, 2025
60ed189
more changes
wconti27 May 28, 2025
e8e570d
more fixes
wconti27 May 28, 2025
22ae297
cleanup
wconti27 May 28, 2025
aba7cfc
more changes
wconti27 May 28, 2025
93cacb0
remove breakpoint
wconti27 May 28, 2025
64cb193
more fixes
wconti27 May 28, 2025
4f86b90
more changes
wconti27 May 28, 2025
d29b823
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 29, 2025
0a2b092
more changes
wconti27 May 29, 2025
f3875b9
more changes
wconti27 May 29, 2025
a772ee9
fix docs
wconti27 May 29, 2025
6b60814
run lint
wconti27 May 29, 2025
852197d
Merge branch 'conti/add-integration-guardrails' into conti/add-all-in…
wconti27 May 29, 2025
cff67ab
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 29, 2025
b679922
fix a few more things
wconti27 May 29, 2025
bf8f167
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 29, 2025
83afbfc
Merge branch 'conti/add-integration-guardrails' into conti/add-all-in…
wconti27 May 29, 2025
dffebc6
fix docs
wconti27 May 29, 2025
de9a9fb
add config variable
wconti27 May 30, 2025
05f6d2c
fix test
wconti27 May 30, 2025
c08d586
Merge branch 'conti/add-integration-guardrails' into conti/add-all-in…
wconti27 May 30, 2025
5708595
lower aiohttp jinja2 guardrails
wconti27 May 30, 2025
e8cc969
Merge branch 'main' into conti/add-integration-guardrails
wconti27 May 30, 2025
4b476a4
Merge branch 'conti/add-integration-guardrails' into conti/add-all-in…
wconti27 May 30, 2025
c365d95
Merge branch 'main' into conti/add-all-integration-guardrail-functions
wconti27 Jun 3, 2025
cfdcf2b
remove custom version specifier implementation
wconti27 Jun 3, 2025
ceabe01
Merge branch 'main' into conti/add-all-integration-guardrail-functions
wconti27 Jun 3, 2025
911b4b4
small fixes
wconti27 Jun 3, 2025
67b105f
add release note
wconti27 Jun 3, 2025
6426bc1
Merge branch 'main' into conti/add-all-integration-guardrail-functions
emmettbutler Jun 4, 2025
d2f11a9
Merge branch 'main' into conti/add-all-integration-guardrail-functions
wconti27 Jun 4, 2025
7b25897
change support ranges
wconti27 Jun 4, 2025
91a6c00
more changes
wconti27 Jun 4, 2025
f0d052c
fix lint
wconti27 Jun 4, 2025
bc6cb63
more changes
wconti27 Jun 4, 2025
a8e323b
fix a few more cases
wconti27 Jun 5, 2025
c7955e4
fix lint
wconti27 Jun 5, 2025
9757a90
fix test bug
wconti27 Jun 5, 2025
c9537d6
more fixes
wconti27 Jun 5, 2025
d995dd6
fix circular import
wconti27 Jun 5, 2025
f25917f
more changes
wconti27 Jun 5, 2025
0afcf71
more fixes
wconti27 Jun 5, 2025
abcccc4
hopefully all tests pass
wconti27 Jun 5, 2025
d904a3f
update test version ranges
wconti27 Jun 6, 2025
c0b0384
Merge remote-tracking branch 'origin/main' into conti/add-all-integra…
wconti27 Jun 6, 2025
6c69cae
initial commit expanding version ranges
wconti27 Jun 6, 2025
a6d0269
update min compatible versions
wconti27 Jun 6, 2025
8a7454e
many fixes
wconti27 Jun 6, 2025
0462a8a
fix langgraph
wconti27 Jun 6, 2025
324b24e
initial commit
wconti27 Jun 6, 2025
8bc1542
fix docs
wconti27 Jun 6, 2025
878f5a8
fix more docs
wconti27 Jun 6, 2025
6a4f9f3
update aiohttp in riotfile
wconti27 Jun 6, 2025
b40f050
fix failures again
wconti27 Jun 6, 2025
4e12196
more docs fixes
wconti27 Jun 6, 2025
314dcb8
update aiohttp tests to run limited subset for older versions
wconti27 Jun 6, 2025
4776778
fix release note
wconti27 Jun 6, 2025
0996f8e
revert aiohttp changes
wconti27 Jun 6, 2025
b909653
fix docs again
wconti27 Jun 6, 2025
f08ea81
fix riotfile
wconti27 Jun 9, 2025
7ccfb9d
fix aiohttp jinja2
wconti27 Jun 9, 2025
5571df4
fix spelling in docs
wconti27 Jun 9, 2025
6c8a74a
Merge branch 'conti/expand-integration-support-range' into conti/add-…
wconti27 Jun 9, 2025
604f170
remove unnecessary changes
wconti27 Jun 9, 2025
cdb6569
revert things to main
wconti27 Jun 9, 2025
0eb40d0
revert a few changes
wconti27 Jun 9, 2025
9a07ac2
Merge branch 'main' into conti/add-all-integration-guardrail-functions
wconti27 Jun 9, 2025
69a336f
update supported version ranges to be accurate
wconti27 Jun 9, 2025
a3a08ab
update version ranges
wconti27 Jun 9, 2025
b328a74
expand tested integration ranges
wconti27 Jun 10, 2025
5d6dcf0
test fixes
wconti27 Jun 10, 2025
45d44e2
more fixes
wconti27 Jun 10, 2025
9cc4bbd
Merge branch 'main' into conti/expand-integration-tested-versions
wconti27 Jun 10, 2025
0830e23
Merge branch 'conti/expand-integration-tested-versions' into conti/ad…
wconti27 Jun 10, 2025
77e5e4e
add whitelist for a few integrations where we don't test the min supp…
wconti27 Jun 10, 2025
3ecb1d6
more changes
wconti27 Jun 10, 2025
56edc80
fix naming
wconti27 Jun 10, 2025
a3a49a8
Merge branch 'conti/expand-integration-tested-versions' into conti/ad…
wconti27 Jun 10, 2025
ea80888
run lint
wconti27 Jun 10, 2025
f5c5dce
Merge branch 'conti/add-all-integration-guardrail-functions' into con…
wconti27 Jun 10, 2025
2ab17f1
more changes
wconti27 Jun 10, 2025
71882f2
add lib injection test cases
wconti27 Jun 11, 2025
6167dfa
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 11, 2025
6dda94f
update reqs.
wconti27 Jun 11, 2025
b433007
add tests for incompatible ddtrace deps
wconti27 Jun 11, 2025
dc6ee63
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 11, 2025
76d8430
fix typing error
wconti27 Jun 11, 2025
1283700
fix workflow to run
wconti27 Jun 11, 2025
6981826
fix syntax
wconti27 Jun 11, 2025
afad6d2
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 12, 2025
40d7e2d
add release note
wconti27 Jun 12, 2025
c9a0e7b
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 12, 2025
dba3aec
Update releasenotes/notes/update-lib-injection-to-use-safe-instrument…
wconti27 Jun 13, 2025
536d825
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 13, 2025
61617b1
fix conftest
wconti27 Jun 13, 2025
3d2ed85
fix lib injection test setup
wconti27 Jun 13, 2025
d9232d3
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 13, 2025
63909dc
fix release note
wconti27 Jun 13, 2025
a309fe8
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 13, 2025
fc5567c
Update releasenotes/notes/update-lib-injection-to-use-safe-instrument…
wconti27 Jun 13, 2025
3d8088e
Merge branch 'main' into conti/improve-ssi-guardrails
wconti27 Jun 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/requirements-locks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,16 @@ jobs:
run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13

- name: Install Dependencies
run: pip install --upgrade pip && pip install riot==0.20.1
run: pip install --upgrade pip && pip install riot==0.20.1 && pip install toml==0.10.2

- name: Generate riot locks
run: scripts/compile-and-prune-test-requirements

- name: Check locks diff
run: scripts/check-diff '.riot/requirements/' 'Mismatches found between .riot/requirements/*.txt and riotfile.py. Run scripts/compile-and-prune-test-requirements and commit the result.'

- name: Generate min_compatible_versions
run: python scripts/min_compatible_versions.py
- name: Generate tracer requirements csv
run: python scripts/requirements_to_csv.py

- name: Check min_compatible_versions diff
run: scripts/check-diff 'min_compatible_versions.csv' 'Mismatches found between min_compatible_versions.csv and riotfile.py. Run `python scripts/min_compatible_versions.py` and commit the result.'

- name: Check lib-injection min_compatible_versions diff
run: scripts/check-diff 'lib-injection/sources/min_compatible_versions.csv' 'Mismatches found between min_compatible_versions.csv and riotfile.py. Run `python scripts/min_compatible_versions.py` and commit the result.'
- name: Check tracer requirements csv diff
run: scripts/check-diff 'requirements.csv' 'Tracer dependency requirements in requirements.csv is out of date. Run `python scripts/requirements_to_csv.py` and commit the result.'
25 changes: 25 additions & 0 deletions .riot/requirements/134a53d.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/134a53d.in
#
attrs==25.3.0
coverage[toml]==7.6.1
exceptiongroup==1.3.0
hypothesis==6.45.0
importlib-metadata==8.5.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.5.0
pytest==8.3.5
pytest-cov==5.0.0
pytest-mock==3.14.1
pytest-randomly==3.15.0
pyyaml==6.0.2
sortedcontainers==2.4.0
tomli==2.2.1
typing-extensions==4.13.2
zipp==3.20.2
21 changes: 21 additions & 0 deletions .riot/requirements/14e26cb.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# This file is autogenerated by pip-compile with Python 3.13
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/14e26cb.in
#
attrs==25.3.0
coverage[toml]==7.8.2
hypothesis==6.45.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.6.0
pygments==2.19.1
pytest==8.4.0
pytest-cov==6.1.1
pytest-mock==3.14.1
pytest-randomly==3.16.0
pyyaml==6.0.2
sortedcontainers==2.4.0
24 changes: 24 additions & 0 deletions .riot/requirements/1db410d.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1db410d.in
#
attrs==25.3.0
coverage[toml]==7.8.2
exceptiongroup==1.3.0
hypothesis==6.45.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.6.0
pygments==2.19.1
pytest==8.4.0
pytest-cov==6.1.1
pytest-mock==3.14.1
pytest-randomly==3.16.0
pyyaml==6.0.2
sortedcontainers==2.4.0
tomli==2.2.1
typing-extensions==4.14.0
21 changes: 21 additions & 0 deletions .riot/requirements/2e4f80d.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/2e4f80d.in
#
attrs==25.3.0
coverage[toml]==7.8.2
hypothesis==6.45.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.6.0
pygments==2.19.1
pytest==8.4.0
pytest-cov==6.1.1
pytest-mock==3.14.1
pytest-randomly==3.16.0
pyyaml==6.0.2
sortedcontainers==2.4.0
21 changes: 21 additions & 0 deletions .riot/requirements/517236e.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/517236e.in
#
attrs==25.3.0
coverage[toml]==7.8.2
hypothesis==6.45.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.6.0
pygments==2.19.1
pytest==8.4.0
pytest-cov==6.1.1
pytest-mock==3.14.1
pytest-randomly==3.16.0
pyyaml==6.0.2
sortedcontainers==2.4.0
26 changes: 26 additions & 0 deletions .riot/requirements/590286a.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/590286a.in
#
attrs==25.3.0
coverage[toml]==7.8.2
exceptiongroup==1.3.0
hypothesis==6.45.0
importlib-metadata==8.7.0
iniconfig==2.1.0
mock==5.2.0
opentracing==2.4.0
packaging==25.0
pluggy==1.6.0
pygments==2.19.1
pytest==8.4.0
pytest-cov==6.1.1
pytest-mock==3.14.1
pytest-randomly==3.16.0
pyyaml==6.0.2
sortedcontainers==2.4.0
tomli==2.2.1
typing-extensions==4.14.0
zipp==3.23.0
2 changes: 1 addition & 1 deletion .riot/requirements/aaa8f63.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/aaa8f63.in
# pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/aaa8f63.in
#
attrs==25.3.0
coverage[toml]==7.8.2
Expand Down
202 changes: 0 additions & 202 deletions lib-injection/sources/min_compatible_versions.csv

This file was deleted.

15 changes: 15 additions & 0 deletions lib-injection/sources/requirements.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Dependency,Version Specifier,Python Version
bytecode,>=0.16.0,python_version>='3.13.0'
bytecode,>=0.15.1,python_version~='3.12.0'
bytecode,>=0.14.0,python_version~='3.11.0'
bytecode,>=0.13.0,python_version<'3.11'
envier,~=0.6.1,
importlib_metadata,<=6.5.0,python_version<'3.8'
legacy-cgi,>=2.0.0,python_version>='3.13.0'
opentelemetry-api,>=1,
protobuf,>=3,
typing_extensions,,
xmltodict,>=0.12,
wrapt,>=1,
opentracing,>=2.0.0,
tiktoken,,
Loading
Loading