Skip to content

[Azure Tables] Check if request body exists before trying to convert it to JSON #2119

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

Closed
wants to merge 9 commits into from
Closed

[Azure Tables] Check if request body exists before trying to convert it to JSON #2119

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a1225f
Check if body exists before trying to convert it to JSON
cpiment Sep 5, 2024
a6c185f
Update in azure-data-tables uses PATCH instead of PUT
cpiment Sep 6, 2024
bd06d25
Tests and requirements file for Azure Storage
cpiment Sep 6, 2024
c80f628
Fixed typo in Azure Functions tests
cpiment Sep 6, 2024
de6d46e
Merge branch 'main' into main
cpiment Sep 11, 2024
bd276ca
Merge branch 'elastic:main' into main
cpiment Oct 22, 2024
8fab3ca
Merge branch 'main' into main
xrmx Dec 24, 2024
7cd6275
Apply suggestions from code review
xrmx Dec 24, 2024
a777741
Update tests/instrumentation/azure_tests.py
xrmx Dec 24, 2024
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
9 changes: 6 additions & 3 deletions elasticapm/instrumentation/packages/azure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,12 @@ def handle_azuretable(request, hostname, path, query_params, service, service_ty
account_name = hostname.split(".")[0]
method = request.method
body = request.body
try:
body = json.loads(body)
except json.decoder.JSONDecodeError: # str not bytes
if body:
try:
body = json.loads(body)
except json.decoder.JSONDecodeError: # str not bytes
body = {}
else:
body = {}
# /tablename(PartitionKey='<partition-key>',RowKey='<row-key>')
resource_name = path.split("/", 1)[1] if "/" in path else path
Expand Down
Loading