Merge branch 'master' into req

Author: lzchen

.github/pull_request_template.md

@@ -19,6 +19,11 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 - [ ] Test A
 
+# Does This PR Require a Core Repo Change?
+
+- [ ] Yes. - Link to PR: 
+- [ ] No.
+
 # Checklist:
 
 See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 47483865854c7adae7455f8441dab7f814f4ce2a
+  CORE_REPO_SHA: 3b813eb9921e709538dd1b07fa7a5f93600fbec1
 
 jobs:
   build:

.gitignore

@@ -16,6 +16,7 @@ var
 sdist
 develop-eggs
 .installed.cfg
+pyvenv.cfg
 lib
 lib64
 __pycache__

CONTRIBUTING.md

@@ -46,7 +46,7 @@ You can run:
 - `tox -e lint` to run lint checks on all code
 
 See
-[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python/blob/master/tox.ini)
+[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/tox.ini)
 for more detail on available tox commands.
 
 ## Pull Requests

_template/README.rst

@@ -19,5 +19,5 @@ Installation
 References
 ----------
 
-* `OpenTelemetry <REPLACE ME>/ Tracing <https://opentelemetry-python.readthedocs.io/en/latest/instrumentation/<REPLACE ME>/<REPLACE ME>.html>`_
+* `OpenTelemetry <REPLACE ME>/ Tracing <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/<REPLACE ME>/<REPLACE ME>.html>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_

exporter/opentelemetry-exporter-datadog/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = [email protected]
-url = https://github.com/open-telemetry/opentelemetry-python/exporter/opentelemetry-exporter-datadog
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/exporter/opentelemetry-exporter-datadog
 platforms = any
 license = Apache-2.0
 classifiers =

instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = [email protected]
-url = https://github.com/open-telemetry/opentelemetry-python/instrumentation/opentelemetry-instrumentation-aiohttp-client
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-aiohttp-client
 platforms = any
 license = Apache-2.0
 classifiers =

instrumentation/opentelemetry-instrumentation-aiopg/README.rst

@@ -17,5 +17,5 @@ Installation
 References
 ----------
 
-* `OpenTelemetry aiopg Instrumentation <https://opentelemetry-python.readthedocs.io/en/latest/instrumentation/aiopg/aiopg.html>`_
+* `OpenTelemetry aiopg Instrumentation <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/aiopg/aiopg.html>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = [email protected]
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-aiopg
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-aiopg
 platforms = any
 license = Apache-2.0
 classifiers =

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

@@ -101,9 +101,16 @@ async def traced_execution(
         *args: typing.Tuple[typing.Any, typing.Any],
         **kwargs: typing.Dict[typing.Any, typing.Any]
     ):
+        name = ""
+        if len(args) > 0 and args[0]:
+            name = args[0]
+        elif self._db_api_integration.database:
+            name = self._db_api_integration.database
+        else:
+            name = self._db_api_integration.name
 
         with self._db_api_integration.get_tracer().start_as_current_span(
-            self._db_api_integration.name, kind=SpanKind.CLIENT
+            name, kind=SpanKind.CLIENT
         ) as span:
             self._populate_span(span, *args)
             try: