Skip to content

improve baggage performance #4466

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

Merged
merged 6 commits into from
Mar 17, 2025
Merged

improve baggage performance #4466

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a82c558
improve baggage performance
gruebel Mar 8, 2025
28c5259
Merge remote-tracking branch 'origin/main' into improve-baggage
gruebel Mar 11, 2025
c761d72
add changelog entry
gruebel Mar 11, 2025
853b9fd
Merge branch 'main' into improve-baggage
emdneto Mar 12, 2025
654946e
Merge branch 'main' into improve-baggage
gruebel Mar 12, 2025
1567f08
Merge branch 'main' into improve-baggage
lzchen Mar 13, 2025
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
20 changes: 12 additions & 8 deletions opentelemetry-api/src/opentelemetry/baggage/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from logging import getLogger
from re import compile
from types import MappingProxyType
from typing import Mapping, Optional
from typing import Dict, Mapping, Optional

from opentelemetry.context import create_key, get_value, set_value
from opentelemetry.context.context import Context
Expand Down Expand Up @@ -44,10 +44,7 @@ def get_all(
Returns:
The name/value pairs in the Baggage
"""
baggage = get_value(_BAGGAGE_KEY, context=context)
if isinstance(baggage, dict):
return MappingProxyType(baggage)
return MappingProxyType({})
return MappingProxyType(_get_baggage_value(context=context))


def get_baggage(
Expand All @@ -64,7 +61,7 @@ def get_baggage(
The value associated with the given name, or null if the given name is
not present.
"""
return get_all(context=context).get(name)
return _get_baggage_value(context=context).get(name)


def set_baggage(
Expand All @@ -80,7 +77,7 @@ def set_baggage(
Returns:
A Context with the value updated
"""
baggage = dict(get_all(context=context))
baggage = _get_baggage_value(context=context).copy()
baggage[name] = value
return set_value(_BAGGAGE_KEY, baggage, context=context)

Expand All @@ -95,7 +92,7 @@ def remove_baggage(name: str, context: Optional[Context] = None) -> Context:
Returns:
A Context with the name/value removed
"""
baggage = dict(get_all(context=context))
baggage = _get_baggage_value(context=context).copy()
baggage.pop(name, None)

return set_value(_BAGGAGE_KEY, baggage, context=context)
Expand All @@ -113,6 +110,13 @@ def clear(context: Optional[Context] = None) -> Context:
return set_value(_BAGGAGE_KEY, {}, context=context)


def _get_baggage_value(context: Optional[Context] = None) -> Dict[str, object]:
baggage = get_value(_BAGGAGE_KEY, context=context)
if isinstance(baggage, dict):
return baggage
return {}


def _is_valid_key(name: str) -> bool:
return _KEY_PATTERN.fullmatch(str(name)) is not None

Expand Down
Loading