Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.25.x-0.46bx] Prepare release 1.25.0/0.46b0 #3942

Merged
merged 4 commits into from
May 30, 2024
Merged

[release/v1.25.x-0.46bx] Prepare release 1.25.0/0.46b0 #3942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
555830c
Prepare release 1.25.0/0.46b0
opentelemetrybot May 30, 2024
caebf98
Update test.yml
lzchen May 30, 2024
c640e3f
Update CHANGELOG.md
lzchen May 30, 2024
6faec80
Update CHANGELOG.md
lzchen May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# Otherwise, set variable to the commit of your branch on
# opentelemetry-python-contrib which is compatible with these Core repo
# changes.
CONTRIB_REPO_SHA: 9ce1c26d2732dfbdadbb492fc38c562dcd08ed2e
CONTRIB_REPO_SHA: 4a00f7b2b49df7e71e613d0a98bed97337623d79

# This is needed because we do not clone the core repo in contrib builds anymore.
# When running contrib builds as part of core builds, we use actions/checkout@v4 which
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
## Version 1.25.0/0.46b0 (2024-05-30)

- Fix class BoundedAttributes to have RLock rather than Lock
([#3859](https://github.com/open-telemetry/opentelemetry-python/pull/3859))
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sortfirst=
exporter/*

[stable]
version=1.25.0.dev
version=1.25.0

packages=
opentelemetry-sdk
Expand All @@ -27,7 +27,7 @@ packages=
opentelemetry-api

[prerelease]
version=0.46b0.dev
version=0.46b0

packages=
opentelemetry-opentracing-shim
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-opencensus/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ classifiers = [
dependencies = [
"grpcio >= 1.0.0, < 2.0.0",
"opencensus-proto >= 0.1.0, < 1.0.0",
"opentelemetry-api >= 1.25.0.dev",
"opentelemetry-api >= 1.25.0",
"opentelemetry-sdk >= 1.15",
"protobuf ~= 3.13",
"setuptools >= 16.0",
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.46b0.dev"
__version__ = "0.46b0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-proto == 1.25.0.dev",
"opentelemetry-proto == 1.25.0",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
6 changes: 3 additions & 3 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ dependencies = [
"googleapis-common-protos ~= 1.52",
"grpcio >= 1.0.0, < 2.0.0",
"opentelemetry-api ~= 1.15",
"opentelemetry-proto == 1.25.0.dev",
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
"opentelemetry-proto == 1.25.0",
"opentelemetry-sdk ~= 1.25.0",
"opentelemetry-exporter-otlp-proto-common == 1.25.0",
]

[project.entry-points.opentelemetry_logs_exporter]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
6 changes: 3 additions & 3 deletions exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ dependencies = [
"Deprecated >= 1.2.6",
"googleapis-common-protos ~= 1.52",
"opentelemetry-api ~= 1.15",
"opentelemetry-proto == 1.25.0.dev",
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
"opentelemetry-proto == 1.25.0",
"opentelemetry-sdk ~= 1.25.0",
"opentelemetry-exporter-otlp-proto-common == 1.25.0",
"requests ~= 2.7",
]

Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-otlp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ classifiers = [
"Typing :: Typed",
]
dependencies = [
"opentelemetry-exporter-otlp-proto-grpc == 1.25.0.dev",
"opentelemetry-exporter-otlp-proto-http == 1.25.0.dev",
"opentelemetry-exporter-otlp-proto-grpc == 1.25.0",
"opentelemetry-exporter-otlp-proto-http == 1.25.0",
]

[project.entry-points.opentelemetry_logs_exporter]
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ classifiers = [
dependencies = [
"opentelemetry-api ~= 1.12",
# DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-sdk ~= 1.25.0",
"prometheus_client >= 0.5.0, < 1.0.0",
]

Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.46b0.dev"
__version__ = "0.46b0"
2 changes: 1 addition & 1 deletion ...rter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.3",
"opentelemetry-exporter-zipkin-json == 1.25.0.dev",
"opentelemetry-exporter-zipkin-json == 1.25.0",
"opentelemetry-sdk ~= 1.11",
"protobuf ~= 3.12",
"requests ~= 2.7",
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ classifiers = [
"Typing :: Typed",
]
dependencies = [
"opentelemetry-exporter-zipkin-json == 1.25.0.dev",
"opentelemetry-exporter-zipkin-proto-http == 1.25.0.dev",
"opentelemetry-exporter-zipkin-json == 1.25.0",
"opentelemetry-exporter-zipkin-proto-http == 1.25.0",
]

[project.entry-points.opentelemetry_traces_exporter]
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion opentelemetry-api/src/opentelemetry/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion opentelemetry-proto/src/opentelemetry/proto/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
4 changes: 2 additions & 2 deletions opentelemetry-sdk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
"Typing :: Typed",
]
dependencies = [
"opentelemetry-api == 1.25.0.dev",
"opentelemetry-semantic-conventions == 0.46b0.dev",
"opentelemetry-api == 1.25.0",
"opentelemetry-semantic-conventions == 0.46b0",
"typing-extensions >= 3.7.4",
]

Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
]

dependencies = [
"opentelemetry-api == 1.25.0.dev",
"opentelemetry-api == 1.25.0",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.46b0.dev"
__version__ = "0.46b0"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.25.0.dev"
__version__ = "1.25.0"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.46b0.dev"
__version__ = "0.46b0"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.46b0.dev"
__version__ = "0.46b0"
4 changes: 2 additions & 2 deletions tests/opentelemetry-test-utils/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ classifiers = [
]
dependencies = [
"asgiref ~= 3.0",
"opentelemetry-api == 1.25.0.dev",
"opentelemetry-sdk == 1.25.0.dev",
"opentelemetry-api == 1.25.0",
"opentelemetry-sdk == 1.25.0",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion tests/opentelemetry-test-utils/src/opentelemetry/test/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.46b0.dev"
__version__ = "0.46b0"
Loading