Merge branch 'main' into logs-attributes-typing

open-telemetry · Dec 12, 2024 · 66ec409 · 66ec409
2 parents 0aa6c02 + 35337ce
commit 66ec409
Show file tree

Hide file tree

Showing 32 changed files with 43 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add proper type for logs signal attributes
   ([#4342](https://github.com/open-telemetry/opentelemetry-python/pull/4342))
+
+## 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
@@ -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
@@ -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/...entelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py b/...entelemetry-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
@@ -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/...porter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py b/...porter-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
@@ -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/...y-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py b/...y-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
@@ -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/...y-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py b/...y-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
@@ -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
@@ -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
@@ -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/...entelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py b/...entelemetry-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/...telemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py b/...telemetry-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
@@ -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/...porter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py b/...porter-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py b/.../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/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}
 

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
@@ -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/...pentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py b/...pentelemetry-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
@@ -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
@@ -1 +1 @@
-__version__ = "0.50b0.dev"
+__version__ = "0.51b0.dev"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "0.50b0.dev"
		__version__ = "0.51b0.dev"