Skip to content

Commit

Permalink
Close elastic APM client to release connections (#7517)
Browse files Browse the repository at this point in the history
* Close elastic APM client to release connections

* Changelog fragment

(cherry picked from commit 8d886b4)
  • Loading branch information
iurisilvio authored and patchback[bot] committed Nov 15, 2023
1 parent 1f94bd4 commit 74bd803
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/7517-elastic-close-client.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- elastic callback plugin - close elastic client to not leak resources (https://github.com/ansible-collections/community.general/pull/7517).
38 changes: 20 additions & 18 deletions plugins/callback/elastic.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
import uuid

from collections import OrderedDict
from contextlib import closing
from os.path import basename

from ansible.errors import AnsibleError, AnsibleRuntimeError
Expand Down Expand Up @@ -201,24 +202,25 @@ def generate_distributed_traces(self, tasks_data, status, end_time, traceparent,

apm_cli = self.init_apm_client(apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key)
if apm_cli:
instrument() # Only call this once, as early as possible.
if traceparent:
parent = trace_parent_from_string(traceparent)
apm_cli.begin_transaction("Session", trace_parent=parent, start=parent_start_time)
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_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)

for task_data in tasks:
for host_uuid, host_data in task_data.host_data.items():
self.create_span_data(apm_cli, task_data, host_data)

apm_cli.end_transaction(name=__name__, result=status, duration=end_time - parent_start_time)
with closing(apm_cli):
instrument() # Only call this once, as early as possible.
if traceparent:
parent = trace_parent_from_string(traceparent)
apm_cli.begin_transaction("Session", trace_parent=parent, start=parent_start_time)
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_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)

for task_data in tasks:
for host_uuid, host_data in task_data.host_data.items():
self.create_span_data(apm_cli, task_data, host_data)

apm_cli.end_transaction(name=__name__, result=status, duration=end_time - parent_start_time)

def create_span_data(self, apm_cli, task_data, host_data):
""" create the span with the given TaskData and HostData """
Expand Down

0 comments on commit 74bd803

Please sign in to comment.