Skip to content

Commit

Permalink
updating dependency for api/sdk to major version (#567)
Browse files Browse the repository at this point in the history
Co-authored-by: Leighton Chen <[email protected]>
  • Loading branch information
alrex and lzchen authored Jul 9, 2021
1 parent 56da6d7 commit 753e228
Show file tree
Hide file tree
Showing 40 changed files with 50 additions and 47 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))
- `opentelemetry-instrumentation-django` Migrated Django middleware to new-style.
([#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.
([#567](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/567))

### Added
- `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation
Expand Down
2 changes: 1 addition & 1 deletion _template/setup.cfg
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.3

[options.extras_require]
test =
Expand Down
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-datadog/setup.cfg
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.3
opentelemetry-sdk ~= 1.3
opentelemetry-semantic-conventions == 0.23.dev0

[options.packages.find]
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-util-http == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation-dbapi == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-util-http == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0

Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-instrumentation-botocore == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0

Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0

Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0

[options.extras_require]
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0

[options.extras_require]
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-instrumentation-asgi == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0

[options.extras_require]
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-grpc/setup.cfg
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.3
opentelemetry-sdk ~= 1.3
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.3
protobuf >= 3.13.0

[options.packages.find]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-httpx/setup.cfg
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.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.4.0.dev0
opentelemetry-sdk ~= 1.3
opentelemetry-test == 0.23.dev0
respx ~= 0.17.0

Expand Down
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.3
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0

Expand Down
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.3
opentelemetry-instrumentation == 0.23.dev0

[options.extras_require]
Expand Down
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.3
opentelemetry-instrumentation-dbapi == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-instrumentation-dbapi == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0

Expand Down
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.3
opentelemetry-instrumentation-dbapi == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0

Expand Down
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.3
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
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.3
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.3

[options.packages.find]
where = src
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-util-http == 0.23.dev0
Expand Down
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.3
opentelemetry-instrumentation == 0.23.dev0

[options.extras_require]
Expand Down
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.3
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.3
pytest

[options.packages.find]
Expand Down
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.3
opentelemetry-instrumentation-dbapi == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-instrumentation-asgi == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-util-http == 0.23.dev0

Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
opentelemetry-util-http == 0.23.dev0
Expand Down
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.3
opentelemetry-semantic-conventions == 0.23.dev0
opentelemetry-instrumentation == 0.23.dev0
wrapt >= 1.0.0, < 2.0.0
Expand Down
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.3
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
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.3
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
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.3
opentelemetry-sdk ~= 1.3

[options.packages.find]
where = src
Expand Down
4 changes: 2 additions & 2 deletions sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg
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.3
opentelemetry-sdk ~= 1.3

[options.entry_points]
opentelemetry_propagator =
Expand Down
Loading

0 comments on commit 753e228

Please sign in to comment.