This is an automated email from the ASF dual-hosted git repository.
tompytel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 0d9f3a6 Fix text "PostgreSLQ" -> "PostgreSQL" (#234)
0d9f3a6 is described below
commit 0d9f3a6ff61ffe413bf818c21fe1a88e79c82625
Author: Tomasz Pytel <[email protected]>
AuthorDate: Tue Sep 6 09:01:53 2022 -0300
Fix text "PostgreSLQ" -> "PostgreSQL" (#234)
* improved ignore path regex
* update test
* fix sw_psycopg2 register_type()
* fix complexity level
* fix psycopg2 register_type() second arg default
* fix rabbitmq BlockingChannel consume cb span link
* add BlockingChannel.consume() instrumentation
* fix rabbit basic_get(), Makefile missing packages
* fix again for BlockingChannel.basic_get()
* fix tornado socket == None
* aioredis, aiormq, amqp, asyncpg, aio_pika, kombu
* sw_confluent_kafka
* make doc-gen
* PostgreSLQ -> PostgreSQL
---
skywalking/plugins/sw_asyncpg.py | 2 +-
skywalking/plugins/sw_psycopg.py | 12 ++++++------
skywalking/plugins/sw_psycopg2.py | 6 +++---
tests/plugin/data/sw_psycopg/expected.data.yml | 2 +-
tests/plugin/data/sw_psycopg2/expected.data.yml | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/skywalking/plugins/sw_asyncpg.py b/skywalking/plugins/sw_asyncpg.py
index 819f3d5..673e441 100644
--- a/skywalking/plugins/sw_asyncpg.py
+++ b/skywalking/plugins/sw_asyncpg.py
@@ -40,7 +40,7 @@ def install():
async def __bind(proto, query, params, future, is_many=False):
peer = getattr(proto, '_addr', '<unavailable>') # just in case
- with get_context().new_exit_span(op='PostgreSLQ/AsyncPG/bind',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/AsyncPG/bind',
peer=peer,
component=Component.AsyncPG) as span:
span.layer = Layer.Database
diff --git a/skywalking/plugins/sw_psycopg.py b/skywalking/plugins/sw_psycopg.py
index 61a770b..cb18acc 100644
--- a/skywalking/plugins/sw_psycopg.py
+++ b/skywalking/plugins/sw_psycopg.py
@@ -48,7 +48,7 @@ def install_sync():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/execute',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/execute',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -71,7 +71,7 @@ def install_sync():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with
get_context().new_exit_span(op='PostgreSLQ/Psycopg/executemany', peer=peer,
+ with
get_context().new_exit_span(op='PostgreSQL/Psycopg/executemany', peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -104,7 +104,7 @@ def install_sync():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/stream',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/stream',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -163,7 +163,7 @@ def install_async():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/execute',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/execute',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -186,7 +186,7 @@ def install_async():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with
get_context().new_exit_span(op='PostgreSLQ/Psycopg/executemany', peer=peer,
+ with
get_context().new_exit_span(op='PostgreSQL/Psycopg/executemany', peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -219,7 +219,7 @@ def install_async():
port = self.connection.info.port
peer = f"{dsn['host']}:{str(port)}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/stream',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/stream',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
diff --git a/skywalking/plugins/sw_psycopg2.py
b/skywalking/plugins/sw_psycopg2.py
index b0f9aaf..dec672e 100644
--- a/skywalking/plugins/sw_psycopg2.py
+++ b/skywalking/plugins/sw_psycopg2.py
@@ -46,7 +46,7 @@ def install():
dsn = self.connection.get_dsn_parameters()
peer = f"{dsn['host']}:{dsn['port']}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/execute',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/execute',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -68,7 +68,7 @@ def install():
dsn = self.connection.get_dsn_parameters()
peer = f"{dsn['host']}:{dsn['port']}"
- with
get_context().new_exit_span(op='PostgreSLQ/Psycopg/executemany', peer=peer,
+ with
get_context().new_exit_span(op='PostgreSQL/Psycopg/executemany', peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
@@ -100,7 +100,7 @@ def install():
dsn = self.connection.get_dsn_parameters()
peer = f"{dsn['host']}:{dsn['port']}"
- with get_context().new_exit_span(op='PostgreSLQ/Psycopg/callproc',
peer=peer,
+ with get_context().new_exit_span(op='PostgreSQL/Psycopg/callproc',
peer=peer,
component=Component.Psycopg) as
span:
span.layer = Layer.Database
args = f"({'' if not parameters else ','.join(parameters)})"
diff --git a/tests/plugin/data/sw_psycopg/expected.data.yml
b/tests/plugin/data/sw_psycopg/expected.data.yml
index 4d53883..6b3025a 100644
--- a/tests/plugin/data/sw_psycopg/expected.data.yml
+++ b/tests/plugin/data/sw_psycopg/expected.data.yml
@@ -21,7 +21,7 @@ segmentItems:
segments:
- segmentId: not null
spans:
- - operationName: PostgreSLQ/Psycopg/execute
+ - operationName: PostgreSQL/Psycopg/execute
parentSpanId: 0
spanId: 1
spanLayer: Database
diff --git a/tests/plugin/data/sw_psycopg2/expected.data.yml
b/tests/plugin/data/sw_psycopg2/expected.data.yml
index fd802ff..1b78d26 100644
--- a/tests/plugin/data/sw_psycopg2/expected.data.yml
+++ b/tests/plugin/data/sw_psycopg2/expected.data.yml
@@ -21,7 +21,7 @@ segmentItems:
segments:
- segmentId: not null
spans:
- - operationName: PostgreSLQ/Psycopg/execute
+ - operationName: PostgreSQL/Psycopg/execute
parentSpanId: 0
spanId: 1
spanLayer: Database
