Skip to content
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

Jump to bottom

redis: fix default port KeyError, wrong attr name #265

Merged
merged 5 commits into from
Apr 14, 2021
Merged

redis: fix default port KeyError, wrong attr name #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcf7a4b
redis: fix default port KeyError, wrong attr name
shlee322 Dec 18, 2020
217572c
Update CHANGELOG.md
shlee322 Dec 18, 2020
2ca79a2
Update CHANGELOG.md
shlee322 Dec 18, 2020
129651f
fix docker tests and another ip/port issue in asyncpg
Apr 14, 2021
356941a
Merge branch 'main' into patch-1
Apr 14, 2021
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/424))
- Update gRPC instrumentation to better wrap server context
([#420](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/420))
- `opentelemetry-instrumentation-redis` Fix default port KeyError and Wrong Attribute name (net.peer.ip -> net.peer.port)
([#265](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/265))
- `opentelemetry-instrumentation-asyncpg` Fix default port KeyError and Wrong Attribute name (net.peer.ip -> net.peer.port)
([#265](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/265))

### Added
- `opentelemetry-instrumentation-urllib3` Add urllib3 instrumentation
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def _hydrate_span_from_args(connection, query, parameters) -> dict:
addr = getattr(connection, "_addr", None)
if isinstance(addr, tuple):
span_attributes["net.peer.name"] = addr[0]
span_attributes["net.peer.ip"] = addr[1]
span_attributes["net.peer.port"] = addr[1]
span_attributes["net.transport"] = "IP.TCP"
elif isinstance(addr, str):
span_attributes["net.peer.name"] = addr
Expand Down
6 changes: 3 additions & 3 deletions ...ation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ def _extract_conn_attributes(conn_kwargs):
attributes["db.name"] = db
attributes["db.redis.database_index"] = db
try:
attributes["net.peer.name"] = conn_kwargs["host"]
attributes["net.peer.ip"] = conn_kwargs["port"]
attributes["net.peer.name"] = conn_kwargs.get("host", "localhost")
attributes["net.peer.port"] = conn_kwargs.get("port", 6379)
attributes["net.transport"] = "IP.TCP"
except KeyError:
attributes["net.peer.name"] = conn_kwargs["path"]
attributes["net.peer.name"] = conn_kwargs.get("path", "")
attributes["net.transport"] = "Unix"

return attributes
Expand Down
4 changes: 2 additions & 2 deletions tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def check_span(self, span):
self.assertEqual(span.attributes["db.name"], POSTGRES_DB_NAME)
self.assertEqual(span.attributes["db.user"], POSTGRES_USER)
self.assertEqual(span.attributes["net.peer.name"], POSTGRES_HOST)
self.assertEqual(span.attributes["net.peer.ip"], POSTGRES_PORT)
self.assertEqual(span.attributes["net.peer.port"], POSTGRES_PORT)

def test_instrumented_execute_method_without_arguments(self, *_, **__):
async_call(self._connection.execute("SELECT 42;"))
Expand Down Expand Up @@ -148,7 +148,7 @@ def check_span(self, span):
self.assertEqual(span.attributes["db.name"], POSTGRES_DB_NAME)
self.assertEqual(span.attributes["db.user"], POSTGRES_USER)
self.assertEqual(span.attributes["net.peer.name"], POSTGRES_HOST)
self.assertEqual(span.attributes["net.peer.ip"], POSTGRES_PORT)
self.assertEqual(span.attributes["net.peer.port"], POSTGRES_PORT)

def test_instrumented_execute_method_with_arguments(self, *_, **__):
async_call(self._connection.execute("SELECT $1;", "1"))
Expand Down
4 changes: 2 additions & 2 deletions tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _check_span(self, span, name):
self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
self.assertEqual(span.attributes.get("db.name"), 0)
self.assertEqual(span.attributes["net.peer.name"], "localhost")
self.assertEqual(span.attributes["net.peer.ip"], 6379)
self.assertEqual(span.attributes["net.peer.port"], 6379)

def test_long_command(self):
self.redis_client.mget(*range(1000))
Expand Down Expand Up @@ -125,7 +125,7 @@ def _check_span(self, span, name):
self.assertEqual(span.name, name)
self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
self.assertEqual(span.attributes["net.peer.name"], "localhost")
self.assertEqual(span.attributes["net.peer.ip"], 6379)
self.assertEqual(span.attributes["net.peer.port"], 6379)
self.assertEqual(span.attributes["db.redis.database_index"], 10)

def test_get(self):
Expand Down