Skip to content

Commit 2a22f73

Browse files
lzchenlzchen
authored
Merge branch 'main' into instrumentation-hooks
2 parents 2489671 + 35774f1 commit 2a22f73

File tree

77 files changed

+166
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+166
-165
lines changed

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: f556d1418c8015b71ec2e16b4ba2b76efdd3804f
9+
CORE_REPO_SHA: 1a12fa0d681e37c1fda9cb8d46212ff3bbf6b76a
1010

1111
jobs:
1212
build:

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.19b0...HEAD)
88

99
### Changed
10+
- Restrict DataDog exporter's `ddtrace` dependency to known working versions.
11+
([#400](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/400))
1012
- GRPC instrumentation now correctly injects trace context into outgoing requests.
1113
([#392](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/39))
1214
- Publish `opentelemetry-propagator-ot-trace` package as a part of the release process

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
8282
- [Diego Hurtado](https://github.com/ocelotl)
8383
- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
8484
- [Owais Lone](https://github.com/owais), Splunk
85-
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
8685

8786
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
8887

‎_template/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package_dir=
4545
packages=find_namespace:
4646

4747
install_requires =
48-
opentelemetry-api == 1.0.0
48+
opentelemetry-api == 1.0.1.dev0
4949

5050
[options.extras_require]
5151
test =

‎_template/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎exporter/opentelemetry-exporter-datadog/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
ddtrace>=0.34.0
42-
opentelemetry-api == 1.0.0
43-
opentelemetry-sdk == 1.0.0
41+
ddtrace>=0.34.0,<0.47.0
42+
opentelemetry-api == 1.0.1.dev0
43+
opentelemetry-sdk == 1.0.1.dev0
4444

4545
[options.packages.find]
4646
where = src

‎exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
4343
aiohttp ~= 3.0
4444
wrapt >= 1.0.0, < 2.0.0
4545

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation-dbapi == 0.19b0
43-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation-dbapi == 0.20.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
4444
aiopg >= 0.13.0
4545
wrapt >= 1.0.0, < 2.0.0
4646

4747
[options.extras_require]
4848
test =
49-
opentelemetry-test == 0.19b0
49+
opentelemetry-test == 0.20.dev0
5050

5151
[options.packages.find]
5252
where = src

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-asgi/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
4343
asgiref ~= 3.0
4444

4545
[options.extras_require]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
4343
asyncpg >= 0.12.0
4444

4545
[options.extras_require]
4646
test =
47-
opentelemetry-test == 0.19b0
47+
opentelemetry-test == 0.20.dev0
4848

4949
[options.packages.find]
5050
where = src

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-boto/setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
boto ~= 2.0
42-
opentelemetry-api == 1.0.0
43-
opentelemetry-instrumentation == 0.19b0
44-
opentelemetry-instrumentation-botocore == 0.19b0
42+
opentelemetry-api == 1.0.1.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
44+
opentelemetry-instrumentation-botocore == 0.20.dev0
4545

4646
[options.extras_require]
4747
test =
4848
boto~=2.0
4949
moto~=1.0
50-
opentelemetry-test == 0.19b0
50+
opentelemetry-test == 0.20.dev0
5151

5252
[options.packages.find]
5353
where = src

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-botocore/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
botocore ~= 1.0
42-
opentelemetry-api == 1.0.0
43-
opentelemetry-instrumentation == 0.19b0
42+
opentelemetry-api == 1.0.1.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
4444

4545
[options.extras_require]
4646
test =
4747
moto ~= 1.0
48-
opentelemetry-test == 0.19b0
48+
opentelemetry-test == 0.20.dev0
4949

5050
[options.packages.find]
5151
where = src

‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-celery/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
celery >= 4.0, < 6.0
42-
opentelemetry-api == 1.0.0
43-
opentelemetry-instrumentation == 0.19b0
42+
opentelemetry-api == 1.0.1.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
4444

4545
[options.extras_require]
4646
test =
4747
pytest
4848
celery >= 4.0, < 6.0
49-
opentelemetry-test == 0.19b0
49+
opentelemetry-test == 0.20.dev0
5050

5151
[options.packages.find]
5252
where = src

‎instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
4343
wrapt >= 1.0.0, < 2.0.0
4444

4545
[options.extras_require]
4646
test =
47-
opentelemetry-test == 0.19b0
47+
opentelemetry-test == 0.20.dev0
4848

4949
[options.packages.find]
5050
where = src

‎instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-django/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
django >= 1.10
42-
opentelemetry-util-http == 0.19b0
43-
opentelemetry-instrumentation-wsgi == 0.19b0
44-
opentelemetry-instrumentation == 0.19b0
45-
opentelemetry-api == 1.0.0
42+
opentelemetry-util-http == 0.20.dev0
43+
opentelemetry-instrumentation-wsgi == 0.20.dev0
44+
opentelemetry-instrumentation == 0.20.dev0
45+
opentelemetry-api == 1.0.1.dev0
4646

4747
[options.extras_require]
4848
test =
49-
opentelemetry-test == 0.19b0
49+
opentelemetry-test == 0.20.dev0
5050

5151
[options.packages.find]
5252
where = src

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
4343
wrapt >= 1.0.0, < 2.0.0
4444
elasticsearch >= 2.0
4545

4646
[options.extras_require]
4747
test =
48-
opentelemetry-test == 0.19b0
48+
opentelemetry-test == 0.20.dev0
4949
elasticsearch-dsl >= 2.0
5050

5151
[options.packages.find]

‎instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-falcon/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ package_dir=
4040
packages=find_namespace:
4141
install_requires =
4242
falcon ~= 2.0
43-
opentelemetry-instrumentation-wsgi == 0.19b0
44-
opentelemetry-util-http == 0.19b0
45-
opentelemetry-instrumentation == 0.19b0
46-
opentelemetry-api == 1.0.0
43+
opentelemetry-instrumentation-wsgi == 0.20.dev0
44+
opentelemetry-util-http == 0.20.dev0
45+
opentelemetry-instrumentation == 0.20.dev0
46+
opentelemetry-api == 1.0.1.dev0
4747

4848
[options.extras_require]
4949
test =
5050
falcon ~= 2.0
51-
opentelemetry-test == 0.19b0
51+
opentelemetry-test == 0.20.dev0
5252
parameterized == 0.7.4
5353

5454
[options.packages.find]

‎instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-instrumentation == 0.19b0
43-
opentelemetry-instrumentation-asgi == 0.19b0
44-
opentelemetry-util-http == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-instrumentation == 0.20.dev0
43+
opentelemetry-instrumentation-asgi == 0.20.dev0
44+
opentelemetry-util-http == 0.20.dev0
4545

4646
[options.entry_points]
4747
opentelemetry_instrumentor =
4848
fastapi = opentelemetry.instrumentation.fastapi:FastAPIInstrumentor
4949

5050
[options.extras_require]
5151
test =
52-
opentelemetry-test == 0.19b0
52+
opentelemetry-test == 0.20.dev0
5353
fastapi ~= 0.58.1
5454
requests ~= 2.23.0 # needed for testclient
5555

‎instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-flask/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
flask ~= 1.0
42-
opentelemetry-util-http == 0.19b0
43-
opentelemetry-instrumentation == 0.19b0
44-
opentelemetry-instrumentation-wsgi == 0.19b0
45-
opentelemetry-api == 1.0.0
42+
opentelemetry-util-http == 0.20.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
44+
opentelemetry-instrumentation-wsgi == 0.20.dev0
45+
opentelemetry-api == 1.0.1.dev0
4646

4747
[options.extras_require]
4848
test =
4949
flask~=1.0
50-
opentelemetry-test == 0.19b0
50+
opentelemetry-test == 0.20.dev0
5151

5252
[options.packages.find]
5353
where = src

‎instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.19b0"
15+
__version__ = "0.20.dev0"

‎instrumentation/opentelemetry-instrumentation-grpc/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-api == 1.0.0
42-
opentelemetry-sdk == 1.0.0
43-
opentelemetry-instrumentation == 0.19b0
41+
opentelemetry-api == 1.0.1.dev0
42+
opentelemetry-sdk == 1.0.1.dev0
43+
opentelemetry-instrumentation == 0.20.dev0
4444
grpcio ~= 1.27
4545
wrapt >= 1.0.0, < 2.0.0
4646

4747
[options.extras_require]
4848
test =
49-
opentelemetry-test == 0.19b0
50-
opentelemetry-sdk == 1.0.0
49+
opentelemetry-test == 0.20.dev0
50+
opentelemetry-sdk == 1.0.1.dev0
5151
protobuf >= 3.13.0
5252

5353
[options.packages.find]

0 commit comments

Comments
 (0)