Skip to content

Commit 9d5c43e

Browse files
lzchenlzchen
committed
2 parents 7737f53 + 65fb21c commit 9d5c43e

File tree

158 files changed

+2260
-676
lines changed

Some content is hidden

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

158 files changed

+2260
-676
lines changed

‎.flake8

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[flake8]
22
ignore =
33
E501 # line too long, defer to black
4-
F401 # unused import, defer to pylint
54
W503 # allow line breaks before binary ops
65
W504 # allow line breaks after binary ops
76
E203 # allow whitespace before ':' (https://github.com/psf/black#slices)

‎.github/workflows/publish-a-package.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Publish a Package from Tag
2+
3+
on:
4+
push:
5+
tags:
6+
- 'opentelemetry-*==1.*'
7+
8+
jobs:
9+
publish-a-package:
10+
name: Publish package from tag
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v1
14+
- uses: actions/setup-python@v1
15+
with:
16+
python-version: '3.9'
17+
- name: Log tag that triggered publish workflow
18+
run: echo "Attempting to publish package from tag $GITHUB_REF"
19+
- name: Build wheel for tag
20+
run: ./scripts/build_a_package.sh
21+
- name: Install twine
22+
run: |
23+
pip install twine
24+
# We don't need to publish to TestPyPI because we only publish 1 package.
25+
# If it fails no other work needs to be reversed.
26+
- name: Publish to PyPI
27+
env:
28+
TWINE_USERNAME: '__token__'
29+
TWINE_PASSWORD: ${{ secrets.pypi_password }}
30+
run: |
31+
twine upload --skip-existing --verbose dist/*

‎.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: 67bbad45917baa354a3a6d0d4361da48ff13fd31
9+
CORE_REPO_SHA: c49ad57bfe35cfc69bfa863d74058ca9bec55fc3
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

‎.python-version

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

‎CHANGELOG.md

+22-2
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,35 @@ 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)
99

10-
## [1.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-19
10+
## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
1111

12+
### Added
13+
- `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package
14+
([#586](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/586))
15+
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-aiohttp-client`, `openetelemetry-instrumentation-fastapi`,
16+
`opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3` Added `request_hook` and `response_hook` callbacks
17+
([#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))
23+
24+
### Changed
25+
- Enable explicit `excluded_urls` argument in `opentelemetry-instrumentation-flask`
26+
([#604](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/604))
1227

28+
## [1.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-21
1329

1430
### Removed
1531
- Move `opentelemetry-instrumentation` to the core repo.
1632
([#595](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/595))
1733

1834
### Changed
35+
- `opentelemetry-instrumentation-falcon` added support for Falcon 3.
36+
([#607](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/607))
1937
- `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
2038
([#499](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/499))
2139
- `opentelemetry-instrumentation` Fixed cases where trying to use an instrumentation package without the
@@ -57,6 +75,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5775
([#563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/563))
5876
- `opentelemetry-exporter-datadog` Datadog exporter should not use `unknown_service` as fallback resource service name.
5977
([#570](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/570))
78+
- Add support for the async extension of SQLAlchemy (>= 1.4)
79+
([#568](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/568))
6080

6181
### Added
6282
- `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

‎README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,24 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
7272

7373
We meet weekly on Thursday, and the time of the meeting alternates between 9AM PT and 4PM PT. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com) for specific dates.
7474

75-
Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170). The passcode is _77777_.
75+
Meetings take place via [Zoom video conference](https://zoom.us/j/8287234601?pwd=YjN2MURycXc4cEZlYTRtYjJaM0grZz09). The passcode is _77777_.
7676

7777
Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-python/discussions).
7878

7979
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
8080

8181
- [Aaron Abbott](https://github.com/aabmass), Google
82-
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
83-
- [Owais Lone](https://github.com/owais), Splunk
82+
- [Alex Boten](https://github.com/codeboten), Lightstep
83+
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
84+
- [Srikanth Chekuri](https://github.com/lonewolf3739)
8485

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

8788
Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
8889

89-
- [Alex Boten](https://github.com/codeboten), Lightstep
90+
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
9091
- [Leighton Chen](https://github.com/lzchen), Microsoft
92+
- [Owais Lone](https://github.com/owais), Splunk
9193

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

‎_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.23b0"
15+
__version__ = "0.24b0"

‎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.*

‎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.23b0
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/

‎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.23b0
44+
opentelemetry-semantic-conventions == 0.24b0
4545

4646
[options.packages.find]
4747
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.23b0"
15+
__version__ = "0.24b0"

‎exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

+5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414

1515
import itertools
1616
import logging
17+
import sys
1718
import time
1819
import unittest
1920
from unittest import mock
2021

2122
from ddtrace.internal.writer import AgentWriter
2223
from flaky import flaky
24+
from pytest import mark
2325

2426
from opentelemetry import trace as trace_api
2527
from opentelemetry.context import Context
@@ -469,6 +471,9 @@ def test_span_processor_dropped_spans(self):
469471
self.assertEqual(len(datadog_spans), 128)
470472
tracer_provider.shutdown()
471473

474+
@mark.skipif(
475+
sys.platform == "win32", reason="unreliable test on windows",
476+
)
472477
def test_span_processor_scheduled_delay(self):
473478
"""Test that spans are exported each schedule_delay_millis"""
474479
delay = 300

‎instrumentation/README.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
2+
| Instrumentation | Supported Packages |
3+
| --------------- | ------------------ |
4+
| [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 |
5+
| [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 1.3.0 |
6+
| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 |
7+
| [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 |
8+
| [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 |
9+
| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 |
10+
| [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 |
11+
| [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi |
12+
| [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 |
13+
| [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 |
14+
| [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon ~= 2.0 |
15+
| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 |
16+
| [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0, < 3.0 |
17+
| [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio ~= 1.27 |
18+
| [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0, < 0.19.0 |
19+
| [opentelemetry-instrumentation-jinja2](./opentelemetry-instrumentation-jinja2) | jinja2~=2.7 |
20+
| [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging |
21+
| [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 |
22+
| [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 |
23+
| [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache ~= 1.3 |
24+
| [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo ~= 3.1 |
25+
| [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL ~= 0.10.1 |
26+
| [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 |
27+
| [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 |
28+
| [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 |
29+
| [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 |
30+
| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy |
31+
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 |
32+
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 |
33+
| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 6.0 |
34+
| [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib |
35+
| [opentelemetry-instrumentation-urllib3](./opentelemetry-instrumentation-urllib3) | urllib3 >= 1.0.0, < 2.0.0 |
36+
| [opentelemetry-instrumentation-wsgi](./opentelemetry-instrumentation-wsgi) | wsgi |

‎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.23b0
43-
opentelemetry-instrumentation == 0.23b0
44-
opentelemetry-util-http == 0.23b0
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]

0 commit comments

Comments
 (0)