From 2a7dcea9af08372ef3e146f2938364d2ccced676 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Mon, 3 Aug 2020 17:48:44 -0700
Subject: [PATCH] Rename db framework packages from "ext" to "instrumentation"
 (#966)

---
 .../opentelemetry-instrumentation-aiopg/setup.cfg            | 2 +-
 .../opentelemetry/instrumentation/aiopg/aiopg_integration.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
index bd9a06c52..58c9b3849 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 0.12.dev0
-    opentelemetry-ext-dbapi == 0.12.dev0
+    opentelemetry-instrumentation-dbapi == 0.12.dev0
     opentelemetry-instrumentation == 0.12.dev0
     aiopg >= 0.13.0
     wrapt >= 1.0.0, < 2.0.0
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
index def4a72c3..b6992120f 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
@@ -3,7 +3,10 @@ import typing
 import wrapt
 from aiopg.utils import _ContextManager, _PoolAcquireContextManager
 
-from opentelemetry.ext.dbapi import DatabaseApiIntegration, TracedCursor
+from opentelemetry.instrumentation.dbapi import (
+    DatabaseApiIntegration,
+    TracedCursor,
+)
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCanonicalCode