mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* opentelemetry: honour the ignore_errors
* fix-encoding-pragma
* Add changelog fragment
* opentelemetry: ignore produces unset span status
(cherry picked from commit ce6d0a749e
)
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
This commit is contained in:
parent
614a84d0f2
commit
726918930b
2 changed files with 12 additions and 2 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- opentelemetry_plugin - honour ``ignore_errors`` when a task has failed instead of reporting an error (https://github.com/ansible-collections/community.general/pull/3837).
|
|
@ -1,3 +1,4 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
|
# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
|
||||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
|
||||||
|
@ -263,6 +264,8 @@ class OpenTelemetrySource(object):
|
||||||
else:
|
else:
|
||||||
message = 'skipped'
|
message = 'skipped'
|
||||||
status = Status(status_code=StatusCode.UNSET)
|
status = Status(status_code=StatusCode.UNSET)
|
||||||
|
elif host_data.status == 'ignored':
|
||||||
|
status = Status(status_code=StatusCode.UNSET)
|
||||||
|
|
||||||
span.set_status(status)
|
span.set_status(status)
|
||||||
self.set_span_attribute(span, "ansible.task.args", task_data.args)
|
self.set_span_attribute(span, "ansible.task.args", task_data.args)
|
||||||
|
@ -392,10 +395,15 @@ class CallbackModule(CallbackBase):
|
||||||
)
|
)
|
||||||
|
|
||||||
def v2_runner_on_failed(self, result, ignore_errors=False):
|
def v2_runner_on_failed(self, result, ignore_errors=False):
|
||||||
self.errors += 1
|
if ignore_errors:
|
||||||
|
status = 'ignored'
|
||||||
|
else:
|
||||||
|
status = 'failed'
|
||||||
|
self.errors += 1
|
||||||
|
|
||||||
self.opentelemetry.finish_task(
|
self.opentelemetry.finish_task(
|
||||||
self.tasks_data,
|
self.tasks_data,
|
||||||
'failed',
|
status,
|
||||||
result
|
result
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue