From abd01fbe99255f9673559d182f95f26408853c53 Mon Sep 17 00:00:00 2001 From: Thiyagu55 <64461612+Thiyagu55@users.noreply.github.com> Date: Wed, 16 Mar 2022 05:40:05 +0530 Subject: [PATCH] Changed the format of traceparent id (#941) --- CHANGELOG.md | 2 ++ .../instrumentation/dbapi/__init__.py | 15 ++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8874dca278..933fbccf78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- `opentelemetry-instrumentation-dbapi` Changed the format of traceparent id. + ([#941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/941)) - `opentelemetry-instrumentation-logging` retrieves service name defensively. ([#890](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/890)) - `opentelemetry-instrumentation-wsgi` WSGI: Conditionally create SERVER spans diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py index 1645a8a48e..8f85349edf 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py @@ -45,7 +45,11 @@ from opentelemetry import trace as trace_api from opentelemetry.instrumentation.dbapi.version import __version__ -from opentelemetry.instrumentation.utils import _generate_sql_comment, unwrap +from opentelemetry.instrumentation.utils import ( + _generate_opentelemetry_traceparent, + _generate_sql_comment, + unwrap, +) from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import Span, SpanKind, TracerProvider, get_tracer @@ -369,14 +373,7 @@ def _generate_comment(span: Span) -> str: span_context = span.get_span_context() meta = {} if span_context.is_valid: - meta.update( - { - "trace_id": span_context.trace_id, - "span_id": span_context.span_id, - "trace_flags": span_context.trace_flags, - "trace_state": span_context.trace_state.to_header(), - } - ) + meta.update(_generate_opentelemetry_traceparent(span)) # TODO(schekuri): revisit to enrich with info such as route, db_driver etc... return _generate_sql_comment(**meta)