Skip to content

Commit 5b7b195

Browse files
srikanthccvsrikanthccv
authored
Merge branch 'main' into main
2 parents 426abef + 5ff9046 commit 5b7b195

File tree

60 files changed

+482
-127
lines changed

Some content is hidden

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

60 files changed

+482
-127
lines changed

‎.github/workflows/test.yml

+2-2
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: 9a7c2f7ba16669d00be273aa9e988af0df7aba4c
13+
CONTRIB_REPO_SHA: 3c2788469834aa4f5976e1644d757f43d60bc219
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
@@ -176,7 +176,7 @@ jobs:
176176
- "tornado"
177177
- "tortoiseorm"
178178
- "urllib"
179-
- "urllib3v"
179+
- "urllib3"
180180
- "wsgi"
181181
- "prometheus-remote-write"
182182
- "richconsole"

‎CHANGELOG.md

+37
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- Retain meaningful logrecord attributes and apply log-message formatting
1111
([#3673](https://github.com/open-telemetry/opentelemetry-python/pull/3673))
12+
13+
## Version 1.24.0/0.45b0 (2024-03-28)
14+
15+
- Make create_gauge non-abstract method
16+
([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
1217
- Make `tracer.start_as_current_span()` decorator work with async functions
1318
([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
1419
- Fix python 3.12 deprecation warning
1520
([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
21+
- Add to_json method to ExponentialHistogram
22+
([#3780](https://github.com/open-telemetry/opentelemetry-python/pull/3780))
1623
- bump mypy to 0.982
1724
([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
25+
- Add support for OTEL_SDK_DISABLED environment variable
26+
([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
1827
- Fix ValueError message for PeriodicExportingMetricsReader
1928
([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
29+
- Use `BaseException` instead of `Exception` in `record_exception`
30+
([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
31+
- Make span.record_exception more robust
32+
([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
33+
- Fix license field in pyproject.toml files
34+
([#3803](https://github.com/open-telemetry/opentelemetry-python/pull/3803))
35+
- Bump mypy to 1.9.0
36+
([#3795](https://github.com/open-telemetry/opentelemetry-python/pull/3795))
2037

2138
## Version 1.23.0/0.44b0 (2024-02-23)
2239

@@ -1492,3 +1509,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
14921509
- Remove dependency on 'backoff' library
14931510
([#3679](https://github.com/open-telemetry/opentelemetry-python/pull/3679))
14941511

1512+
1513+
- Make create_gauge non-abstract method
1514+
([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
1515+
- Make `tracer.start_as_current_span()` decorator work with async functions
1516+
([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
1517+
- Fix python 3.12 deprecation warning
1518+
([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
1519+
- bump mypy to 0.982
1520+
([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
1521+
- Add support for OTEL_SDK_DISABLED environment variable
1522+
([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
1523+
- Fix ValueError message for PeriodicExportingMetricsReader
1524+
([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
1525+
- Use `BaseException` instead of `Exception` in `record_exception`
1526+
([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
1527+
- Make span.record_exception more robust
1528+
([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
1529+
- Fix license field in pyproject.toml files
1530+
([#3803](https://github.com/open-telemetry/opentelemetry-python/pull/3803))
1531+

‎dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ flake8==6.1.0
33
isort==5.12.0
44
black==22.3.0
55
httpretty==1.1.4
6-
mypy==0.982
6+
mypy==1.9.0
77
sphinx==7.1.2
88
sphinx-rtd-theme==2.0.0rc4
99
sphinx-autodoc-typehints==1.25.2

‎docs/examples/error_handler/error_handler_0/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "error-handler-0"
77
dynamic = ["version"]
88
description = "This is just an error handler example package"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },

‎docs/examples/error_handler/error_handler_1/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "error-handler-1"
77
dynamic = ["version"]
88
description = "This is just an error handler example package"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },

‎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.24.0.dev
14+
version=1.25.0.dev
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.45b0.dev
30+
version=0.46b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim

‎exporter/opentelemetry-exporter-opencensus/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-opencensus"
77
dynamic = ["version"]
88
description = "OpenCensus Exporter"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"grpcio >= 1.0.0, < 2.0.0",
2929
"opencensus-proto >= 0.1.0, < 1.0.0",
30-
"opentelemetry-api >= 1.24.0.dev",
30+
"opentelemetry-api >= 1.25.0.dev",
3131
"opentelemetry-sdk >= 1.15",
3232
"protobuf ~= 3.13",
3333
"setuptools >= 16.0",

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-common"
77
dynamic = ["version"]
88
description = "OpenTelemetry Protobuf encoding"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -24,7 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.11",
2525
]
2626
dependencies = [
27-
"opentelemetry-proto == 1.24.0.dev",
27+
"opentelemetry-proto == 1.25.0.dev",
2828
]
2929

3030
[project.urls]

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-grpc"
77
dynamic = ["version"]
88
description = "OpenTelemetry Collector Protobuf over gRPC Exporter"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -28,9 +28,9 @@ dependencies = [
2828
"googleapis-common-protos ~= 1.52",
2929
"grpcio >= 1.0.0, < 2.0.0",
3030
"opentelemetry-api ~= 1.15",
31-
"opentelemetry-proto == 1.24.0.dev",
32-
"opentelemetry-sdk ~= 1.24.0.dev",
33-
"opentelemetry-exporter-otlp-proto-common == 1.24.0.dev",
31+
"opentelemetry-proto == 1.25.0.dev",
32+
"opentelemetry-sdk ~= 1.25.0.dev",
33+
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
3434
]
3535

3636
[project.optional-dependencies]

‎exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-http"
77
dynamic = ["version"]
88
description = "OpenTelemetry Collector Protobuf over HTTP Exporter"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -27,9 +27,9 @@ dependencies = [
2727
"Deprecated >= 1.2.6",
2828
"googleapis-common-protos ~= 1.52",
2929
"opentelemetry-api ~= 1.15",
30-
"opentelemetry-proto == 1.24.0.dev",
31-
"opentelemetry-sdk ~= 1.24.0.dev",
32-
"opentelemetry-exporter-otlp-proto-common == 1.24.0.dev",
30+
"opentelemetry-proto == 1.25.0.dev",
31+
"opentelemetry-sdk ~= 1.25.0.dev",
32+
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
3333
"requests ~= 2.7",
3434
]
3535

‎exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-otlp/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp"
77
dynamic = ["version"]
88
description = "OpenTelemetry Collector Exporters"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -25,8 +25,8 @@ classifiers = [
2525
"Typing :: Typed",
2626
]
2727
dependencies = [
28-
"opentelemetry-exporter-otlp-proto-grpc == 1.24.0.dev",
29-
"opentelemetry-exporter-otlp-proto-http == 1.24.0.dev",
28+
"opentelemetry-exporter-otlp-proto-grpc == 1.25.0.dev",
29+
"opentelemetry-exporter-otlp-proto-http == 1.25.0.dev",
3030
]
3131

3232
[project.entry-points.opentelemetry_logs_exporter]

‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-prometheus/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-prometheus"
77
dynamic = ["version"]
88
description = "Prometheus Metric Exporter for OpenTelemetry"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -26,7 +26,7 @@ classifiers = [
2626
dependencies = [
2727
"opentelemetry-api ~= 1.12",
2828
# DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
29-
"opentelemetry-sdk ~= 1.24.0.dev",
29+
"opentelemetry-sdk ~= 1.25.0.dev",
3030
"prometheus_client >= 0.5.0, < 1.0.0",
3131
]
3232

‎exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎exporter/opentelemetry-exporter-zipkin-json/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin-json"
77
dynamic = ["version"]
88
description = "Zipkin Span JSON Exporter for OpenTelemetry"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },

‎exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin-proto-http"
77
dynamic = ["version"]
88
description = "Zipkin Span Protobuf Exporter for OpenTelemetry"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -26,7 +26,7 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.3",
29-
"opentelemetry-exporter-zipkin-json == 1.24.0.dev",
29+
"opentelemetry-exporter-zipkin-json == 1.25.0.dev",
3030
"opentelemetry-sdk ~= 1.11",
3131
"protobuf ~= 3.12",
3232
"requests ~= 2.7",

‎exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎exporter/opentelemetry-exporter-zipkin/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin"
77
dynamic = ["version"]
88
description = "Zipkin Span Exporters for OpenTelemetry"
99
readme = "README.rst"
10-
license = "Apache-2.0"
10+
license = {text = "Apache-2.0"}
1111
requires-python = ">=3.8"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "[email protected]" },
@@ -25,8 +25,8 @@ classifiers = [
2525
"Typing :: Typed",
2626
]
2727
dependencies = [
28-
"opentelemetry-exporter-zipkin-json == 1.24.0.dev",
29-
"opentelemetry-exporter-zipkin-proto-http == 1.24.0.dev",
28+
"opentelemetry-exporter-zipkin-json == 1.25.0.dev",
29+
"opentelemetry-exporter-zipkin-proto-http == 1.25.0.dev",
3030
]
3131

3232
[project.entry-points.opentelemetry_traces_exporter]

‎exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/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__ = "1.24.0.dev"
15+
__version__ = "1.25.0.dev"

‎opentelemetry-api/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
66
name = "opentelemetry-api"
77
description = "OpenTelemetry Python API"
88
readme = "README.rst"
9-
license = "Apache-2.0"
9+
license = {text = "Apache-2.0"}
1010
requires-python = ">=3.8"
1111
authors = [
1212
{ name = "OpenTelemetry Authors", email = "[email protected]" },

‎opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ def get_logger(
193193
schema_url: Optional[str] = None,
194194
) -> Logger:
195195
"""Returns a NoOpLogger."""
196-
super().get_logger(name, version=version, schema_url=schema_url)
197196
return NoOpLogger(name, version=version, schema_url=schema_url)
198197

199198

0 commit comments

Comments
 (0)