Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updating dependency for api/sdk to major version #567

Merged
merged 7 commits into from
Jul 9, 2021
Merged

updating dependency for api/sdk to major version #567

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b650b0
updating dependency for api/sdk to major version
Jun 24, 2021
36b02f9
update changelog
Jun 24, 2021
9eda1f6
Merge remote-tracking branch 'origin/main' into codeboten/unpin-api-sdk
Jul 6, 2021
116f951
Merge branch 'main' into codeboten/unpin-api-sdk
Jul 8, 2021
6d92710
update version to ~= 1.3
Jul 8, 2021
ac671ff
Update CHANGELOG.md
Jul 8, 2021
de42ffa
Merge branch 'main' into codeboten/unpin-api-sdk
Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
- Require aiopg to be less than 1.3.0
([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))
- 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))
codeboten marked this conversation as resolved.
Show resolved Hide resolved

### Added
- `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation
Expand Down
2 changes: 1 addition & 1 deletion _template/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-datadog/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-boto/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-botocore/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-celery/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-django/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-falcon/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-flask/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-grpc/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ 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

[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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-httpx/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-logging/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-mysql/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-redis/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ 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

[options.extras_require]
test =
opentelemetry-test == 0.23.dev0
opentelemetry-sdk == 1.4.0.dev0
opentelemetry-sdk ~= 1.0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-requests/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-starlette/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-tornado/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-urllib/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-instrumentation/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions propagator/opentelemetry-propagator-ot-trace/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Loading