Skip to content

Commit b8ffce6

Browse files
author
alrex
authored
Merge branch 'main' into grpc-client-additions
2 parents ad80dfd + f0adb23 commit b8ffce6

File tree

170 files changed

+1444
-518
lines changed

Some content is hidden

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

170 files changed

+1444
-518
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help us improve
44
labels: bug
55
---
66

7-
**Describe your environment** Describe any aspect of your environment relevant to the problem, including your Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on master.
7+
**Describe your environment** Describe any aspect of your environment relevant to the problem, including your Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main.
88

99
**Steps to reproduce**
1010
Describe exactly how to reproduce the error. Include a code sample if applicable.

Diff for: ‎.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
2626

2727
# Checklist:
2828

29-
See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.
29+
See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.
3030

3131
- [ ] Followed the style guidelines of this project
3232
- [ ] Changelogs have been updated

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This action requires that any PR targeting the master branch should touch at
1+
# This action requires that any PR targeting the main branch should touch at
22
# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
33
# Changelog" label to disable this action.
44

@@ -8,7 +8,7 @@ on:
88
pull_request:
99
types: [opened, synchronize, reopened, labeled, unlabeled]
1010
branches:
11-
- master
11+
- main
1212

1313
jobs:
1414
changelog:

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 2b188b9a43dfaa74c1a0a4514b91d1cb07d3075d
9+
CORE_REPO_SHA: f3ee81243b4266729ba5196a7883ce897549aaba
1010

1111
jobs:
1212
build:
@@ -78,14 +78,14 @@ jobs:
7878
alert-threshold: 200%
7979
fail-on-alert: true
8080
# Make a commit on `gh-pages` with benchmarks from previous step
81-
auto-push: ${{ github.ref == 'refs/heads/master' }}
81+
auto-push: ${{ github.ref == 'refs/heads/main' }}
8282
gh-pages-branch: gh-pages
8383
benchmark-data-dir-path: benchmarks
8484
misc:
8585
strategy:
8686
fail-fast: false
8787
matrix:
88-
tox-environment: [ "docker-tests", "lint" ]
88+
tox-environment: [ "docker-tests", "lint", "docs" ]
8989
name: ${{ matrix.tox-environment }}
9090
runs-on: ubuntu-latest
9191
steps:

Diff for: ‎.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ disable=missing-docstring,
7878
protected-access, # temp-pylint-upgrade
7979
super-init-not-called, # temp-pylint-upgrade
8080
invalid-overridden-method, # temp-pylint-upgrade
81-
missing-module-docstring, # temp-pylint-upgrad, # temp-pylint-upgradee
81+
missing-module-docstring, # temp-pylint-upgrade
8282

8383
# Enable the message, report, category or checker with the given id(s). You can
8484
# either give multiple identifier separated by comma (,) or put this option

Diff for: ‎.readthedocs.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Read the Docs configuration file
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
version: 2
4+
5+
sphinx:
6+
configuration: docs/conf.py
7+
8+
build:
9+
image: latest
10+
11+
python:
12+
version: 3.8
13+
install:
14+
- requirements: docs-requirements.txt

Diff for: ‎CHANGELOG.md

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

7-
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.16b1...HEAD)
7+
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.17b0...HEAD)
8+
9+
### Changed
10+
- Remove `component` span attribute in instrumentations.
11+
`opentelemetry-instrumentation-aiopg`, `opentelemetry-instrumentation-dbapi` Remove unused `database_type` parameter from `trace_integration` function.
12+
([#301](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/301))
13+
- `opentelemetry-instrumentation-grpc` Updated client attributes, added tests, fixed examples, docs
14+
([#269](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/269))
15+
16+
## [0.17b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.17b0) - 2021-01-20
817

918
### Added
1019
- `opentelemetry-instrumentation-sqlalchemy` Ensure spans have kind set to "CLIENT"
@@ -42,7 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4251

4352
### Changed
4453
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-wsgi` Return `None` for `CarrierGetter` if key not found
45-
([#1374](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/233))
54+
([#233](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/233))
4655
- `opentelemetry-instrumentation-grpc` Comply with updated spec, rework tests
4756
([#236](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/236))
4857
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-falcon`, `opentelemetry-instrumentation-flask`, `opentelemetry-instrumentation-pyramid`, `opentelemetry-instrumentation-wsgi` Renamed `host.port` attribute to `net.host.port`
@@ -56,9 +65,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5665
- `opentelemetry-instrumentation-aiopg` Fix AttributeError `__aexit__` when `aiopg.connect` and `aio[g].create_pool` used with async context manager
5766
([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235))
5867
- `opentelemetry-exporter-datadog` `opentelemetry-sdk-extension-aws` Fix reference to ids_generator in sdk
59-
([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235))
60-
- `opentelemetry-instrumentation-grpc` Updated client attributes, added tests, fixed examples, docs
61-
([#269](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/269))
68+
([#283](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/283))
69+
- `opentelemetry-instrumentation-sqlalchemy` Use SQL operation and DB name as span name.
70+
([#254](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/254))
71+
- `opentelemetry-instrumentation-dbapi`, `TracedCursor` replaced by `CursorTracer`
72+
([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246))
73+
- `opentelemetry-instrumentation-psycopg2`, Added support for psycopg2 registered types.
74+
([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246))
75+
- `opentelemetry-instrumentation-dbapi`, `opentelemetry-instrumentation-psycopg2`, `opentelemetry-instrumentation-mysql`, `opentelemetry-instrumentation-pymysql`, `opentelemetry-instrumentation-aiopg` Use SQL command name as the span operation name instead of the entire query.
76+
([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246))
77+
- Update TraceState to adhere to specs
78+
([#276](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/276))
6279

6380
## [0.16b1](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.16b1) - 2020-11-26
6481

Diff for: ‎CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#####################################################
66
#
77
# Learn about membership in OpenTelemetry community:
8-
# https://github.com/open-telemetry/community/blob/master/community-membership.md
8+
# https://github.com/open-telemetry/community/blob/main/community-membership.md
99
#
1010
#
1111
# Learn about CODEOWNERS file format:

Diff for: ‎CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ See the [public meeting notes](https://docs.google.com/document/d/1CIMGoIOZ-c3-i
88
for a summary description of past meetings. To request edit access, join the
99
meeting or get in touch on [Gitter](https://gitter.im/open-telemetry/opentelemetry-python).
1010

11-
See to the [community membership document](https://github.com/open-telemetry/community/blob/master/community-membership.md)
12-
on how to become a [**Member**](https://github.com/open-telemetry/community/blob/master/community-membership.md#member),
13-
[**Approver**](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
14-
and [**Maintainer**](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).
11+
See to the [community membership document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
12+
on how to become a [**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
13+
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
14+
and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
1515

1616
## Find a Buddy and get Started Quickly!
1717

@@ -46,7 +46,7 @@ You can run:
4646
- `tox -e lint` to run lint checks on all code
4747

4848
See
49-
[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/tox.ini)
49+
[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/tox.ini)
5050
for more detail on available tox commands.
5151

5252
### Benchmarks
@@ -121,8 +121,8 @@ Open a pull request against the main `opentelemetry-python-contrib` repo.
121121
### How to Get PRs Merged
122122

123123
A PR is considered to be **ready to merge** when:
124-
* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
125-
/ [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
124+
* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
125+
/ [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
126126
(at different companies).
127127
* Major feedbacks are resolved.
128128
* It has been open for review for at least one working day. This gives people
@@ -138,7 +138,7 @@ Any Approver / Maintainer can merge the PR once it is **ready to merge**.
138138
As with other OpenTelemetry clients, opentelemetry-python follows the
139139
[opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
140140

141-
It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/library-guidelines.md).
141+
It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
142142

143143
### Focus on Capabilities, Not Structure Compliance
144144

Diff for: ‎README.md

+45-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
1-
# opentelemetry-python-contrib
2-
[![Gitter chat](https://img.shields.io/gitter/room/opentelemetry/opentelemetry-python)](https://gitter.im/open-telemetry/opentelemetry-python)[![Build status](https://travis-ci.org/open-telemetry/opentelemetry-python-contrib.svg?branch=master)](https://travis-ci.org/open-telemetry/opentelemetry-python-contrib)
3-
4-
The Python auto-instrumentation libraries for [OpenTelemetry](https://opentelemetry.io/) (per [OTEP 0001](https://github.com/open-telemetry/oteps/blob/master/text/0001-telemetry-without-manual-instrumentation.md))
1+
---
2+
<p align="center">
3+
<strong>
4+
<a href="https://opentelemetry-python-contrib.readthedocs.io/en/latest/getting-started.html">Getting Started<a/>
5+
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
6+
<a href="https://opentelemetry-python-contrib.readthedocs.io/">API Documentation<a/>
7+
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
8+
<a href="https://gitter.im/open-telemetry/opentelemetry-python">Getting In Touch (Gitter)<a/>
9+
</strong>
10+
</p>
11+
12+
<p align="center">
13+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/releases">
14+
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/open-telemetry/opentelemetry-python-contrib?include_prereleases&style=for-the-badge">
15+
</a>
16+
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-python-contrib/branch/main/">
17+
<img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-python-contrib?style=for-the-badge">
18+
</a>
19+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/LICENSE">
20+
<img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
21+
</a>
22+
<br/>
23+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/actions?query=workflow%3ATest+branch%3Amaster">
24+
<img alt="Build Status" src="https://github.com/open-telemetry/opentelemetry-python-contrib/workflows/Test/badge.svg">
25+
</a>
26+
<img alt="Beta" src="https://img.shields.io/badge/status-beta-informational?logo=data:image/png;base64,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">
27+
</p>
28+
29+
<p align="center">
30+
<strong>
31+
<a href="CONTRIBUTING.md">Contributing<a/>
32+
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
33+
<a href="https://opentelemetry-python-contrib.readthedocs.io/en/stable/#examples">Examples<a/>
34+
</strong>
35+
</p>
36+
37+
---
38+
39+
## OpenTelemetry Python Contrib
40+
41+
The Python auto-instrumentation libraries for [OpenTelemetry](https://opentelemetry.io/) (per [OTEP 0001](https://github.com/open-telemetry/oteps/blob/main/text/0001-telemetry-without-manual-instrumentation.md))
542

643
### Installation
744

@@ -13,7 +50,7 @@ depend on `opentelemetry-sdk` or another package that implements the API.
1350
generally be used in production environments.
1451

1552
The
16-
[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation)
53+
[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation)
1754
directory includes OpenTelemetry instrumentation packages, which can be installed
1855
separately as:
1956

@@ -35,7 +72,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
3572

3673
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.
3774

38-
Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170).
75+
Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170). The passcode is _77777_.
3976

4077
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 [Gitter](https://gitter.im/open-telemetry/opentelemetry-python).
4178

@@ -47,14 +84,14 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
4784
- [Owais Lone](https://github.com/owais), Splunk
4885
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
4986

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

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

5491
- [Alex Boten](https://github.com/codeboten), Lightstep
5592
- [Leighton Chen](https://github.com/lzchen), Microsoft
5693

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

5996
## Running Tests Locally
6097

Diff for: ‎_template/setup.cfg

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

4848
install_requires =
49-
opentelemetry-api == 0.17.dev0
49+
opentelemetry-api == 0.18.dev0
5050

5151
[options.extras_require]
5252
test =

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.17.dev0"
15+
__version__ = "0.18.dev0"

Diff for: ‎docs-requirements.txt

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
sphinx~=2.4
2+
sphinx-rtd-theme~=0.4
3+
sphinx-autodoc-typehints~=1.10.2
4+
5+
# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
6+
# doesn't work for pkg_resources.
7+
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
8+
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
9+
10+
# Required by opentelemetry-instrumentation
11+
fastapi~=0.58.1
12+
psutil~=5.7.0
13+
pymemcache~=1.3
14+
15+
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
16+
17+
# Required by conf
18+
django>=2.2
19+
20+
# Required by instrumentation packages
21+
aiohttp~=3.0
22+
aiopg>=0.13.0
23+
asyncpg>=0.12.0
24+
boto~=2.0
25+
botocore~=1.0
26+
celery>=4.0
27+
flask~=1.0
28+
grpcio~=1.27
29+
mysql-connector-python~=8.0
30+
pymongo~=3.1
31+
PyMySQL~=0.9.3
32+
pyramid>=1.7
33+
redis>=2.6
34+
sqlalchemy>=1.0
35+
ddtrace>=0.34.0

Diff for: ‎docs/Makefile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
SOURCEDIR = .
8+
BUILDDIR = _build
9+
10+
# Put it first so that "make" without argument is like "make help".
11+
help:
12+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
13+
14+
.PHONY: help Makefile
15+
16+
# Catch-all target: route all unknown targets to Sphinx using the new
17+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
18+
%: Makefile
19+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

0 commit comments

Comments
 (0)