Megalinter and merge fixes

Author: lrafeei

newrelic/api/opentelemetry.py

@@ -356,49 +356,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
         super().__exit__(exc_type, exc_val, exc_tb)
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-        Ends context manager and calls `end` on the `Span`.
-        This is used when span is called as a context manager
-        i.e. `with tracer.start_span() as span:`
-        """
-        if exc_val and self.is_recording():
-            if self._record_exception:
-                self.record_exception(exception=exc_val, escaped=True)
-            if self.set_status_on_exception:
-                self.set_status(Status(status_code=StatusCode.ERROR, description=f"{exc_type.__name__}: {exc_val}"))
-
-        super().__exit__(exc_type, exc_val, exc_tb)
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-        Ends context manager and calls `end` on the `Span`.
-        This is used when span is called as a context manager
-        i.e. `with tracer.start_span() as span:`
-        """
-        if exc_val and self.is_recording():
-            if self._record_exception:
-                self.record_exception(exception=exc_val, escaped=True)
-            if self.set_status_on_exception:
-                self.set_status(Status(status_code=StatusCode.ERROR, description=f"{exc_type.__name__}: {exc_val}"))
-
-        super().__exit__(exc_type, exc_val, exc_tb)
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-        Ends context manager and calls `end` on the `Span`.
-        This is used when span is called as a context manager
-        i.e. `with tracer.start_span() as span:`
-        """
-        if exc_val and self.is_recording():
-            if self._record_exception:
-                self.record_exception(exception=exc_val, escaped=True)
-            if self.set_status_on_exception:
-                self.set_status(Status(status_code=StatusCode.ERROR, description=f"{exc_type.__name__}: {exc_val}"))
-
-        super().__exit__(exc_type, exc_val, exc_tb)
-
-
 class Tracer(otel_api_trace.Tracer):
     def __init__(self, resource=None, instrumentation_library=None, *args, **kwargs):
         self.resource = resource

tests/hybridagent_flask/test_otel_application.py

@@ -59,8 +59,8 @@ def target_application():
 _exact_intrinsics = {"type": "Span"}
 _exact_root_intrinsics = _exact_intrinsics.copy().update({"nr.entryPoint": True})
 _expected_intrinsics = ["traceId", "transactionId", "sampled", "priority", "timestamp", "duration", "name", "category", "guid"]
-_expected_root_intrinsics = _expected_intrinsics.copy() + ["transaction.name"]
-_expected_child_intrinsics = _expected_intrinsics.copy() + ["parentId"]
+_expected_root_intrinsics = [*_expected_intrinsics.copy(), "transaction.name"]
+_expected_child_intrinsics = [*_expected_intrinsics.copy(), "parentId"]
 _unexpected_root_intrinsics = ["parentId"]
 _unexpected_child_intrinsics = ["nr.entryPoint", "transaction.name"]
 

tests/hybridagent_opentelemetry/test_status.py

@@ -182,12 +182,12 @@ def _test():
         with tracer.start_as_current_span(name="TestSpan") as span:
             # Set the new status
             span.set_status(status_to_set, description)
-            
+
             # If status code is OK, do not have description
             # if expected_status_code == StatusCode.OK:
             if span.status.status_code == StatusCode.OK:
                  assert span.status.description is None
-                
+
             # If status code is ERROR, make sure description
             # is set correctly (if provided):
             if span.status.status_code == StatusCode.ERROR: