opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-31 06:03:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove db.name attribute from Redis instrumentation (#1427)

Browse Source
This commit is contained in:
luke6Lh43
2022-11-10 20:21:44 +01:00
committed by GitHub
parent 7acc336cca
commit 5f85a5bd74
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#1424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1424)) ([#1424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1424))
- `opentelemetry-instrumentation-dbapi` Fix the check for the connection already being instrumented in instrument_connection(). - `opentelemetry-instrumentation-dbapi` Fix the check for the connection already being instrumented in instrument_connection().
([#1424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1424)) ([#1424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1424))
- Remove db.name attribute from Redis instrumentation
([#1427](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1427))
## Version 1.14.0/0.35b0 (2022-11-03) ## Version 1.14.0/0.35b0 (2022-11-03)

1
instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py
View File

@ -28,7 +28,6 @@ def _extract_conn_attributes(conn_kwargs):
SpanAttributes.DB_SYSTEM: DbSystemValues.REDIS.value, SpanAttributes.DB_SYSTEM: DbSystemValues.REDIS.value,
} }
db = conn_kwargs.get("db", 0) db = conn_kwargs.get("db", 0)
attributes[SpanAttributes.DB_NAME] = db
attributes[SpanAttributes.DB_REDIS_DATABASE_INDEX] = db attributes[SpanAttributes.DB_REDIS_DATABASE_INDEX] = db
try: try:
attributes[SpanAttributes.NET_PEER_NAME] = conn_kwargs.get( attributes[SpanAttributes.NET_PEER_NAME] = conn_kwargs.get(

8
tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py
View File

@ -37,7 +37,9 @@ class TestRedisInstrument(TestBase):
def _check_span(self, span, name): def _check_span(self, span, name):
self.assertEqual(span.name, name) self.assertEqual(span.name, name)
self.assertIs(span.status.status_code, trace.StatusCode.UNSET) self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
self.assertEqual(span.attributes.get(SpanAttributes.DB_NAME), 0) self.assertEqual(
span.attributes.get(SpanAttributes.DB_REDIS_DATABASE_INDEX), 0
)
self.assertEqual( self.assertEqual(
span.attributes[SpanAttributes.NET_PEER_NAME], "localhost" span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
) )
@ -209,7 +211,9 @@ class TestAsyncRedisInstrument(TestBase):
def _check_span(self, span, name): def _check_span(self, span, name):
self.assertEqual(span.name, name) self.assertEqual(span.name, name)
self.assertIs(span.status.status_code, trace.StatusCode.UNSET) self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
self.assertEqual(span.attributes.get(SpanAttributes.DB_NAME), 0) self.assertEqual(
span.attributes.get(SpanAttributes.DB_REDIS_DATABASE_INDEX), 0
)
self.assertEqual( self.assertEqual(
span.attributes[SpanAttributes.NET_PEER_NAME], "localhost" span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
) )