ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-29 19:50:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Callbacks: use ansible-core's version instead of trying to extract it (#10193)

Browse source 
* Use ansible-core's version instead of trying to extract it.

* Adjust tests.
This commit is contained in:
Felix Fontein 2025-06-02 20:45:18 +02:00 • committed by GitHub
parent 624a8aa120
commit d922eaebce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 16 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/callback/elastic.py
View file

@ -87,6 +87,7 @@ from contextlib import closing
from os.path import basename
from ansible.errors import AnsibleError, AnsibleRuntimeError
from ansible.module_utils.ansible_release import __version__ as ansible_version
from ansible.module_utils.six import raise_from
from ansible.plugins.callback import CallbackBase
@ -140,7 +141,6 @@ class HostData:
class ElasticSource(object):
def __init__(self, display):
self.ansible_playbook = ""
self.ansible_version = None
self.session = str(uuid.uuid4())
self.host = socket.gethostname()
try:
@ -183,9 +183,6 @@ class ElasticSource(object):
task = tasks_data[task_uuid]
if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
self.ansible_version = result._task_fields['args'].get('_ansible_version')
task.add_host(HostData(host_uuid, host_name, status, result))
def generate_distributed_traces(self, tasks_data, status, end_time, traceparent, apm_service_name,
@ -209,8 +206,7 @@ class ElasticSource(object):
else:
apm_cli.begin_transaction("Session", start=parent_start_time)
# Populate trace metadata attributes
if self.ansible_version is not None:
label(ansible_version=self.ansible_version)
label(ansible_version=ansible_version)
label(ansible_session=self.session, ansible_host_name=self.host, ansible_host_user=self.user)
if self.ip_address is not None:
label(ansible_host_ip=self.ip_address)