Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use request_ctx to determine whether or not _teardown_request should end flask span #1692

Merged
merged 31 commits into from
Jun 13, 2023
Merged

Use request_ctx to determine whether or not _teardown_request should end flask span #1692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d11ff88
Use `id(flask.request)` instead of `thread.get_ident()`
matthewgrossman Feb 24, 2023
fb9161d
use reqctx instead?
matthewgrossman Feb 24, 2023
45198d7
try request ctx stack
matthewgrossman Mar 14, 2023
19f4c3c
get a functional test
matthewgrossman Mar 14, 2023
b173c05
add conditional based on package_version
matthewgrossman Mar 14, 2023
df2085d
loosen constraints
matthewgrossman Mar 14, 2023
fe1bd89
weakref, not id()
matthewgrossman Mar 14, 2023
6f7835a
lets pivot
matthewgrossman Mar 14, 2023
4bcc1df
clean up
matthewgrossman Mar 14, 2023
8e6905a
weakref version, attempting other branch now
matthewgrossman Mar 14, 2023
8d5a391
fix comment
matthewgrossman Apr 7, 2023
6b06283
fix type
matthewgrossman Apr 7, 2023
d82185e
fix comment
matthewgrossman Apr 7, 2023
282da72
add packaging to requirements
matthewgrossman Apr 7, 2023
3e1711c
Merge branch 'main' into mg-use-request-id-instead-of-thread-id
matthewgrossman Apr 7, 2023
1b8ab68
Add to tox.ini
matthewgrossman Apr 7, 2023
41a2eb7
push up again
matthewgrossman Apr 7, 2023
d599ac5
loosen dev requirements
matthewgrossman Apr 7, 2023
e573fea
Add to changelog
matthewgrossman Apr 7, 2023
7be29f3
lint
matthewgrossman Apr 7, 2023
1579401
Merge branch 'main' into mg-use-request-id-instead-of-thread-id
shalevr Apr 19, 2023
774c34c
Merge branch 'main' into mg-use-request-id-instead-of-thread-id
matthewgrossman May 24, 2023
7fdf90c
Merge branch 'mg-use-request-id-instead-of-thread-id' of github.com:m…
matthewgrossman May 24, 2023
72136d6
format
matthewgrossman May 24, 2023
103871b
format
matthewgrossman May 24, 2023
10b49de
isort
matthewgrossman May 24, 2023
76934fa
fix
matthewgrossman May 24, 2023
d5da755
fix markupsafe
matthewgrossman May 24, 2023
356cf20
black
matthewgrossman May 25, 2023
3098165
black
matthewgrossman May 25, 2023
5aa045c
Merge branch 'main' into mg-use-request-id-instead-of-thread-id
ocelotl Jun 13, 2023
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
Prev Previous commit
Next Next commit
Add to tox.ini
  • Loading branch information
@matthewgrossman
matthewgrossman committed Apr 7, 2023
commit 1b8ab6885254715d441945651a283476f156ff5e
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-flask[instruments]",
"flask >= 2.2.0",
"markupsafe==2.0.1",
"markupsafe>=2.0.1",
"opentelemetry-test-utils == 0.39b0.dev",
]

Expand Down
10 changes: 6 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ envlist =
pypy3-test-instrumentation-fastapi

; opentelemetry-instrumentation-flask
py3{7,8,9,10,11}-test-instrumentation-flask
py3{7,8,9,10,11}-test-instrumentation-flask{213,220}
pypy3-test-instrumentation-flask

; opentelemetry-instrumentation-urllib
Expand Down Expand Up @@ -254,6 +254,8 @@ deps =
falcon1: falcon ==1.4.1
falcon2: falcon >=2.0.0,<3.0.0
falcon3: falcon >=3.0.0,<4.0.0
flask213: Flask<=2.1.3
flask220: Flask>=2.2.0
grpc: pytest-asyncio
sqlalchemy11: sqlalchemy>=1.1,<1.2
sqlalchemy14: aiosqlite
Expand Down Expand Up @@ -359,8 +361,8 @@ commands_pre =

grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]

falcon{1,2,3},flask,django{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,requests,urllib,urllib3,wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
wsgi,falcon{1,2,3},flask,django{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
falcon{1,2,3},flask{213,220},django{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,requests,urllib,urllib3,wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
wsgi,falcon{1,2,3},flask{213,220},django{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
asgi,django{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]

asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
Expand All @@ -374,7 +376,7 @@ commands_pre =

falcon{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]

flask: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
flask{213,220}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]

urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]

Expand Down