Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Send the opentracing span information also to appservices #16227

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Send the opentracing span information also to appservices #16227

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23ed267
Send the opentracing span information also to appservices
MTRNord Sep 2, 2023
ae4f500
Add changelog entry for PR 16227
MTRNord Sep 2, 2023
7ed9477
Make the changelog entry for PR 16227 a feature instead of a misc entry
MTRNord Sep 2, 2023
bc99077
Update the test mock to work with bytestrings as headers
MTRNord Sep 4, 2023
44feccd
Ensure file formatting of tests/appservice/test_api.py
MTRNord Sep 4, 2023
2ac68cc
Move header generation to helper method
MTRNord Sep 6, 2023
3d9eb8e
Merge branch 'develop' into MTRNord/add-tracing-to-appservices
clokep Sep 6, 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
14 changes: 8 additions & 6 deletions tests/appservice/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ async def get_json(
headers: Mapping[Union[str, bytes], Sequence[Union[str, bytes]]],
clokep marked this conversation as resolved.
Show resolved Hide resolved
) -> List[JsonDict]:
# Ensure the access token is passed as a header.
if not headers or not headers.get("Authorization"):
clokep marked this conversation as resolved.
Show resolved Hide resolved
if not headers or not headers.get(b"Authorization"):
raise RuntimeError("Access token not provided")
# ... and not as a query param
if b"access_token" in args:
raise RuntimeError(
"Access token should not be passed as a query param."
)

self.assertEqual(headers.get("Authorization"), [f"Bearer {TOKEN}"])
self.assertEqual(headers.get(b"Authorization"), [f"Bearer {TOKEN}".encode()])
self.request_url = url
if url == URL_USER:
return SUCCESS_RESULT_USER
Expand Down Expand Up @@ -152,11 +152,12 @@ async def get_json(
# Ensure the access token is passed as a both a query param and in the headers.
if not args.get(b"access_token"):
raise RuntimeError("Access token should be provided in query params.")
if not headers or not headers.get("Authorization"):
if not headers or not headers.get(b"Authorization"):
raise RuntimeError("Access token should be provided in auth headers.")

self.assertEqual(args.get(b"access_token"), TOKEN)
self.assertEqual(headers.get("Authorization"), [f"Bearer {TOKEN}"])
self.assertEqual(headers.get(b"Authorization"),
[f"Bearer {TOKEN}".encode()])
self.request_url = url
if url == URL_USER:
return SUCCESS_RESULT_USER
Expand Down Expand Up @@ -208,10 +209,11 @@ async def post_json_get_json(
headers: Mapping[Union[str, bytes], Sequence[Union[str, bytes]]],
) -> JsonDict:
# Ensure the access token is passed as both a header and query arg.
if not headers.get("Authorization"):
if not headers.get(b"Authorization"):
raise RuntimeError("Access token not provided")

self.assertEqual(headers.get("Authorization"), [f"Bearer {TOKEN}"])
self.assertEqual(headers.get(b"Authorization"),
[f"Bearer {TOKEN}".encode()])
return RESPONSE

# We assign to a method, which mypy doesn't like.
Expand Down
Loading