opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-08-01 17:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the empty headers use case for OTTracePropagator (#378)

Browse Source
This commit is contained in:
Marcin Zaremba
2021-03-25 15:54:59 +01:00
committed by GitHub
parent f8e51c488d
commit 2f088f8de0
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.18b0...HEAD) ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.18b0...HEAD)
- Updated instrumentations to use `opentelemetry.trace.use_span` instead of `Tracer.use_span()` - Updated instrumentations to use `opentelemetry.trace.use_span` instead of `Tracer.use_span()`
([#364](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/364)) ([#364](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/364))
- `opentelemetry-propagator-ot-trace` Do not throw an exception when headers are not present
([#378](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/378))
### Changed ### Changed
- Rename `IdsGenerator` to `IdGenerator` - Rename `IdsGenerator` to `IdGenerator`

12
propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from re import compile as re_compile from re import compile as re_compile
from typing import Iterable, Optional from typing import Any, Iterable, Optional
from opentelemetry.baggage import get_all, set_baggage from opentelemetry.baggage import get_all, set_baggage
from opentelemetry.context import Context from opentelemetry.context import Context
@ -55,10 +55,12 @@ class OTTracePropagator(TextMapPropagator):
) -> Context: ) -> Context:
traceid = _extract_first_element( traceid = _extract_first_element(
getter.get(carrier, OT_TRACE_ID_HEADER) getter.get(carrier, OT_TRACE_ID_HEADER), INVALID_TRACE_ID
) )
spanid = _extract_first_element(getter.get(carrier, OT_SPAN_ID_HEADER)) spanid = _extract_first_element(
getter.get(carrier, OT_SPAN_ID_HEADER), INVALID_SPAN_ID
)
sampled = _extract_first_element( sampled = _extract_first_element(
getter.get(carrier, OT_SAMPLED_HEADER) getter.get(carrier, OT_SAMPLED_HEADER)
@ -163,8 +165,8 @@ class OTTracePropagator(TextMapPropagator):
def _extract_first_element( def _extract_first_element(
items: Iterable[TextMapPropagatorT], items: Iterable[TextMapPropagatorT], default: Any = None,
) -> Optional[TextMapPropagatorT]: ) -> Optional[TextMapPropagatorT]:
if items is None: if items is None:
return None return default
return next(iter(items), None) return next(iter(items), None)

9
propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py
View File

@ -366,3 +366,12 @@ class TestOTTracePropagator(TestCase):
self.assertEqual(baggage["abc"], "abc") self.assertEqual(baggage["abc"], "abc")
self.assertEqual(baggage["def"], "def") self.assertEqual(baggage["def"], "def")
def test_extract_empty(self):
"Test extraction when no headers are present"
span_context = get_current_span(
self.ot_trace_propagator.extract(carrier_getter, {})
).get_span_context()
self.assertEqual(span_context, INVALID_SPAN_CONTEXT)