From 25d653233632d95f7b5b831a04aa22c643a2e22b Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Thu, 12 Dec 2024 05:00:40 -0600 Subject: [PATCH 1/3] Update version to 1.30.0.dev/0.51b0.dev (#4348) * Update version to 1.30.0.dev/0.51b0.dev * Update CONTRIB_REPO_SHA to opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev --------- Co-authored-by: Riccardo Magliocchetti --- .github/workflows/contrib.yml | 2 +- .github/workflows/lint_0.yml | 2 +- .github/workflows/misc_0.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- CHANGELOG.md | 2 ++ eachdist.ini | 4 ++-- exporter/opentelemetry-exporter-opencensus/pyproject.toml | 2 +- .../opentelemetry/exporter/opencensus/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-common/pyproject.toml | 2 +- .../exporter/otlp/proto/common/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-grpc/pyproject.toml | 6 +++--- .../exporter/otlp/proto/grpc/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-http/pyproject.toml | 6 +++--- .../exporter/otlp/proto/http/version/__init__.py | 2 +- exporter/opentelemetry-exporter-otlp/pyproject.toml | 4 ++-- .../src/opentelemetry/exporter/otlp/version/__init__.py | 2 +- exporter/opentelemetry-exporter-prometheus/pyproject.toml | 2 +- .../opentelemetry/exporter/prometheus/version/__init__.py | 2 +- .../opentelemetry/exporter/zipkin/json/version/__init__.py | 2 +- .../opentelemetry-exporter-zipkin-proto-http/pyproject.toml | 2 +- .../exporter/zipkin/proto/http/version/__init__.py | 2 +- exporter/opentelemetry-exporter-zipkin/pyproject.toml | 4 ++-- .../src/opentelemetry/exporter/zipkin/version/__init__.py | 2 +- opentelemetry-api/src/opentelemetry/version/__init__.py | 2 +- .../src/opentelemetry/proto/version/__init__.py | 2 +- opentelemetry-sdk/pyproject.toml | 4 ++-- opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py | 2 +- opentelemetry-semantic-conventions/pyproject.toml | 2 +- .../src/opentelemetry/semconv/version/__init__.py | 2 +- .../src/opentelemetry/propagators/b3/version/__init__.py | 2 +- .../opentelemetry/propagators/jaeger/version/__init__.py | 2 +- .../src/opentelemetry/shim/opencensus/version/__init__.py | 2 +- .../opentelemetry/shim/opentracing_shim/version/__init__.py | 2 +- tests/opentelemetry-test-utils/pyproject.toml | 4 ++-- .../src/opentelemetry/test/version/__init__.py | 2 +- 36 files changed, 46 insertions(+), 44 deletions(-) diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index 5552d6fe04d..581ff27fdd4 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -11,4 +11,4 @@ jobs: uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main with: CORE_REPO_SHA: ${{ github.sha }} - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 71b148c02d5..6c0da07dd74 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index c1ea218fd65..f7d3a2c1240 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index dfbced1b397..3d727948030 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 892039b33ec..6d5edc87690 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev PIP_EXISTS_ACTION: w jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 09ad03d8258..f8b1a254db0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## Version 1.29.0/0.50b0 (2024-12-11) + - Fix crash exporting a log record with None body ([#4276](https://github.com/open-telemetry/opentelemetry-python/pull/4276)) - Fix metrics export with exemplar and no context and filtering observable instruments diff --git a/eachdist.ini b/eachdist.ini index ba48854a923..5e70715b3d7 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -11,7 +11,7 @@ sortfirst= exporter/* [stable] -version=1.29.0.dev +version=1.30.0.dev packages= opentelemetry-sdk @@ -27,7 +27,7 @@ packages= opentelemetry-api [prerelease] -version=0.50b0.dev +version=0.51b0.dev packages= opentelemetry-opentracing-shim diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml index 2ee25fab539..d60d960d9fd 100644 --- a/exporter/opentelemetry-exporter-opencensus/pyproject.toml +++ b/exporter/opentelemetry-exporter-opencensus/pyproject.toml @@ -30,7 +30,7 @@ classifiers = [ dependencies = [ "grpcio >= 1.0.0, < 2.0.0", "opencensus-proto >= 0.1.0, < 1.0.0", - "opentelemetry-api >= 1.29.0.dev", + "opentelemetry-api >= 1.30.0.dev", "opentelemetry-sdk >= 1.15", "protobuf ~= 3.13", "setuptools >= 16.0", diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py index 0559ba62275..6e2923f0db0 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml index b3c0765559f..1cfe4173d44 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "opentelemetry-proto == 1.29.0.dev", + "opentelemetry-proto == 1.30.0.dev", ] [project.urls] diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml index 0e931b06c9c..75959c2de83 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml @@ -31,9 +31,9 @@ dependencies = [ "googleapis-common-protos ~= 1.52", "grpcio >= 1.63.2, < 2.0.0", "opentelemetry-api ~= 1.15", - "opentelemetry-proto == 1.29.0.dev", - "opentelemetry-sdk ~= 1.29.0.dev", - "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev", + "opentelemetry-proto == 1.30.0.dev", + "opentelemetry-sdk ~= 1.30.0.dev", + "opentelemetry-exporter-otlp-proto-common == 1.30.0.dev", ] [project.entry-points.opentelemetry_logs_exporter] diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml index 3e71211e857..5dedbf86ad0 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml @@ -30,9 +30,9 @@ dependencies = [ "Deprecated >= 1.2.6", "googleapis-common-protos ~= 1.52", "opentelemetry-api ~= 1.15", - "opentelemetry-proto == 1.29.0.dev", - "opentelemetry-sdk ~= 1.29.0.dev", - "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev", + "opentelemetry-proto == 1.30.0.dev", + "opentelemetry-sdk ~= 1.30.0.dev", + "opentelemetry-exporter-otlp-proto-common == 1.30.0.dev", "requests ~= 2.7", ] diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml index 3996f57dce3..3a6ae1127b4 100644 --- a/exporter/opentelemetry-exporter-otlp/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp/pyproject.toml @@ -28,8 +28,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-exporter-otlp-proto-grpc == 1.29.0.dev", - "opentelemetry-exporter-otlp-proto-http == 1.29.0.dev", + "opentelemetry-exporter-otlp-proto-grpc == 1.30.0.dev", + "opentelemetry-exporter-otlp-proto-http == 1.30.0.dev", ] [project.entry-points.opentelemetry_logs_exporter] diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml index 465115b8abb..b2fe51c3450 100644 --- a/exporter/opentelemetry-exporter-prometheus/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dependencies = [ "opentelemetry-api ~= 1.12", # DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release - "opentelemetry-sdk ~= 1.29.0.dev", + "opentelemetry-sdk ~= 1.30.0.dev", "prometheus_client >= 0.5.0, < 1.0.0", ] diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py index 0559ba62275..6e2923f0db0 100644 --- a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py +++ b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml index 51487a278e2..93f88de8697 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.3", - "opentelemetry-exporter-zipkin-json == 1.29.0.dev", + "opentelemetry-exporter-zipkin-json == 1.30.0.dev", "opentelemetry-sdk ~= 1.11", "protobuf ~= 3.12", "requests ~= 2.7", diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml index ce5163f65e1..611cc2f4656 100644 --- a/exporter/opentelemetry-exporter-zipkin/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin/pyproject.toml @@ -28,8 +28,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-exporter-zipkin-json == 1.29.0.dev", - "opentelemetry-exporter-zipkin-proto-http == 1.29.0.dev", + "opentelemetry-exporter-zipkin-json == 1.30.0.dev", + "opentelemetry-exporter-zipkin-proto-http == 1.30.0.dev", ] [project.entry-points.opentelemetry_traces_exporter] diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/opentelemetry-api/src/opentelemetry/version/__init__.py b/opentelemetry-api/src/opentelemetry/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/opentelemetry-api/src/opentelemetry/version/__init__.py +++ b/opentelemetry-api/src/opentelemetry/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py +++ b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml index 7d4f5cefba7..1d4f8072f6b 100644 --- a/opentelemetry-sdk/pyproject.toml +++ b/opentelemetry-sdk/pyproject.toml @@ -27,8 +27,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-api == 1.29.0.dev", - "opentelemetry-semantic-conventions == 0.50b0.dev", + "opentelemetry-api == 1.30.0.dev", + "opentelemetry-semantic-conventions == 0.51b0.dev", "typing-extensions >= 3.7.4", ] diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml index 279c368a273..c6da4234928 100644 --- a/opentelemetry-semantic-conventions/pyproject.toml +++ b/opentelemetry-semantic-conventions/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ - "opentelemetry-api == 1.29.0.dev", + "opentelemetry-api == 1.30.0.dev", "Deprecated >= 1.2.6", ] diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py index 0559ba62275..6e2923f0db0 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py +++ b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py index 68e87f6e791..89f248675e4 100644 --- a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py +++ b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.29.0.dev" +__version__ = "1.30.0.dev" diff --git a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py index 0559ba62275..6e2923f0db0 100644 --- a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py +++ b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py index 0559ba62275..6e2923f0db0 100644 --- a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py +++ b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml index b2a7d50504b..94ce7798973 100644 --- a/tests/opentelemetry-test-utils/pyproject.toml +++ b/tests/opentelemetry-test-utils/pyproject.toml @@ -27,8 +27,8 @@ classifiers = [ ] dependencies = [ "asgiref ~= 3.0", - "opentelemetry-api == 1.29.0.dev", - "opentelemetry-sdk == 1.29.0.dev", + "opentelemetry-api == 1.30.0.dev", + "opentelemetry-sdk == 1.30.0.dev", ] [project.urls] diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py index 9494b38d6de..2f75365f5d0 100644 --- a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py +++ b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py @@ -1 +1 @@ -__version__ = "0.50b0.dev" +__version__ = "0.51b0.dev" From d76a55c7103e7f42cbaf18a414910f4cd882ce4a Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Thu, 12 Dec 2024 14:56:02 +0100 Subject: [PATCH 2/3] Move CONTRIB_REPO_SHA back to main (#4355) --- .github/workflows/contrib.yml | 2 +- .github/workflows/lint_0.yml | 2 +- .github/workflows/misc_0.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index 581ff27fdd4..5552d6fe04d 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -11,4 +11,4 @@ jobs: uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main with: CORE_REPO_SHA: ${{ github.sha }} - CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev + CONTRIB_REPO_SHA: main diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 6c0da07dd74..71b148c02d5 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev + CONTRIB_REPO_SHA: main PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index f7d3a2c1240..c1ea218fd65 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev + CONTRIB_REPO_SHA: main PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 3d727948030..dfbced1b397 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev + CONTRIB_REPO_SHA: main PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 6d5edc87690..892039b33ec 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.30.0.dev-0.51b0.dev + CONTRIB_REPO_SHA: main PIP_EXISTS_ACTION: w jobs: From 35337ce6f58c28155ef31dbd44e6266671883c0c Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Thu, 12 Dec 2024 06:02:56 -0800 Subject: [PATCH 3/3] update weaver to 0.12.0 (#4354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> Co-authored-by: Riccardo Magliocchetti --- scripts/semconv/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index 637e077c85c..386fa0406af 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -7,7 +7,7 @@ ROOT_DIR="${SCRIPT_DIR}/../.." # freeze the spec version to make SemanticAttributes generation reproducible SEMCONV_VERSION=1.29.0 SEMCONV_VERSION_TAG=v$SEMCONV_VERSION -OTEL_WEAVER_IMG_VERSION=v0.10.0 +OTEL_WEAVER_IMG_VERSION=v0.12.0 INCUBATING_DIR=_incubating cd ${SCRIPT_DIR}