Skip to content

Commit 73230b6

Browse files
authored
fix(baggage): oversized header warn only with a header (#2212)
This commit makes sure that warnings about the baggage header length are only emitted when the header is actually present, since it does not make sense to warn about a missing header's length.
1 parent 39fe4db commit 73230b6

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
- Upgrade GRPC/protobuf related dependency and regenerate otlp protobufs
1010
([#2201](https://github.com/open-telemetry/opentelemetry-python/pull/2201))
11+
- Propagation: only warn about oversized baggage headers when headers exist
12+
([#2212](https://github.com/open-telemetry/opentelemetry-python/pull/2212))
1113

1214
## [1.6.0-0.25b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.0-0.25b0) - 2021-10-13
1315

opentelemetry-api/src/opentelemetry/baggage/propagation/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ def extract(
5353
getter.get(carrier, self._BAGGAGE_HEADER_NAME)
5454
)
5555

56-
if not header or len(header) > self._MAX_HEADER_LENGTH:
56+
if not header:
57+
return context
58+
59+
if len(header) > self._MAX_HEADER_LENGTH:
5760
_logger.warning(
5861
"Baggage header `%s` exceeded the maximum number of bytes per baggage-string",
5962
header,

0 commit comments

Comments
 (0)