Skip to content

Commit 57ec4f9

Browse files
committed
Merge remote-tracking branch 'ot/master' into utils-package
2 parents 3870e3b + 602ddb0 commit 57ec4f9

97 files changed

Lines changed: 1171 additions & 244 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
103103

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

106-
- [Alex Boten](https://github.com/codeboten), LightStep
107106
- [Carlos Alberto Cortez](https://github.com/carlosalberto), LightStep
107+
- [Chris Kleinknecht](https://github.com/c24t), Google
108108
- [Christian Neumüller](https://github.com/Oberon00), Dynatrace
109+
- [Diego Hurtado](https://github.com/ocelotl)
109110
- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
110111
- [Leighton Chen](https://github.com/lzchen), Microsoft
111112
- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
@@ -115,7 +116,7 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
115116

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

118-
- [Chris Kleinknecht](https://github.com/c24t), Google
119+
- [Alex Boten](https://github.com/codeboten), LightStep
119120
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Zillow Group
120121

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

RELEASING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
This document explains how to publish all OT modules at version x.y.z. Ensure that you’re following semver when choosing a version number.
33

44
Release Process:
5+
* [Checkout a clean repo](#checkout-a-clean-repo)
56
* [Create a new branch](#create-a-new-branch)
67
* [Open a Pull Request](#open-a-pull-request)
78
* [Create a Release](#Create-a-Release)
@@ -10,6 +11,8 @@ Release Process:
1011
* [Check PyPI](#Check-PyPI)
1112
* [Troubleshooting](#troubleshooting)
1213

14+
## Checkout a clean repo
15+
- To avoid pushing untracked changes, check out the repo in a new dir
1316

1417
## Create a new branch
1518
The following script does the following:
@@ -74,7 +77,6 @@ git commit -m
7477

7578
If for some reason the action failed, do it manually:
7679

77-
- To avoid pushing untracked changes, check out the repo in a new dir
7880
- Switch to the release branch (important so we don't publish packages with "dev" versions)
7981
- Build distributions with `./scripts/build.sh`
8082
- Delete distributions we don't want to push (e.g. `testutil`)

docs-requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sphinx-autodoc-typehints~=1.10.2
55
# Required by ext packages
66
asgiref~=3.0
77
ddtrace>=0.34.0
8-
aiohttp ~= 3.0
8+
aiohttp~= 3.0
99
Deprecated>=1.2.6
1010
django>=2.2
1111
PyMySQL~=0.9.3
@@ -18,4 +18,5 @@ pymongo~=3.1
1818
redis>=2.6
1919
sqlalchemy>=1.0
2020
thrift>=0.10.0
21-
wrapt >=1.0.0,<2.0.0
21+
wrapt>=1.0.0,<2.0.0
22+
psutil~=5.7.0

docs/examples/opentelemetry-example-app/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setuptools.setup(
1818
name="opentelemetry-example-app",
19-
version="0.8.dev0",
19+
version="0.9.dev0",
2020
author="OpenTelemetry Authors",
2121
author_email="cncf-opentelemetry-contributors@lists.cncf.io",
2222
classifiers=[
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry System Metrics Instrumentation
2+
============================================
3+
4+
.. automodule:: opentelemetry.ext.system_metrics
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

ext/opentelemetry-ext-aiohttp-client/setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ package_dir=
3939
=src
4040
packages=find_namespace:
4141
install_requires =
42-
opentelemetry-api >= 0.8.dev0
43-
opentelemetry-instrumentation-utils == 0.8.dev0
42+
opentelemetry-api >= 0.9.dev0
43+
opentelemetry-instrumentation-utils == 0.9.dev0
4444
aiohttp ~= 3.0
4545

4646
[options.packages.find]

ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/version.py

Lines changed: 1 addition & 1 deletion
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.8.dev0"
15+
__version__ = "0.9.dev0"

ext/opentelemetry-ext-asgi/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
## Unreleased
44

5+
## 0.8b0
6+
7+
Released 2020-05-27
8+
59
- Add ASGI middleware ([#716](https://github.com/open-telemetry/opentelemetry-python/pull/716))

ext/opentelemetry-ext-asgi/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ package_dir=
3939
=src
4040
packages=find_namespace:
4141
install_requires =
42-
opentelemetry-api == 0.8.dev0
42+
opentelemetry-api == 0.9.dev0
4343
asgiref ~= 3.0
4444

4545
[options.extras_require]

ext/opentelemetry-ext-asgi/src/opentelemetry/ext/asgi/version.py

Lines changed: 1 addition & 1 deletion
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.8.dev0"
15+
__version__ = "0.9.dev0"

0 commit comments

Comments
 (0)