Skip to content

Commit aff87a7

Browse files
aabmasslzchenalrexchalinrobertsben
authored
Merge main into metrics_new (#2250)
* updating changelogs and version to 1.6.1-0.25b1 (#2223) * default value is invalid, was renamed (#2226) * Website: support GH page links to canonical src, and aliases (#2224) * Fix opentracing shim references (#2180) * Prepare release v1.6.2 and 0.25b2 (#2230) * update changelog to note the rename of entrypoints in 1.6.0 (#2228) * add note about proto version to README.rst (#2232) * ReadableSpan events and links now return a tuple (#2215) * ReadableSpan events and links now return a tuple Removed MappingProxy since events and links are not mappings Signed-off-by: Ted Kern <tkern@arnatious.com> * fix lint Signed-off-by: Ted Kern <tkern@arnatious.com> * fix lint * fix lint Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: Leighton Chen <lechen@microsoft.com> * adding CI testing for python 3.10 (#2207) * remove `X-B3-ParentSpanId` for B3 propagator as per OpenTelemetry Specification (#2237) * remove X-B3-ParentSpanId for B3 propagator as per OpenTelemetry specification * revert changes - run tests * re-commit changes * add entry to CHANGELOG * remove ParentSpanId in B3SingleFormat * Remove lingering distro pkg files (#2241) Co-authored-by: Leighton Chen <lechen@microsoft.com> Co-authored-by: alrex <aboten@lightstep.com> Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com> Co-authored-by: Ben Roberts <robertsben@users.noreply.github.com> Co-authored-by: Owais Lone <owais@users.noreply.github.com> Co-authored-by: Ted Kern <tkern@arnatious.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: James <45812677+JamesJHPark@users.noreply.github.com> Co-authored-by: (Eliseo) Nathaniel Ruiz Nowell <nathanielruiz98@gmail.com>
1 parent ef978ad commit aff87a7

27 files changed

Lines changed: 55 additions & 47 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ jobs:
2727
py37: 3.7
2828
py38: 3.8
2929
py39: 3.9
30+
py310: "3.10"
3031
pypy3: pypy-3.7
3132
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
3233
runs-on: ${{ matrix.os }}
3334
strategy:
3435
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
3536
matrix:
36-
python-version: [ py36, py37, py38, py39, pypy3 ]
37+
python-version: [ py36, py37, py38, py39, py310, pypy3 ]
3738
package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
3839
os: [ ubuntu-20.04, windows-2019 ]
3940
steps:

‎CHANGELOG.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.1-0.25b1...HEAD)
88

9+
- Add support for Python 3.10
10+
([#2207](https://github.com/open-telemetry/opentelemetry-python/pull/2207))
11+
- remove `X-B3-ParentSpanId` for B3 propagator as per OpenTelemetry specification
12+
([#2237](https://github.com/open-telemetry/opentelemetry-python/pull/2237))
13+
- Return proxy instruments from ProxyMeter
14+
([#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169))
15+
- Make Measurement a concrete class
16+
([#2153](https://github.com/open-telemetry/opentelemetry-python/pull/2153))
17+
- Add metrics API
18+
([#1887](https://github.com/open-telemetry/opentelemetry-python/pull/1887))
19+
920
## [1.6.2-0.25b2](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.2-0.25b2) - 2021-10-19
1021

1122
## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18
@@ -16,12 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1627
([#2201](https://github.com/open-telemetry/opentelemetry-python/pull/2201))
1728
- Propagation: only warn about oversized baggage headers when headers exist
1829
([#2212](https://github.com/open-telemetry/opentelemetry-python/pull/2212))
19-
- Return proxy instruments from ProxyMeter
20-
([#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169))
21-
- Make Measurement a concrete class
22-
([#2153](https://github.com/open-telemetry/opentelemetry-python/pull/2153))
23-
- Add metrics API
24-
([#1887](https://github.com/open-telemetry/opentelemetry-python/pull/1887))
2530
- Fix parental trace relationship for opentracing `follows_from` reference
2631
([#2180](https://github.com/open-telemetry/opentelemetry-python/pull/2180))
2732

‎docs/examples/error_handler/error_handler_0/setup.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ classifiers =
2929
Programming Language :: Python :: 3.7
3030
Programming Language :: Python :: 3.8
3131
Programming Language :: Python :: 3.9
32+
Programming Language :: Python :: 3.10
3233

3334
[options]
3435
python_requires = >=3.6

‎docs/examples/error_handler/error_handler_1/setup.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ classifiers =
2929
Programming Language :: Python :: 3.7
3030
Programming Language :: Python :: 3.8
3131
Programming Language :: Python :: 3.9
32+
Programming Language :: Python :: 3.10
3233

3334
[options]
3435
python_requires = >=3.6

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536
Typing :: Typed
3637

3738
[options]

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/gen/collector_pb2.py‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536
Typing :: Typed
3637

3738
[options]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536
Typing :: Typed
3637

3738
[options]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536
Typing :: Typed
3637

3738
[options]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536

3637
[options]
3738
python_requires = >=3.6

0 commit comments

Comments
 (0)