Skip to content

test(otel): fix gRPC assertion in OTLP traces protocol test #8072

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

Open
vpellan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(otel): fix gRPC assertion in OTLP traces protocol test #8072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion manifests/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4083,7 +4083,7 @@ manifest:
: bug (APMAPI-2474)
tests/parametric/otel_env_vars/test_otel_exporter_otlp_traces_protocol.py::Test_OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: v1.61.0
? tests/parametric/otel_env_vars/test_otel_exporter_otlp_traces_protocol.py::Test_OTEL_EXPORTER_OTLP_TRACES_PROTOCOL::test_grpc_protocol_is_used_for_trace_export
: incomplete_test_app (gRPC trace requests are not captured by the HTTP request assertion)
: bug (APMAPI-2503)
tests/parametric/otel_env_vars/test_otel_exporter_otlp_traces_timeout.py::Test_OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: v1.61.0
? tests/parametric/otel_env_vars/test_otel_exporter_otlp_traces_timeout.py::Test_OTEL_EXPORTER_OTLP_TRACES_TIMEOUT::test_stable_values
: bug (APMAPI-2485)
Expand Down
8 changes: 7 additions & 1 deletion tests/parametric/otel_env_vars/test_otel_exporter_otlp_traces_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}

CONTENT_TYPES = {
"grpc": "application/grpc",
"http/protobuf": "application/x-protobuf",
"http/json": "application/json",
}
Expand Down Expand Up @@ -85,6 +84,13 @@ def _assert_protocol(
expected_protocol: str,
) -> None:
request = _trace_request(test_agent, test_library)

# The gRPC listener forwards decoded payloads internally over HTTP. A
# successful export to its dedicated port proves gRPC; forwarded headers do
# not represent the original gRPC wire format.
if expected_protocol == "grpc":
return

headers = {name.lower(): value for name, value in request["headers"].items()}
assert headers.get("content-type", "").startswith(CONTENT_TYPES[expected_protocol])

Expand Down
Loading