-
Notifications
You must be signed in to change notification settings - Fork 877
fix(exporter/otlp/http): log error details from response on export failure #5155
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
Open
grvmishra788
wants to merge
14
commits into
open-telemetry:main
Choose a base branch
from
grvmishra788:worktree-issue-4526
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
5d728ca
fix: enhance response body parsing
grvmishra788 5514312
update changelog and address feedback
grvmishra788 07110f8
Merge branch 'main' into worktree-issue-4526
grvmishra788 5d0d4b0
refactor: simplify response body parsing
grvmishra788 f50862b
run lint
grvmishra788 b7520d2
Merge branch 'main' into worktree-issue-4526
grvmishra788 fa0188f
address feedback
grvmishra788 420b104
fix: improve response body parsing
grvmishra788 d613406
Merge branch 'main' into worktree-issue-4526
MikeGoldsmith ecc0909
Merge branch 'main' into worktree-issue-4526
grvmishra788 6f2228f
Merge branch 'main' into worktree-issue-4526
emdneto 98ef371
Merge branch 'open-telemetry:main' into worktree-issue-4526
grvmishra788 3e2938f
chore: update changelog entry
grvmishra788 c8dd73f
Merge branch 'main' into worktree-issue-4526
grvmishra788 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| `opentelemetry-exporter-otlp-proto-http`: Log server error details from response body on export failure |
57 changes: 57 additions & 0 deletions
57
...y-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_common/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
exporter/opentelemetry-exporter-otlp-proto-http/tests/test_response_body_parsing.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| # Copyright The OpenTelemetry Authors | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import json | ||
| import unittest | ||
|
|
||
| from google.rpc.status_pb2 import Status | ||
| from requests.models import Response | ||
|
|
||
| from opentelemetry.exporter.otlp.proto.http._common import _parse_response_body | ||
|
|
||
|
|
||
| def _make_response( | ||
| content: bytes, | ||
| content_type: str, | ||
| reason: str = "Bad Request", | ||
| status_code: int = 400, | ||
| ) -> Response: | ||
| resp = Response() | ||
| resp.status_code = status_code | ||
| resp.reason = reason | ||
| resp._content = content # pylint: disable=protected-access | ||
| resp.headers["Content-Type"] = content_type | ||
| return resp | ||
|
|
||
|
|
||
| class TestParseResponseBody(unittest.TestCase): | ||
| def test_protobuf_content_type_with_error_message(self): | ||
| status = Status(code=8, message="quota exceeded for project") | ||
| resp = _make_response( | ||
| content=status.SerializeToString(), | ||
| content_type="application/x-protobuf", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "quota exceeded for project", | ||
| ) | ||
|
|
||
| def test_protobuf_content_type_without_message_falls_back_to_reason(self): | ||
| status = Status(code=2) | ||
| resp = _make_response( | ||
| content=status.SerializeToString(), | ||
| content_type="application/x-protobuf", | ||
| reason="Bad Request", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "Bad Request", | ||
| ) | ||
|
|
||
| def test_protobuf_content_type_with_charset_parameter(self): | ||
| status = Status(code=8, message="quota exceeded") | ||
| resp = _make_response( | ||
| content=status.SerializeToString(), | ||
| content_type="application/x-protobuf; charset=utf-8", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "quota exceeded", | ||
| ) | ||
|
|
||
| def test_json_content_type_with_partial_success_error_message(self): | ||
| body = json.dumps( | ||
| {"partialSuccess": {"errorMessage": "rate limit exceeded"}} | ||
| ).encode() | ||
| resp = _make_response(content=body, content_type="application/json") | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "rate limit exceeded", | ||
| ) | ||
|
|
||
| def test_json_content_type_with_rpc_status_message(self): | ||
| body = json.dumps({"message": "permission denied"}).encode() | ||
| resp = _make_response(content=body, content_type="application/json") | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "permission denied", | ||
| ) | ||
|
|
||
| def test_json_content_type_with_charset_parameter(self): | ||
| body = json.dumps({"message": "not authorized"}).encode() | ||
| resp = _make_response( | ||
| content=body, content_type="application/json; charset=utf-8" | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "not authorized", | ||
| ) | ||
|
|
||
| def test_json_partial_success_null_falls_through(self): | ||
| body = json.dumps({"partialSuccess": None}).encode() | ||
| resp = _make_response(content=body, content_type="application/json") | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| '{"partialSuccess": null}', | ||
| ) | ||
|
|
||
| def test_json_partial_success_non_dict_falls_through(self): | ||
| body = json.dumps({"partialSuccess": "x"}).encode() | ||
| resp = _make_response(content=body, content_type="application/json") | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| '{"partialSuccess": "x"}', | ||
| ) | ||
|
|
||
| def test_unknown_content_type_returns_text(self): | ||
| resp = _make_response( | ||
| content=b"something went wrong", | ||
| content_type="text/plain", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "something went wrong", | ||
| ) | ||
|
|
||
| def test_empty_body_returns_reason(self): | ||
| resp = _make_response( | ||
| content=b"", | ||
| content_type="application/x-protobuf", | ||
| reason="Service Unavailable", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "Service Unavailable", | ||
| ) | ||
|
|
||
| def test_malformed_protobuf_body_falls_back_to_reason(self): | ||
| resp = _make_response( | ||
| content=b"\xff\xfe invalid protobuf", | ||
| content_type="application/x-protobuf", | ||
| reason="Bad Request", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "Bad Request", | ||
| ) | ||
|
|
||
| def test_malformed_json_body_falls_back_to_text(self): | ||
| resp = _make_response( | ||
| content=b"not valid json {{{", | ||
| content_type="application/json", | ||
| reason="Bad Request", | ||
| ) | ||
| self.assertEqual( | ||
| _parse_response_body(resp), | ||
| "not valid json {{{", | ||
| ) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why do we split on semi-colon, shouldn't we do it on comma ? https://requests.readthedocs.io/en/latest/user/quickstart/#response-headers -- mentions comma
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The semicolon split is intentional here. Per https://www.rfc-editor.org/rfc/rfc9110#section-8.3.1, the
Content-Typeheader uses semicolons to separate the media type from parameters like charset:I believe the comma behavior you linked is about how requests combines multiple values of the same header into a single string - that's a different concept. Since
Content-Typeonly has one value with optional ;-delimited parameters, splitting on ; is correct to extract just the media type portion.