Skip to content

Commit abd01fb

Browse files
authored
Changed the format of traceparent id (#941)
1 parent 640b117 commit abd01fb

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3636

3737
### Fixed
3838

39+
- `opentelemetry-instrumentation-dbapi` Changed the format of traceparent id.
40+
([#941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/941))
3941
- `opentelemetry-instrumentation-logging` retrieves service name defensively.
4042
([#890](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/890))
4143
- `opentelemetry-instrumentation-wsgi` WSGI: Conditionally create SERVER spans

instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@
4545

4646
from opentelemetry import trace as trace_api
4747
from opentelemetry.instrumentation.dbapi.version import __version__
48-
from opentelemetry.instrumentation.utils import _generate_sql_comment, unwrap
48+
from opentelemetry.instrumentation.utils import (
49+
_generate_opentelemetry_traceparent,
50+
_generate_sql_comment,
51+
unwrap,
52+
)
4953
from opentelemetry.semconv.trace import SpanAttributes
5054
from opentelemetry.trace import Span, SpanKind, TracerProvider, get_tracer
5155

@@ -369,14 +373,7 @@ def _generate_comment(span: Span) -> str:
369373
span_context = span.get_span_context()
370374
meta = {}
371375
if span_context.is_valid:
372-
meta.update(
373-
{
374-
"trace_id": span_context.trace_id,
375-
"span_id": span_context.span_id,
376-
"trace_flags": span_context.trace_flags,
377-
"trace_state": span_context.trace_state.to_header(),
378-
}
379-
)
376+
meta.update(_generate_opentelemetry_traceparent(span))
380377
# TODO(schekuri): revisit to enrich with info such as route, db_driver etc...
381378
return _generate_sql_comment(**meta)
382379

0 commit comments

Comments
 (0)