Skip to content

Commit dbf0126

Browse files
pridhi-arorapridhi-arora
authored
Merge branch 'main' into grpc
2 parents b71fdbb + e4a4410 commit dbf0126

File tree

63 files changed

+1719
-4630
lines changed

Some content is hidden

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

63 files changed

+1719
-4630
lines changed

‎.codespellrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[codespell]
22
# skipping auto generated folders
3-
skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv
3+
skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv,.git
44
ignore-words-list = ans,ue,ot,hist,ro

‎.flake8‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
[flake8]
22
ignore =
3-
E501 # line too long, defer to black
4-
W503 # allow line breaks before binary ops
5-
W504 # allow line breaks after binary ops
6-
E203 # allow whitespace before ':' (https://github.com/psf/black#slices)
3+
# line too long, defer to black
4+
E501
5+
6+
# allow line breaks before binary ops
7+
W503
8+
9+
# allow line breaks after binary ops
10+
W504
11+
12+
# allow whitespace before ':' (https://github.com/psf/black#slices)
13+
E203
14+
715
exclude =
816
.bzr
917
.git

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
strategy:
8888
fail-fast: false
8989
matrix:
90-
tox-environment: [ "docker-tests", "lint", "spellcheck", "docs", "mypy", "mypyinstalled", "tracecontext" ]
90+
tox-environment: [ "docker-tests-proto3", "docker-tests-proto4", "lint", "spellcheck", "docs", "mypy", "mypyinstalled", "tracecontext" ]
9191
name: ${{ matrix.tox-environment }}
9292
runs-on: ubuntu-20.04
9393
steps:

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Regenerate opentelemetry-proto to be compatible with protobuf 3 and 4
11+
([#3070](https://github.com/open-telemetry/opentelemetry-python/pull/3070))
12+
- Rename parse_headers to parse_env_headers and improve error message
13+
([#2376](https://github.com/open-telemetry/opentelemetry-python/pull/2376))
14+
- Add url decode values from OTEL_RESOURCE_ATTRIBUTES
15+
([#3046](https://github.com/open-telemetry/opentelemetry-python/pull/3046))
1016
- Fixed circular dependency issue with custom samplers
1117
([#3026](https://github.com/open-telemetry/opentelemetry-python/pull/3026))
1218
- Add missing entry points for OTLP/HTTP exporter
1319
([#3027](https://github.com/open-telemetry/opentelemetry-python/pull/3027))
20+
- Update logging to include logging api as per specification
21+
([#3038](https://github.com/open-telemetry/opentelemetry-python/pull/3038))
1422
- Fix: Avoid generator in metrics _ViewInstrumentMatch.collect()
1523
([#3035](https://github.com/open-telemetry/opentelemetry-python/pull/3035)
1624
- [exporter-otlp-proto-grpc] add user agent string

‎dev-requirements.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ sphinx-autodoc-typehints~=1.12.0
1010
pytest==7.1.3
1111
pytest-cov>=2.8
1212
readme-renderer~=24.0
13-
grpcio-tools~=1.41.0
13+
# This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with
14+
# both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123).
15+
# Bump this version with caution to preserve compatibility with protobuf 3.
16+
# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28
17+
grpcio-tools==1.48.1
1418
mypy-protobuf~=3.0.0
15-
protobuf~=3.18.1
1619
# temporary fix. we should update the jinja, flask deps
1720
# See https://github.com/pallets/markupsafe/issues/282
1821
# breaking change introduced in markupsafe causes jinja, flask to break

‎docs-requirements.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ wrapt>=1.0.0,<2.0.0
2323
# See https://github.com/pallets/markupsafe/issues/282
2424
# breaking change introduced in markupsafe causes jinja, flask to break
2525
markupsafe==2.0.1
26+
27+
# Jaeger generated protobufs do not currently support protobuf 4.x. This can be removed once
28+
# they're regenerated.
29+
protobuf~=3.19

‎docs/api/_logs.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
opentelemetry._logs package
2+
=============================
3+
4+
Submodules
5+
----------
6+
7+
.. toctree::
8+
9+
_logs.severity
10+
11+
Module contents
12+
---------------
13+
14+
.. automodule:: opentelemetry._logs

‎docs/api/_logs.severity.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
opentelemetry._logs.severity
2+
============================
3+
4+
.. automodule:: opentelemetry._logs.severity

‎docs/api/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ OpenTelemetry Python API
66
.. toctree::
77
:maxdepth: 1
88

9+
_logs
910
baggage
1011
context
1112
propagate

‎docs/sdk/_logs.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.sdk._logs package
2+
===============================
3+
4+
.. automodule:: opentelemetry.sdk._logs
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

0 commit comments

Comments
 (0)