Merge branch 'main' into main

Author: tonycody

.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: 008cd2370dcd3e87cca8c0ddbb0b820681fd7346
+  CONTRIB_REPO_SHA: 7b42e4354dc3244ef2878bfd0d7d4c80d25cba0a
   # 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

CHANGELOG.md

@@ -5,8 +5,14 @@ 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](https://github.com/open-telemetry/opentelemetry-python/compare/v1.11.1-0.30b1...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc1-0.31b0...HEAD)
 
+## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17
+
+
+
+- Fix LoggingHandler to handle LogRecord with exc_info=False
+  ([#2690](https://github.com/open-telemetry/opentelemetry-python/pull/2690))
 - Make metrics components public
   ([#2684](https://github.com/open-telemetry/opentelemetry-python/pull/2684))
 - Update to semantic conventions v1.11.0

eachdist.ini

@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.11.1
+version=1.12.0rc1
 
 packages=
     opentelemetry-sdk
@@ -30,7 +30,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.30b1
+version=0.31b0
 
 packages=
     opentelemetry-opentracing-shim

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

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-jaeger/setup.cfg

@@ -41,8 +41,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-jaeger-proto-grpc == 1.11.1
-    opentelemetry-exporter-jaeger-thrift == 1.11.1
+    opentelemetry-exporter-jaeger-proto-grpc == 1.12.0rc1
+    opentelemetry-exporter-jaeger-thrift == 1.12.0rc1
 
 [options.packages.find]
 where = src

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

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

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.30b1"
+__version__ = "0.31b0"

exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg

@@ -44,7 +44,7 @@ install_requires =
     googleapis-common-protos ~= 1.52
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.11
-    opentelemetry-proto == 1.11.1
+    opentelemetry-proto == 1.12.0rc1
     backoff >= 1.10.0, < 2.0.0
 
 [options.extras_require]

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.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg

@@ -44,7 +44,7 @@ install_requires =
     googleapis-common-protos ~= 1.52
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.11
-    opentelemetry-proto == 1.11.1
+    opentelemetry-proto == 1.12.0rc1
     backoff >= 1.10.0, < 2.0.0
 
 [options.extras_require]

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.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-otlp/setup.cfg

@@ -41,8 +41,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-otlp-proto-grpc == 1.11.1
-    opentelemetry-exporter-otlp-proto-http == 1.11.1
+    opentelemetry-exporter-otlp-proto-grpc == 1.12.0rc1
+    opentelemetry-exporter-otlp-proto-http == 1.12.0rc1
 
 [options.packages.find]
 where = src

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.11.1"
+__version__ = "1.12.0rc1"

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.30b1"
+__version__ = "1.12.0rc1"

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.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg

@@ -45,7 +45,7 @@ install_requires =
     requests ~= 2.7
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.11
-    opentelemetry-exporter-zipkin-json == 1.11.1
+    opentelemetry-exporter-zipkin-json == 1.12.0rc1
 
 [options.packages.find]
 where = src

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.11.1"
+__version__ = "1.12.0rc1"

exporter/opentelemetry-exporter-zipkin/setup.cfg

@@ -41,8 +41,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-zipkin-json == 1.11.1
-    opentelemetry-exporter-zipkin-proto-http == 1.11.1
+    opentelemetry-exporter-zipkin-json == 1.12.0rc1
+    opentelemetry-exporter-zipkin-proto-http == 1.12.0rc1
 
 [options.packages.find]
 where = src

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.11.1"
+__version__ = "1.12.0rc1"

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.11.1"
+__version__ = "1.12.0rc1"

opentelemetry-proto/src/opentelemetry/proto/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

opentelemetry-sdk/setup.cfg

@@ -43,8 +43,8 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 1.11.1
-    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-api == 1.12.0rc1
+    opentelemetry-semantic-conventions == 0.31b0
     setuptools >= 16.0
     dataclasses == 0.8; python_version < '3.7'
     typing-extensions >= 3.7.4

opentelemetry-sdk/src/opentelemetry/sdk/_logs/__init__.py

@@ -321,7 +321,7 @@ def _get_attributes(record: logging.LogRecord) -> Attributes:
         attributes = {
             k: v for k, v in vars(record).items() if k not in _RESERVED_ATTRS
         }
-        if record.exc_info is not None:
+        if record.exc_info:
             exc_type = ""
             message = ""
             stack_trace = ""

opentelemetry-sdk/src/opentelemetry/sdk/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

opentelemetry-sdk/tests/logs/test_handler.py

@@ -107,6 +107,27 @@ def test_log_record_exception(self):
         self.assertTrue("division by zero" in stack_trace)
         self.assertTrue(__file__ in stack_trace)
 
+    def test_log_exc_info_false(self):
+        """Exception information will be included in attributes"""
+        emitter_mock = Mock(spec=LogEmitter)
+        logger = get_logger(log_emitter=emitter_mock)
+        try:
+            raise ZeroDivisionError("division by zero")
+        except ZeroDivisionError:
+            logger.error("Zero Division Error", exc_info=False)
+        args, _ = emitter_mock.emit.call_args_list[0]
+        log_record = args[0]
+
+        self.assertIsNotNone(log_record)
+        self.assertEqual(log_record.body, "Zero Division Error")
+        self.assertNotIn(SpanAttributes.EXCEPTION_TYPE, log_record.attributes)
+        self.assertNotIn(
+            SpanAttributes.EXCEPTION_MESSAGE, log_record.attributes
+        )
+        self.assertNotIn(
+            SpanAttributes.EXCEPTION_STACKTRACE, log_record.attributes
+        )
+
     def test_log_record_trace_correlation(self):
         emitter_mock = Mock(spec=LogEmitter)
         logger = get_logger(log_emitter=emitter_mock)

opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.30b1"
+__version__ = "0.31b0"

propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

shim/opentelemetry-opentracing-shim/setup.cfg

@@ -47,7 +47,7 @@ install_requires =
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b1
+    opentelemetry-test-utils == 0.31b0
     opentracing ~= 2.2.0
 
 [options.packages.find]

shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.30b1"
+__version__ = "0.31b0"

tests/opentelemetry-test-utils/setup.cfg

@@ -38,8 +38,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.11.1
-    opentelemetry-sdk == 1.11.1
+    opentelemetry-api == 1.12.0rc1
+    opentelemetry-sdk == 1.12.0rc1
     asgiref ~= 3.0
 
 [options.extras_require]

tests/opentelemetry-test-utils/src/opentelemetry/test/version.py

@@ -1 +1 @@
-__version__ = "0.30b1"
+__version__ = "0.31b0"