From aa554c2887f06bfef9d6dafcf4153941a582e26d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 12 Feb 2022 08:31:00 +0000 Subject: [PATCH] opentelemetry: enrich services for jenkins, hetzner or jira (#4105) * opentelemetry: enrich services for jenkins, hetzner, jira, zypper, chocolatey * remove source and name for the time being Those arguments can be later on in the future added, maybe with some opt-in feature, so let's only focus in the ones which are fully http based for now * changelog fragment * Update changelogs/fragments/4105-opentelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml Co-authored-by: Felix Fontein Co-authored-by: Felix Fontein --- ...entelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml | 2 ++ plugins/callback/opentelemetry.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/4105-opentelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml diff --git a/changelogs/fragments/4105-opentelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml b/changelogs/fragments/4105-opentelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml new file mode 100644 index 0000000000..19200b0173 --- /dev/null +++ b/changelogs/fragments/4105-opentelemetry_plugin-enrich_jira_hetzner_jenkins_services.yaml @@ -0,0 +1,2 @@ +minor_changes: + - opentelemetry_plugin - enrich service when using the ``jenkins``, ``hetzner`` or ``jira`` modules (https://github.com/ansible-collections/community.general/pull/4105). diff --git a/plugins/callback/opentelemetry.py b/plugins/callback/opentelemetry.py index db6ea15dc4..8ef2ae3f4d 100644 --- a/plugins/callback/opentelemetry.py +++ b/plugins/callback/opentelemetry.py @@ -319,7 +319,7 @@ class OpenTelemetrySource(object): @staticmethod def url_from_args(args): # the order matters - url_args = ("url", "api_url", "baseurl", "repo", "server_url", "chart_repo_url", "registry_url") + url_args = ("url", "api_url", "baseurl", "repo", "server_url", "chart_repo_url", "registry_url", "endpoint", "uri", "updates_url") for arg in url_args: if args is not None and args.get(arg): return args.get(arg)