Merge branch 'main' into main

Author: pmcollins

.github/workflows/test.yml

@@ -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: 9a7c2f7ba16669d00be273aa9e988af0df7aba4c
+  CONTRIB_REPO_SHA: 3c2788469834aa4f5976e1644d757f43d60bc219
   # 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@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -176,7 +176,7 @@ jobs:
           - "tornado"
           - "tortoiseorm"
           - "urllib"
-          - "urllib3v"
+          - "urllib3"
           - "wsgi"
           - "prometheus-remote-write"
           - "richconsole"

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.24.0/0.45b0 (2024-03-28)
+
+- Make create_gauge non-abstract method
+  ([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
 - Make `tracer.start_as_current_span()` decorator work with async functions
   ([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
 - Fix python 3.12 deprecation warning
@@ -17,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
 - Fix ValueError message for PeriodicExportingMetricsReader
   ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
+- Use `BaseException` instead of `Exception` in `record_exception`
+  ([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
 - Make span.record_exception more robust
   ([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
 - Fix license field in pyproject.toml files
@@ -1496,3 +1502,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove dependency on 'backoff' library
   ([#3679](https://github.com/open-telemetry/opentelemetry-python/pull/3679))
 
+
+- Make create_gauge non-abstract method
+  ([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
+- Make `tracer.start_as_current_span()` decorator work with async functions
+  ([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
+- Fix python 3.12 deprecation warning
+  ([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
+- bump mypy to 0.982
+  ([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
+- Add support for OTEL_SDK_DISABLED environment variable
+  ([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
+- Fix ValueError message for PeriodicExportingMetricsReader
+  ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
+- Use `BaseException` instead of `Exception` in `record_exception`
+  ([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
+- Make span.record_exception more robust
+  ([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
+- Fix license field in pyproject.toml files
+  ([#3803](https://github.com/open-telemetry/opentelemetry-python/pull/3803))
+

eachdist.ini

@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.24.0.dev
+version=1.25.0.dev
 
 packages=
     opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.45b0.dev
+version=0.46b0.dev
 
 packages=
     opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-opencensus/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "grpcio >= 1.0.0, < 2.0.0",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.24.0.dev",
+  "opentelemetry-api >= 1.25.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"

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

@@ -24,7 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.24.0.dev",
+  "opentelemetry-proto == 1.25.0.dev",
 ]
 
 [project.urls]

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

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

@@ -28,9 +28,9 @@ dependencies = [
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.0.0, < 2.0.0",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.24.0.dev",
-  "opentelemetry-sdk ~= 1.24.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.24.0.dev",
+  "opentelemetry-proto == 1.25.0.dev",
+  "opentelemetry-sdk ~= 1.25.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
 ]
 
 [project.optional-dependencies]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

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

@@ -27,9 +27,9 @@ dependencies = [
   "Deprecated >= 1.2.6",
   "googleapis-common-protos ~= 1.52",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.24.0.dev",
-  "opentelemetry-sdk ~= 1.24.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.24.0.dev",
+  "opentelemetry-proto == 1.25.0.dev",
+  "opentelemetry-sdk ~= 1.25.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
   "requests ~= 2.7",
 ]
 

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

exporter/opentelemetry-exporter-otlp/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-otlp-proto-grpc == 1.24.0.dev",
-  "opentelemetry-exporter-otlp-proto-http == 1.24.0.dev",
+  "opentelemetry-exporter-otlp-proto-grpc == 1.25.0.dev",
+  "opentelemetry-exporter-otlp-proto-http == 1.25.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

exporter/opentelemetry-exporter-prometheus/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   # DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
-  "opentelemetry-sdk ~= 1.24.0.dev",
+  "opentelemetry-sdk ~= 1.25.0.dev",
   "prometheus_client >= 0.5.0, < 1.0.0",
 ]
 

exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"

exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

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

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.3",
-  "opentelemetry-exporter-zipkin-json == 1.24.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.25.0.dev",
   "opentelemetry-sdk ~= 1.11",
   "protobuf ~= 3.12",
   "requests ~= 2.7",

exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

exporter/opentelemetry-exporter-zipkin/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-zipkin-json == 1.24.0.dev",
-  "opentelemetry-exporter-zipkin-proto-http == 1.24.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.25.0.dev",
+  "opentelemetry-exporter-zipkin-proto-http == 1.25.0.dev",
 ]
 
 [project.entry-points.opentelemetry_traces_exporter]

exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py

@@ -41,6 +41,7 @@
 """
 
 
+import warnings
 from abc import ABC, abstractmethod
 from logging import getLogger
 from os import environ
@@ -385,8 +386,7 @@ def create_histogram(
             description: A description for this instrument and what it measures.
         """
 
-    @abstractmethod
-    def create_gauge(
+    def create_gauge(  # type: ignore # pylint: disable=no-self-use
         self,
         name: str,
         unit: str = "",
@@ -400,6 +400,7 @@ def create_gauge(
                 example, ``By`` for bytes. UCUM units are recommended.
             description: A description for this instrument and what it measures.
         """
+        warnings.warn("create_gauge() is not implemented and will be a no-op")
 
     @abstractmethod
     def create_observable_gauge(

opentelemetry-api/src/opentelemetry/trace/span.py

@@ -169,7 +169,7 @@ def set_status(
     @abc.abstractmethod
     def record_exception(
         self,
-        exception: Exception,
+        exception: BaseException,
         attributes: types.Attributes = None,
         timestamp: typing.Optional[int] = None,
         escaped: bool = False,
@@ -563,7 +563,7 @@ def set_status(
 
     def record_exception(
         self,
-        exception: Exception,
+        exception: BaseException,
         attributes: types.Attributes = None,
         timestamp: typing.Optional[int] = None,
         escaped: bool = False,

opentelemetry-api/src/opentelemetry/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"

opentelemetry-api/tests/metrics/test_meter.py

@@ -134,7 +134,6 @@ def test_create_gauge(self):
         """
 
         self.assertTrue(hasattr(Meter, "create_gauge"))
-        self.assertTrue(Meter.create_gauge.__isabstractmethod__)
 
     def test_create_observable_gauge(self):
         """