Merge branch 'main' into instrumentation-hooks

open-telemetry · Apr 5, 2021 · 2a22f73 · 2a22f73
2 parents 2489671 + 35774f1
commit 2a22f73
Show file tree

Hide file tree

Showing 77 changed files with 166 additions and 165 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: f556d1418c8015b71ec2e16b4ba2b76efdd3804f
+  CORE_REPO_SHA: 1a12fa0d681e37c1fda9cb8d46212ff3bbf6b76a
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.19b0...HEAD)
 
 ### Changed
+- Restrict DataDog exporter's `ddtrace` dependency to known working versions.
+  ([#400](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/400))
 - GRPC instrumentation now correctly injects trace context into outgoing requests.
   ([#392](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/39))
 - Publish `opentelemetry-propagator-ot-trace` package as a part of the release process

diff --git a/README.md b/README.md
@@ -82,7 +82,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 - [Diego Hurtado](https://github.com/ocelotl)
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
 - [Owais Lone](https://github.com/owais), Splunk
-- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 

diff --git a/_template/setup.cfg b/_template/setup.cfg
@@ -45,7 +45,7 @@ package_dir=
 packages=find_namespace:
 
 install_requires =
-    opentelemetry-api == 1.0.0
+    opentelemetry-api == 1.0.1.dev0
 
 [options.extras_require]
 test =

diff --git a/_template/version.py b/_template/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg
@@ -38,9 +38,9 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    ddtrace>=0.34.0
-    opentelemetry-api == 1.0.0
-    opentelemetry-sdk == 1.0.0
+    ddtrace>=0.34.0,<0.47.0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-sdk == 1.0.1.dev0
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg
@@ -38,8 +38,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     aiohttp ~= 3.0
     wrapt >= 1.0.0, < 2.0.0
 

diff --git a/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py b/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
@@ -38,15 +38,15 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation-dbapi == 0.19b0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation-dbapi == 0.20.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     aiopg >= 0.13.0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py b/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
@@ -38,8 +38,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     asgiref ~= 3.0
 
 [options.extras_require]

diff --git a/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
@@ -38,13 +38,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     asyncpg >= 0.12.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py b/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg
@@ -39,15 +39,15 @@ package_dir=
 packages=find_namespace:
 install_requires =
     boto ~= 2.0
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
-    opentelemetry-instrumentation-botocore == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
+    opentelemetry-instrumentation-botocore == 0.20.dev0
 
 [options.extras_require]
 test =
     boto~=2.0
     moto~=1.0
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py b/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     botocore ~= 1.0
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
 
 [options.extras_require]
 test =
     moto ~= 1.0
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py b/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg
@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     celery >= 4.0, < 6.0
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
 
 [options.extras_require]
 test =
     pytest
     celery >= 4.0, < 6.0
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py b/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
@@ -38,13 +38,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src
diff --git a/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg
@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     django >= 1.10
-    opentelemetry-util-http == 0.19b0
-    opentelemetry-instrumentation-wsgi == 0.19b0
-    opentelemetry-instrumentation == 0.19b0
-    opentelemetry-api == 1.0.0
+    opentelemetry-util-http == 0.20.dev0
+    opentelemetry-instrumentation-wsgi == 0.20.dev0
+    opentelemetry-instrumentation == 0.20.dev0
+    opentelemetry-api == 1.0.1.dev0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src

diff --git a/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py b/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg
@@ -38,14 +38,14 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     wrapt >= 1.0.0, < 2.0.0
     elasticsearch >= 2.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
     elasticsearch-dsl >= 2.0
 
 [options.packages.find]

diff --git a/...-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py b/...-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg
@@ -40,15 +40,15 @@ package_dir=
 packages=find_namespace:
 install_requires =
     falcon ~= 2.0
-    opentelemetry-instrumentation-wsgi == 0.19b0
-    opentelemetry-util-http == 0.19b0
-    opentelemetry-instrumentation == 0.19b0
-    opentelemetry-api == 1.0.0
+    opentelemetry-instrumentation-wsgi == 0.20.dev0
+    opentelemetry-util-http == 0.20.dev0
+    opentelemetry-instrumentation == 0.20.dev0
+    opentelemetry-api == 1.0.1.dev0
 
 [options.extras_require]
 test =
     falcon ~= 2.0
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
     parameterized == 0.7.4
 
 [options.packages.find]

diff --git a/.../opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py b/.../opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg
@@ -38,18 +38,18 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
-    opentelemetry-instrumentation-asgi == 0.19b0
-    opentelemetry-util-http == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
+    opentelemetry-instrumentation-asgi == 0.20.dev0
+    opentelemetry-util-http == 0.20.dev0
 
 [options.entry_points]
 opentelemetry_instrumentor =
     fastapi = opentelemetry.instrumentation.fastapi:FastAPIInstrumentor
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
     fastapi ~= 0.58.1
     requests ~= 2.23.0 # needed for testclient
 

diff --git a/...pentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py b/...pentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg
@@ -39,15 +39,15 @@ package_dir=
 packages=find_namespace:
 install_requires =
     flask ~= 1.0
-    opentelemetry-util-http == 0.19b0
-    opentelemetry-instrumentation == 0.19b0
-    opentelemetry-instrumentation-wsgi == 0.19b0
-    opentelemetry-api == 1.0.0
+    opentelemetry-util-http == 0.20.dev0
+    opentelemetry-instrumentation == 0.20.dev0
+    opentelemetry-instrumentation-wsgi == 0.20.dev0
+    opentelemetry-api == 1.0.1.dev0
 
 [options.extras_require]
 test =
     flask~=1.0
-    opentelemetry-test == 0.19b0
+    opentelemetry-test == 0.20.dev0
 
 [options.packages.find]
 where = src
diff --git a/...on/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py b/...on/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19b0"
+__version__ = "0.20.dev0"
diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg
@@ -38,16 +38,16 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.0.0
-    opentelemetry-sdk == 1.0.0
-    opentelemetry-instrumentation == 0.19b0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-sdk == 1.0.1.dev0
+    opentelemetry-instrumentation == 0.20.dev0
     grpcio ~= 1.27
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.19b0
-    opentelemetry-sdk == 1.0.0
+    opentelemetry-test == 0.20.dev0
+    opentelemetry-sdk == 1.0.1.dev0
     protobuf >= 3.13.0
 
 [options.packages.find]