Skip to content

Commit beaeb17

Browse files
ocelotlocelotl
authored
Merge branch 'main' into django-asgi
2 parents ee0dbcc + d4668bc commit beaeb17

File tree

83 files changed

+187
-170
lines changed

Some content is hidden

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

83 files changed

+187
-170
lines changed

Diff for: ‎.github/workflows/test.yml

+12-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 1c8449dee58b702b2505e2aefeb3c4106d1e33cf
9+
CORE_REPO_SHA: 3e1c89bcae77c34b9750a1f00608a04a97921c51
1010

1111
jobs:
1212
build:
@@ -44,8 +44,10 @@ jobs:
4444
# Preserves .tox directory between runs for faster installs
4545
uses: actions/cache@v2
4646
with:
47-
path: .tox
48-
key: v2-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
47+
path: |
48+
.tox
49+
~/.cache/pip
50+
key: v4-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
4951
- name: run tox
5052
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
5153
- name: Find and merge benchmarks
@@ -94,12 +96,17 @@ jobs:
9496
python-version: 3.9
9597
- name: Install tox
9698
run: pip install -U tox
99+
- name: Install libsnappy-dev
100+
if: ${{ matrix.tox-environment == 'lint' }}
101+
run: sudo apt-get install -y libsnappy-dev
97102
- name: Cache tox environment
98103
# Preserves .tox directory between runs for faster installs
99104
uses: actions/cache@v2
100105
with:
101-
path: .tox
102-
key: v2-misc-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt', 'gen-requirements.txt', 'docs-requirements.txt') }}
106+
path: |
107+
.tox
108+
~/.cache/pip
109+
key: v4-misc-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt', 'gen-requirements.txt', 'docs-requirements.txt') }}
103110
- name: run tox
104111
run: tox -e ${{ matrix.tox-environment }}
105112
- name: Ensure generated code is up to date

Diff for: ‎.python-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.9.5

Diff for: ‎CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.4.0-0.23b0...HEAD)
8+
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.5.0-0.24b0...HEAD)
9+
10+
## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
911

1012
### Added
1113
- `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package
1214
([#586](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/586))
1315
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-aiohttp-client`, `openetelemetry-instrumentation-fastapi`,
1416
`opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3` Added `request_hook` and `response_hook` callbacks
1517
([#576](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/576))
18+
19+
### Changed
20+
21+
- `opentelemetry-instrumentation-fastapi` Allow instrumentation of newer FastAPI versions.
22+
([#602](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/602))
1623

1724
### Changed
1825
- Enable explicit `excluded_urls` argument in `opentelemetry-instrumentation-flask`
@@ -25,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2532
([#595](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/595))
2633

2734
### Changed
35+
- `opentelemetry-instrumentation-falcon` added support for Falcon 3.
36+
([#607](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/607))
2837
- `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
2938
([#499](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/499))
3039
- `opentelemetry-instrumentation` Fixed cases where trying to use an instrumentation package without the

Diff for: ‎_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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pylint~=2.6
1+
pylint<2.10
22
flake8~=3.7
33
isort~=5.6
44
black>=19.3b0,==19.*

Diff for: ‎eachdist.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sortfirst=
1717
ext/*
1818

1919
[stable]
20-
version=1.4.0
20+
version=1.5.0
2121

2222
packages=
2323
opentelemetry-sdk
@@ -35,12 +35,13 @@ packages=
3535
opentelemetry-api
3636

3737
[prerelease]
38-
version=0.24.dev0
38+
version=0.24b0
3939

4040
packages=
4141
all
4242
opentelemetry-semantic-conventions
4343
opentelemetry-test
44+
opentelemetry-instrumentation
4445

4546
[lintroots]
4647
extraroots=examples/*,scripts/

Diff for: ‎exporter/opentelemetry-exporter-datadog/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ install_requires =
4141
ddtrace>=0.34.0,<0.47.0
4242
opentelemetry-api ~= 1.3
4343
opentelemetry-sdk ~= 1.3
44-
opentelemetry-semantic-conventions == 0.24.dev0
44+
opentelemetry-semantic-conventions == 0.24b0
4545

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
44-
opentelemetry-util-http == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
44+
opentelemetry-util-http == 0.24b0
4545
wrapt >= 1.0.0, < 2.0.0
4646

4747
[options.packages.find]

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation-dbapi == 0.24.dev0
44-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation-dbapi == 0.24b0
44+
opentelemetry-instrumentation == 0.24b0
4545
wrapt >= 1.0.0, < 2.0.0
4646

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

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-asgi/setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
44-
opentelemetry-util-http == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
44+
opentelemetry-util-http == 0.24b0
4545

4646
[options.extras_require]
4747
test =
48-
opentelemetry-test == 0.24.dev0
48+
opentelemetry-test == 0.24b0
4949

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444

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

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto/setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ package_dir=
3939
packages=find_namespace:
4040
install_requires =
4141
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
44-
opentelemetry-instrumentation-botocore == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
44+
opentelemetry-instrumentation-botocore == 0.24b0
4545

4646
[options.extras_require]
4747
test =
4848
moto~=2.0
49-
opentelemetry-test == 0.24.dev0
49+
opentelemetry-test == 0.24b0
5050

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎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
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444

4545
[options.extras_require]
4646
test =
4747
moto[all] ~= 2.0
48-
opentelemetry-test == 0.24.dev0
48+
opentelemetry-test == 0.24b0
4949

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-celery/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
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444

4545
[options.extras_require]
4646
test =
4747
pytest
48-
opentelemetry-test == 0.24.dev0
48+
opentelemetry-test == 0.24b0
4949

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-dbapi/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
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444
wrapt >= 1.0.0, < 2.0.0
4545

4646
[options.extras_require]
4747
test =
48-
opentelemetry-test == 0.24.dev0
48+
opentelemetry-test == 0.24b0
4949

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

Diff for: ‎instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py

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

15-
__version__ = "0.24.dev0"
15+
__version__ = "0.24b0"
1616

1717
_instruments = tuple()

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ package_dir=
3838
=src
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-util-http == 0.24.dev0
42-
opentelemetry-instrumentation-wsgi == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
41+
opentelemetry-util-http == 0.24b0
42+
opentelemetry-instrumentation-wsgi == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444
opentelemetry-api ~= 1.3
45-
opentelemetry-semantic-conventions == 0.24.dev0
45+
opentelemetry-semantic-conventions == 0.24b0
4646

4747
[options.extras_require]
4848
asgi =
4949
opentelemetry-instrumentation-asgi == 0.23.dev0
5050
test =
51-
opentelemetry-test == 0.24.dev0
51+
opentelemetry-test == 0.24b0
5252

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

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/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
opentelemetry-api ~= 1.3
42-
opentelemetry-semantic-conventions == 0.24.dev0
43-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-semantic-conventions == 0.24b0
43+
opentelemetry-instrumentation == 0.24b0
4444
wrapt >= 1.0.0, < 2.0.0
4545

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

5151
[options.packages.find]

Diff for: ‎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.24.dev0"
15+
__version__ = "0.24b0"

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ package_dir=
3939
=src
4040
packages=find_namespace:
4141
install_requires =
42-
opentelemetry-instrumentation-wsgi == 0.24.dev0
43-
opentelemetry-util-http == 0.24.dev0
44-
opentelemetry-instrumentation == 0.24.dev0
42+
opentelemetry-instrumentation-wsgi == 0.24b0
43+
opentelemetry-util-http == 0.24b0
44+
opentelemetry-instrumentation == 0.24b0
4545
opentelemetry-api ~= 1.3
46-
opentelemetry-semantic-conventions == 0.24.dev0
46+
opentelemetry-semantic-conventions == 0.24b0
4747

4848
[options.extras_require]
4949
test =
50-
opentelemetry-test == 0.24.dev0
50+
opentelemetry-test == 0.24b0
5151
parameterized == 0.7.4
5252

5353
[options.packages.find]

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def response_hook(span, req, resp):
126126

127127
_excluded_urls = get_excluded_urls("FALCON")
128128
_traced_request_attrs = get_traced_request_attrs("FALCON")
129-
_response_propagation_setter = FuncSetter(falcon.api.Response.append_header)
129+
_response_propagation_setter = FuncSetter(falcon.Response.append_header)
130130

131131

132132
class FalconInstrumentor(BaseInstrumentor):

0 commit comments

Comments
 (0)