From 3b650b0552d24365363a5e39007b640031042786 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 24 Jun 2021 13:11:01 -0700 Subject: [PATCH 1/4] updating dependency for api/sdk to major version --- _template/setup.cfg | 2 +- exporter/opentelemetry-exporter-datadog/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-aiohttp-client/setup.cfg | 2 +- .../opentelemetry-instrumentation-aiopg/setup.cfg | 2 +- .../opentelemetry-instrumentation-asgi/setup.cfg | 2 +- .../opentelemetry-instrumentation-asyncpg/setup.cfg | 2 +- .../opentelemetry-instrumentation-boto/setup.cfg | 2 +- .../opentelemetry-instrumentation-botocore/setup.cfg | 2 +- .../opentelemetry-instrumentation-celery/setup.cfg | 2 +- .../opentelemetry-instrumentation-dbapi/setup.cfg | 2 +- .../opentelemetry-instrumentation-django/setup.cfg | 2 +- .../opentelemetry-instrumentation-elasticsearch/setup.cfg | 2 +- .../opentelemetry-instrumentation-falcon/setup.cfg | 2 +- .../opentelemetry-instrumentation-fastapi/setup.cfg | 2 +- .../opentelemetry-instrumentation-flask/setup.cfg | 2 +- .../opentelemetry-instrumentation-grpc/setup.cfg | 6 +++--- .../opentelemetry-instrumentation-httpx/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-jinja2/setup.cfg | 2 +- .../opentelemetry-instrumentation-logging/setup.cfg | 2 +- .../opentelemetry-instrumentation-mysql/setup.cfg | 2 +- .../opentelemetry-instrumentation-psycopg2/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymemcache/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymongo/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymysql/setup.cfg | 2 +- .../opentelemetry-instrumentation-pyramid/setup.cfg | 2 +- .../opentelemetry-instrumentation-redis/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-requests/setup.cfg | 2 +- .../opentelemetry-instrumentation-sklearn/setup.cfg | 2 +- .../opentelemetry-instrumentation-sqlalchemy/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-sqlite3/setup.cfg | 2 +- .../opentelemetry-instrumentation-starlette/setup.cfg | 2 +- .../opentelemetry-instrumentation-tornado/setup.cfg | 2 +- .../opentelemetry-instrumentation-urllib/setup.cfg | 2 +- .../opentelemetry-instrumentation-urllib3/setup.cfg | 2 +- .../opentelemetry-instrumentation-wsgi/setup.cfg | 2 +- opentelemetry-instrumentation/setup.cfg | 2 +- propagator/opentelemetry-propagator-ot-trace/setup.cfg | 4 ++-- sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg | 2 +- util/opentelemetry-util-http/setup.cfg | 2 +- 39 files changed, 46 insertions(+), 46 deletions(-) diff --git a/_template/setup.cfg b/_template/setup.cfg index 55c4d44d90..60294c03a6 100644 --- a/_template/setup.cfg +++ b/_template/setup.cfg @@ -45,7 +45,7 @@ package_dir= packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 [options.extras_require] test = diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index 0581a33731..93127e57b2 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -39,8 +39,8 @@ package_dir= packages=find_namespace: install_requires = ddtrace>=0.34.0,<0.47.0 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index 4de609a95b..457d297612 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index da2357145a..d3bb357d7c 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index a47609d423..1977865a0c 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index ed96cf3cb9..ed58020ee9 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index ce5e5e0975..cbe131f33d 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-botocore == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index 72b9c59d42..8afdc00599 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index e28307b948..c2d059df71 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index 590c7ca3a8..64f0ee8405 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index 6065a06074..06eba3939e 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -41,7 +41,7 @@ install_requires = opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index e7e3f397c4..5b66b4e8ed 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index 2021bf80ed..95da69587f 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -42,7 +42,7 @@ install_requires = opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg index 8ec66c688b..fe0c45cf3b 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-asgi == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 1f596c3a60..0f41f8ee73 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -41,7 +41,7 @@ install_requires = opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index 12c56b9d61..c7f1f19912 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 @@ -47,7 +47,7 @@ install_requires = [options.extras_require] test = opentelemetry-test == 0.23.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 protobuf >= 3.13.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg index cdc5dad7d9..2267880ac2 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg @@ -39,14 +39,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-semantic-conventions == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 opentelemetry-test == 0.23.dev0 respx ~= 0.17.0 diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index bb028afc1b..04d3b5a6c1 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index feaca56208..ada9c47e48 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index a3f9ca45d6..fbf8b9b102 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index 79d2237613..f1c3cbab38 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index e9372a3e62..d950fd4819 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index 6a45422863..f3fc688d78 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index 9211b3e1ce..51dee5c78e 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index fd2abe1470..0889d6054b 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -39,7 +39,7 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index 9da565f942..769152940f 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.12.1 @@ -46,7 +46,7 @@ install_requires = [options.extras_require] test = opentelemetry-test == 0.23.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index 2decc00bac..60d95bc90d 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index 7ba7c1eff9..f1af64fc78 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index 4d4c16e3a3..de60300daa 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.11.2 [options.extras_require] test = - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 pytest [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index be6f1d5ea5..4bf335c663 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg index c4414002f5..0c2abd5e2e 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-asgi == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index 83c0c23dd5..44a03d7938 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -38,7 +38,7 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index 87fba0b355..26e8bc3991 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg index a3667d388e..141e6374dd 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index 0a924f6484..bf28baf1ae 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index a00673cca8..372f894655 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -41,7 +41,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 wrapt >= 1.0.0, < 2.0.0 [options.packages.find] diff --git a/propagator/opentelemetry-propagator-ot-trace/setup.cfg b/propagator/opentelemetry-propagator-ot-trace/setup.cfg index e38aec27cf..eae963ec58 100644 --- a/propagator/opentelemetry-propagator-ot-trace/setup.cfg +++ b/propagator/opentelemetry-propagator-ot-trace/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index bec34df03b..cd371a4052 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 [options.entry_points] opentelemetry_propagator = diff --git a/util/opentelemetry-util-http/setup.cfg b/util/opentelemetry-util-http/setup.cfg index 3453969547..3b1738d52e 100644 --- a/util/opentelemetry-util-http/setup.cfg +++ b/util/opentelemetry-util-http/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 asgiref ~= 3.0 From 36b02f96e8c2a324c4307177e980a8cb2d4d335c Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 24 Jun 2021 13:12:00 -0700 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51c1880f66..323c4e3313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538)) - Changed the psycopg2-binary to psycopg2 as dependency in production ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543)) - +- Updating dependency for opentelemetry api/sdk packages to support major version instead + of pinning to specific versions. + ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543)) ### Added - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation ([#461](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/461)) From 6d927102ed68ba9432520c1bc6c06c06433c97e9 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 8 Jul 2021 09:19:57 -0700 Subject: [PATCH 3/4] update version to ~= 1.3 --- _template/setup.cfg | 2 +- exporter/opentelemetry-exporter-datadog/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-aiohttp-client/setup.cfg | 2 +- .../opentelemetry-instrumentation-aiopg/setup.cfg | 2 +- .../opentelemetry-instrumentation-asgi/setup.cfg | 2 +- .../opentelemetry-instrumentation-asyncpg/setup.cfg | 2 +- .../opentelemetry-instrumentation-boto/setup.cfg | 2 +- .../opentelemetry-instrumentation-botocore/setup.cfg | 2 +- .../opentelemetry-instrumentation-celery/setup.cfg | 2 +- .../opentelemetry-instrumentation-dbapi/setup.cfg | 2 +- .../opentelemetry-instrumentation-django/setup.cfg | 2 +- .../opentelemetry-instrumentation-elasticsearch/setup.cfg | 2 +- .../opentelemetry-instrumentation-falcon/setup.cfg | 2 +- .../opentelemetry-instrumentation-fastapi/setup.cfg | 2 +- .../opentelemetry-instrumentation-flask/setup.cfg | 2 +- .../opentelemetry-instrumentation-grpc/setup.cfg | 6 +++--- .../opentelemetry-instrumentation-httpx/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-jinja2/setup.cfg | 2 +- .../opentelemetry-instrumentation-logging/setup.cfg | 2 +- .../opentelemetry-instrumentation-mysql/setup.cfg | 2 +- .../opentelemetry-instrumentation-psycopg2/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymemcache/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymongo/setup.cfg | 2 +- .../opentelemetry-instrumentation-pymysql/setup.cfg | 2 +- .../opentelemetry-instrumentation-pyramid/setup.cfg | 2 +- .../opentelemetry-instrumentation-redis/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-requests/setup.cfg | 2 +- .../opentelemetry-instrumentation-sklearn/setup.cfg | 2 +- .../opentelemetry-instrumentation-sqlalchemy/setup.cfg | 4 ++-- .../opentelemetry-instrumentation-sqlite3/setup.cfg | 2 +- .../opentelemetry-instrumentation-starlette/setup.cfg | 2 +- .../opentelemetry-instrumentation-tornado/setup.cfg | 2 +- .../opentelemetry-instrumentation-urllib/setup.cfg | 2 +- .../opentelemetry-instrumentation-urllib3/setup.cfg | 2 +- .../opentelemetry-instrumentation-wsgi/setup.cfg | 2 +- opentelemetry-instrumentation/setup.cfg | 2 +- propagator/opentelemetry-propagator-ot-trace/setup.cfg | 4 ++-- sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg | 4 ++-- util/opentelemetry-util-http/setup.cfg | 2 +- 39 files changed, 47 insertions(+), 47 deletions(-) diff --git a/_template/setup.cfg b/_template/setup.cfg index 60294c03a6..58ef4ace69 100644 --- a/_template/setup.cfg +++ b/_template/setup.cfg @@ -45,7 +45,7 @@ package_dir= packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 [options.extras_require] test = diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index 93127e57b2..db3d84626c 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -39,8 +39,8 @@ package_dir= packages=find_namespace: install_requires = ddtrace>=0.34.0,<0.47.0 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index 457d297612..019b3062b1 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index d3bb357d7c..5ee4dd67ba 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index 1977865a0c..1fa3184d41 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index ed58020ee9..c6d83ec24d 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index cbe131f33d..32cbd0de28 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-botocore == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index 8afdc00599..9a0a8b8c50 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index c2d059df71..393fd5ea27 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index 64f0ee8405..380ed445fc 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index 06eba3939e..d137b98cc2 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -41,7 +41,7 @@ install_requires = opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index 5b66b4e8ed..f2d67f9da9 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index 95da69587f..9450cf9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -42,7 +42,7 @@ install_requires = opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg index fe0c45cf3b..e90f9ebcbf 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-asgi == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 0f41f8ee73..5581efaf53 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -41,7 +41,7 @@ install_requires = opentelemetry-util-http == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index c7f1f19912..a521c68b4c 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 @@ -47,7 +47,7 @@ install_requires = [options.extras_require] test = opentelemetry-test == 0.23.dev0 - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 protobuf >= 3.13.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg index 2267880ac2..8e25dfda31 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg @@ -39,14 +39,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-semantic-conventions == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 opentelemetry-test == 0.23.dev0 respx ~= 0.17.0 diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index 04d3b5a6c1..8e15504212 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index ada9c47e48..5a3e3834af 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index fbf8b9b102..7f9dfa86b0 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index f1c3cbab38..3d452c6a3b 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index d950fd4819..da3169faf9 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index f3fc688d78..3aefe27e2d 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index 51dee5c78e..7646c17ed7 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index 0889d6054b..c3dc6a354d 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -39,7 +39,7 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation-wsgi == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index 769152940f..0e38b99e8f 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.12.1 @@ -46,7 +46,7 @@ install_requires = [options.extras_require] test = opentelemetry-test == 0.23.dev0 - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index 60d95bc90d..a6c030e72c 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index f1af64fc78..aa428452a4 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 [options.extras_require] diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index de60300daa..f13f4e6a08 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.11.2 [options.extras_require] test = - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 pytest [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index 4bf335c663..ba2b693b73 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation-dbapi == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg index 0c2abd5e2e..cdbef52a8e 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-instrumentation-asgi == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index 44a03d7938..7aa1ac31c2 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -38,7 +38,7 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index 26e8bc3991..e39210fb64 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg index 141e6374dd..8ef7082dc2 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index bf28baf1ae..ddaca61bb3 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-semantic-conventions == 0.23.dev0 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-util-http == 0.23.dev0 diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index 372f894655..0a62858fc7 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -41,7 +41,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 wrapt >= 1.0.0, < 2.0.0 [options.packages.find] diff --git a/propagator/opentelemetry-propagator-ot-trace/setup.cfg b/propagator/opentelemetry-propagator-ot-trace/setup.cfg index eae963ec58..1d6d212375 100644 --- a/propagator/opentelemetry-propagator-ot-trace/setup.cfg +++ b/propagator/opentelemetry-propagator-ot-trace/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index c14ea5a09d..17f90b06d5 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.entry_points] opentelemetry_propagator = diff --git a/util/opentelemetry-util-http/setup.cfg b/util/opentelemetry-util-http/setup.cfg index 3b1738d52e..7836678474 100644 --- a/util/opentelemetry-util-http/setup.cfg +++ b/util/opentelemetry-util-http/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 asgiref ~= 3.0 From ac671ffdef606e296de882e0addd2dc41b8301cf Mon Sep 17 00:00:00 2001 From: alrex Date: Thu, 8 Jul 2021 11:13:24 -0700 Subject: [PATCH 4/4] Update CHANGELOG.md Co-authored-by: Leighton Chen --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e657b4f90..f5c7c201f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#533](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/533)) - Updating dependency for opentelemetry api/sdk packages to support major version instead of pinning to specific versions. - ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543)) + ([#567](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/567)) ### Added - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation