Merge branch 'main' into exclude

Author: lzchen

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-celery` Record exceptions as events on the span.
+  ([#1573](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1573))
 - Add metric instrumentation for urllib
   ([#1553](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1553))
 - `opentelemetry/sdk/extension/aws` Implement [`aws.ecs.*`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/cloud_provider/aws/ecs.md) and [`aws.logs.*`](https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/cloud_provider/aws/logs/) resource attributes in the `AwsEcsResourceDetector` detector when the ECS Metadata v4 is available

README.md

@@ -95,15 +95,15 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
-- [Owais Lone](https://github.com/owais), Splunk
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco
-- [Ashutosh Goel](https://github.com/ashu658), Cisco
+- [Shalev Roda](https://github.com/shalevr), Cisco
 
 Emeritus Approvers:
 
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
+- [Ashutosh Goel](https://github.com/ashu658), Cisco
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
@@ -116,6 +116,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 Emeritus Maintainers:
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
+- [Owais Lone](https://github.com/owais), Splunk
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py

@@ -250,6 +250,7 @@ def _trace_failure(*args, **kwargs):
 
         if ex is not None:
             status_kwargs["description"] = str(ex)
+            span.record_exception(ex)
         span.set_status(Status(**status_kwargs))
 
     @staticmethod

tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py

@@ -249,6 +249,7 @@ def fn_task_parameters(user, force_logout=False):
         run_span.attributes.get("celery.task_name")
         == "test_celery_functional.fn_task_parameters"
     )
+    assert len(run_span.events) == 0
 
 
 def test_fn_exception(celery_app, memory_exporter):
@@ -275,6 +276,11 @@ def fn_exception():
         == "test_celery_functional.fn_exception"
     )
     assert span.status.status_code == StatusCode.ERROR
+    assert len(span.events) == 1
+    event = span.events[0]
+    assert event.name == "exception"
+    assert event.attributes[SpanAttributes.EXCEPTION_TYPE] == "ExceptionInfo"
+    assert SpanAttributes.EXCEPTION_MESSAGE in event.attributes
     assert (
         span.attributes.get(SpanAttributes.MESSAGING_MESSAGE_ID)
         == result.task_id