Skip to content

Commit 1168cd9

Browse files
tonycodytonycody
authored
Merge branch 'open-telemetry:main' into main
2 parents 8b95eb0 + b86a9a5 commit 1168cd9

File tree

100 files changed

+2080
-314
lines changed

Some content is hidden

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

100 files changed

+2080
-314
lines changed

‎.github/workflows/check-links.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: check-links
2+
on:
3+
push:
4+
branches: [ main ]
5+
pull_request:
6+
7+
jobs:
8+
changedfiles:
9+
name: changed files
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor != 'dependabot[bot]' }}
12+
outputs:
13+
md: ${{ steps.changes.outputs.md }}
14+
steps:
15+
- name: Checkout Repo
16+
uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 0
19+
- name: Get changed files
20+
id: changes
21+
run: |
22+
echo "::set-output name=md::$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)"
23+
check-links:
24+
runs-on: ubuntu-latest
25+
needs: changedfiles
26+
if: ${{needs.changedfiles.outputs.md}}
27+
steps:
28+
- name: Checkout Repo
29+
uses: actions/checkout@v3
30+
with:
31+
fetch-depth: 0
32+
33+
- name: Install markdown-link-check
34+
run: npm install -g markdown-link-check
35+
36+
- name: Run markdown-link-check
37+
run: |
38+
markdown-link-check \
39+
--verbose \
40+
--config .github/workflows/check_links_config.json \
41+
${{needs.changedfiles.outputs.md}} \
42+
|| { echo "Check that anchor links are lowercase"; exit 1; }

‎.github/workflows/check_links_config.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"ignorePatterns": [
3+
{
4+
"pattern": "http(s)?://\\d+\\.\\d+\\.\\d+\\.\\d+"
5+
},
6+
{
7+
"pattern": "http(s)?://localhost"
8+
},
9+
{
10+
"pattern": "http(s)?://example.com"
11+
}
12+
],
13+
"aliveStatusCodes": [429, 200]
14+
}

‎.github/workflows/test.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: 7b42e4354dc3244ef2878bfd0d7d4c80d25cba0a
13+
CONTRIB_REPO_SHA: 42ff80bef8a03ff214a54323a2631da06e6dc5e4
1414
# This is needed because we do not clone the core repo in contrib builds anymore.
1515
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
1616
# does not set an environment variable (simply just runs tox), which is different when
@@ -60,6 +60,9 @@ jobs:
6060
if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
6161
shell: pwsh
6262
run: Remove-Item .\.tox\ -Force -Recurse -ErrorAction Ignore
63+
- name: Windows does not let git check out files with long names
64+
if: ${{ matrix.os == 'windows-2019'}}
65+
run: git config --system core.longpaths true
6366
- name: run tox
6467
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
6568
- name: Find and merge benchmarks

‎CHANGELOG.md

+52-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,59 @@ 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.12.0rc1-0.31b0...HEAD)
9-
10-
## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17
8+
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc2-0.32b0...HEAD)
9+
10+
- Fix OTLP gRPC exporter warning message
11+
([#2781](https://github.com/open-telemetry/opentelemetry-python/pull/2781))
12+
- Fix tracing decorator with late configuration
13+
([#2754](https://github.com/open-telemetry/opentelemetry-python/pull/2754))
14+
15+
## [1.12.0rc2-0.32b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc2-0.32b0) - 2022-07-04
16+
17+
- Fix instrument name and unit regexes
18+
([#2796](https://github.com/open-telemetry/opentelemetry-python/pull/2796))
19+
- Add optional sessions parameter to all Exporters leveraging requests.Session
20+
([#2783](https://github.com/open-telemetry/opentelemetry-python/pull/2783)
21+
- Add min/max fields to Histogram
22+
([#2759](https://github.com/open-telemetry/opentelemetry-python/pull/2759))
23+
- `opentelemetry-exporter-otlp-proto-http` Add support for OTLP/HTTP log exporter
24+
([#2462](https://github.com/open-telemetry/opentelemetry-python/pull/2462))
25+
- Fix yield of `None`-valued points
26+
([#2745](https://github.com/open-telemetry/opentelemetry-python/pull/2745))
27+
- Add missing `to_json` methods
28+
([#2722](https://github.com/open-telemetry/opentelemetry-python/pull/2722)
29+
- Fix type hints for textmap `Getter` and `Setter`
30+
([#2657](https://github.com/open-telemetry/opentelemetry-python/pull/2657))
31+
- Fix LogEmitterProvider.force_flush hanging randomly
32+
([#2714](https://github.com/open-telemetry/opentelemetry-python/pull/2714))
33+
- narrow protobuf dependencies to exclude protobuf >= 4
34+
([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720))
35+
- Specify worker thread names
36+
([#2724](https://github.com/open-telemetry/opentelemetry-python/pull/2724))
37+
- Loosen dependency on `backoff` for newer Python versions
38+
([#2726](https://github.com/open-telemetry/opentelemetry-python/pull/2726))
39+
- fix: frozenset object has no attribute items
40+
([#2727](https://github.com/open-telemetry/opentelemetry-python/pull/2727))
41+
- fix: create suppress HTTP instrumentation key in opentelemetry context
42+
([#2729](https://github.com/open-telemetry/opentelemetry-python/pull/2729))
43+
- Support logs SDK auto instrumentation enable/disable with env
44+
([#2728](https://github.com/open-telemetry/opentelemetry-python/pull/2728))
45+
- fix: update entry point object references for metrics
46+
([#2731](https://github.com/open-telemetry/opentelemetry-python/pull/2731))
47+
- Allow set_status to accept the StatusCode and optional description
48+
([#2735](https://github.com/open-telemetry/opentelemetry-python/pull/2735))
49+
- Configure auto instrumentation to support metrics
50+
([#2705](https://github.com/open-telemetry/opentelemetry-python/pull/2705))
51+
- Add entrypoint for metrics exporter
52+
([#2748](https://github.com/open-telemetry/opentelemetry-python/pull/2748))
53+
- Fix Jaeger propagator usage with NonRecordingSpan
54+
([#2762](https://github.com/open-telemetry/opentelemetry-python/pull/2762))
55+
- Add `opentelemetry.propagate` module and `opentelemetry.propagators` package
56+
to the API reference documentation
57+
([#2785](https://github.com/open-telemetry/opentelemetry-python/pull/2785))
1158

1259

60+
## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17
1361

1462
- Fix LoggingHandler to handle LogRecord with exc_info=False
1563
([#2690](https://github.com/open-telemetry/opentelemetry-python/pull/2690))
@@ -90,7 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
90138
pages that have moved, see
91139
[#2453](https://github.com/open-telemetry/opentelemetry-python/pull/2453), and
92140
[#2498](https://github.com/open-telemetry/opentelemetry-python/pull/2498).
93-
- `opentelemetry-exporter-otlp-grpc` update SDK dependency to ~1.9.
141+
- `opentelemetry-exporter-otlp-proto-grpc` update SDK dependency to ~1.9.
94142
([#2442](https://github.com/open-telemetry/opentelemetry-python/pull/2442))
95143
- bugfix(auto-instrumentation): attach OTLPHandler to root logger
96144
([#2450](https://github.com/open-telemetry/opentelemetry-python/pull/2450))

‎README.md

+16-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
<p align="center">
44
<strong>
5-
<a href="https://opentelemetry-python.readthedocs.io/en/stable/getting-started.html">Getting Started<a/>
5+
<a href="https://opentelemetry.io/docs/instrumentation/python/getting-started/">Getting Started<a/>
66
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
77
<a href="https://opentelemetry-python.readthedocs.io/">API Documentation<a/>
88
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
@@ -136,10 +136,17 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
136136
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
137137

138138
- [Aaron Abbott](https://github.com/aabmass), Google
139-
- [Alex Boten](https://github.com/codeboten), Lightstep
140139
- [Owais Lone](https://github.com/owais), Splunk
141140
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
142141

142+
Emeritus Approvers
143+
144+
- [Carlos Alberto Cortez](https://github.com/carlosalberto), Lightstep
145+
- [Christian Neumüller](https://github.com/Oberon00), Dynatrace
146+
- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
147+
- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
148+
- [Tahir H. Butt](https://github.com/majorgreys) DataDog
149+
143150
*For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
144151

145152
Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
@@ -148,6 +155,13 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
148155
- [Leighton Chen](https://github.com/lzchen), Microsoft
149156
- [Srikanth Chekuri](https://github.com/srikanthccv)
150157

158+
Emeritus Maintainers:
159+
160+
- [Alex Boten](https://github.com/codeboten), Lightstep
161+
- [Chris Kleinknecht](https://github.com/c24t), Google
162+
- [Reiley Yang](https://github.com/reyang), Microsoft
163+
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
164+
151165
*For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
152166

153167
### Thanks to all the people who already contributed!

‎docs/api/index.rst

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ OpenTelemetry Python API
88

99
baggage
1010
context
11+
propagate
12+
propagators
1113
trace
1214
metrics
1315
environment_variables

‎docs/api/propagate.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.propagate package
2+
========================================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: opentelemetry.propagate

‎docs/api/propagators.composite.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.propagators.composite
2+
====================================================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: opentelemetry.propagators.composite

‎docs/api/propagators.rst

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
opentelemetry.propagators package
2+
========================================
3+
4+
Subpackages
5+
-----------
6+
7+
.. toctree::
8+
9+
propagators.textmap
10+
propagators.composite

‎docs/api/propagators.textmap.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.propagators.textmap
2+
====================================================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: opentelemetry.propagators.textmap

‎docs/conf.py

+3-17
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
# https://github.com/sphinx-doc/sphinx/pull/3744
9898
nitpick_ignore = [
9999
("py:class", "ValueT"),
100+
("py:class", "CarrierT"),
101+
("py:obj", "opentelemetry.propagators.textmap.CarrierT"),
102+
("py:obj", "Union"),
100103
(
101104
"py:class",
102105
"opentelemetry.sdk.metrics._internal.instrument._Synchronous",
@@ -112,23 +115,6 @@
112115
"py:class",
113116
"opentelemetry.trace._LinkBase",
114117
),
115-
# TODO: Understand why sphinx is not able to find this local class
116-
(
117-
"py:class",
118-
"opentelemetry.propagators.textmap.TextMapPropagator",
119-
),
120-
(
121-
"py:class",
122-
"opentelemetry.propagators.textmap.DefaultGetter",
123-
),
124-
(
125-
"any",
126-
"opentelemetry.propagators.textmap.TextMapPropagator.extract",
127-
),
128-
(
129-
"any",
130-
"opentelemetry.propagators.textmap.TextMapPropagator.inject",
131-
),
132118
]
133119

134120
# Add any paths that contain templates here, relative to this directory.

‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.12.0rc1
14+
version=1.12.0rc2
1515

1616
packages=
1717
opentelemetry-sdk
@@ -30,7 +30,7 @@ packages=
3030
opentelemetry-api
3131

3232
[prerelease]
33-
version=0.31b0
33+
version=0.32b0
3434

3535
packages=
3636
opentelemetry-opentracing-shim

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ package_dir=
4242
packages=find_namespace:
4343
install_requires =
4444
grpcio >= 1.0.0, < 2.0.0
45-
googleapis-common-protos ~= 1.52
45+
googleapis-common-protos ~= 1.52, < 1.56.3
4646
opentelemetry-api ~= 1.3
4747
opentelemetry-sdk ~= 1.11
4848

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py

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

16-
__version__ = "1.12.0rc1"
16+
__version__ = "1.12.0rc2"

‎exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py

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

16-
__version__ = "1.12.0rc1"
16+
__version__ = "1.12.0rc2"

‎exporter/opentelemetry-exporter-jaeger/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ package_dir=
4141
=src
4242
packages=find_namespace:
4343
install_requires =
44-
opentelemetry-exporter-jaeger-proto-grpc == 1.12.0rc1
45-
opentelemetry-exporter-jaeger-thrift == 1.12.0rc1
44+
opentelemetry-exporter-jaeger-proto-grpc == 1.12.0rc2
45+
opentelemetry-exporter-jaeger-thrift == 1.12.0rc2
4646

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

‎exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py

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

16-
__version__ = "1.12.0rc1"
16+
__version__ = "1.12.0rc2"

‎exporter/opentelemetry-exporter-opencensus/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ install_requires =
4545
opencensus-proto >= 0.1.0, < 1.0.0
4646
opentelemetry-api ~= 1.3
4747
opentelemetry-sdk ~= 1.3
48-
protobuf >= 3.13.0
48+
protobuf ~= 3.13
4949
setuptools >= 16.0
5050

5151
[options.packages.find]

‎exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/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.31b0"
15+
__version__ = "0.32b0"

‎exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg

+5-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ install_requires =
4444
googleapis-common-protos ~= 1.52
4545
opentelemetry-api ~= 1.3
4646
opentelemetry-sdk ~= 1.11
47-
opentelemetry-proto == 1.12.0rc1
48-
backoff >= 1.10.0, < 2.0.0
47+
opentelemetry-proto == 1.12.0rc2
48+
backoff >= 1.10.0, < 2.0.0; python_version<'3.7'
49+
backoff >= 1.10.0, < 3.0.0; python_version>='3.7'
4950

5051
[options.extras_require]
5152
test =
@@ -57,5 +58,7 @@ where = src
5758
[options.entry_points]
5859
opentelemetry_traces_exporter =
5960
otlp_proto_grpc = opentelemetry.exporter.otlp.proto.grpc.trace_exporter:OTLPSpanExporter
61+
opentelemetry_metrics_exporter =
62+
otlp_proto_grpc = opentelemetry.exporter.otlp.proto.grpc.metric_exporter:OTLPMetricExporter
6063
opentelemetry_logs_exporter =
6164
otlp_proto_grpc = opentelemetry.exporter.otlp.proto.grpc._log_exporter:OTLPLogExporter

‎exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_log_exporter/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,7 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
154154

155155
def shutdown(self) -> None:
156156
pass
157+
158+
@property
159+
def _exporting(self) -> str:
160+
return "logs"

0 commit comments

Comments
 (0)