Merge branch 'main' into add-type-hints-to-dbapi

Author: Kludex

_template/pyproject.toml

@@ -41,6 +41,7 @@ REPLACE_ME = "opentelemetry.instrumentation.<REPLACE>"
 # url of the instrumentation e.g
 # Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-sqlalchemy"
 Homepage = "<REPLACE ME>"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 # REPLACE ME: the path to the version file e.g

exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml

@@ -35,6 +35,7 @@ dependencies = [
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-prometheus-remote-write"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/exporter/prometheus_remote_write/version.py"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-richconsole"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/exporter/richconsole/version.py"

instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml

@@ -40,6 +40,7 @@ openai = "opentelemetry.instrumentation.openai_v2:OpenAIInstrumentor"
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-openai-v2"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/openai_v2/version.py"

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -40,6 +40,7 @@ aio-pika = "opentelemetry.instrumentation.aio_pika:AioPikaInstrumentor"
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aio-pika"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/aio_pika/version.py"

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -42,6 +42,7 @@ aiohttp-client = "opentelemetry.instrumentation.aiohttp_client:AioHttpClientInst
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/aiohttp_client/version.py"

instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

@@ -42,6 +42,7 @@ aiohttp-server = "opentelemetry.instrumentation.aiohttp_server:AioHttpServerInst
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-server"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/aiohttp_server/version.py"

instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml

@@ -38,6 +38,7 @@ aiokafka = "opentelemetry.instrumentation.aiokafka:AIOKafkaInstrumentor"
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiokafka"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/aiokafka/version.py"

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -41,6 +41,7 @@ aiopg = "opentelemetry.instrumentation.aiopg:AiopgInstrumentor"
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiopg"
+Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
 path = "src/opentelemetry/instrumentation/aiopg/version.py"

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

@@ -25,22 +25,39 @@
 
     import aiopg
     from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
-
+    # Call instrument() to wrap all database connections
     AiopgInstrumentor().instrument()
 
     cnx = await aiopg.connect(database='Database')
     cursor = await cnx.cursor()
+    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
     await cursor.execute("INSERT INTO test (testField) VALUES (123)")
     cursor.close()
     cnx.close()
 
     pool = await aiopg.create_pool(database='Database')
+
     cnx = await pool.acquire()
     cursor = await cnx.cursor()
+    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
     await cursor.execute("INSERT INTO test (testField) VALUES (123)")
     cursor.close()
     cnx.close()
 
+.. code-block:: python
+
+    import aiopg
+    from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
+
+    # Alternatively, use instrument_connection for an individual connection
+    cnx = await aiopg.connect(database='Database')
+    instrumented_cnx = AiopgInstrumentor().instrument_connection(cnx)
+    cursor = await instrumented_cnx.cursor()
+    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
+    await cursor.execute("INSERT INTO test (testField) VALUES (123)")
+    cursor.close()
+    instrumented_cnx.close()
+
 API
 ---
 """