From 8a79377fe15a06ae050e135c0f817004b33fd671 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 12 Apr 2023 11:20:11 +0100 Subject: [PATCH] Prefer SetTag and ensure all methods instrument in the same way --- .../Client/ElasticsearchClient.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs index 221a9a31df5..6088902b954 100644 --- a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs +++ b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs @@ -138,10 +138,15 @@ internal TResponse DoRequest( using (var activity = _activitySource.StartActivity($"Elasticsearch: {request.HttpMethod} {urlTemplate}", ActivityKind.Client)) { - activity?.AddTag("db.system", "elasticsearch"); - response = _transport.Request(request.HttpMethod, resolvedUrl, postData, parameters); + activity?.SetTag("db.system", "elasticsearch"); + activity?.SetCustomProperty("elastic.transport.client", true); + + response = _transport.Request(request.HttpMethod, resolvedUrl, postData, request.RequestParameters); + + if (response.ApiCallDetails.RequestBodyInBytes is not null) + activity?.SetTag("db.statement", System.Text.Encoding.UTF8.GetString(response.ApiCallDetails.RequestBodyInBytes)); } - + PostRequestProductCheck(request, response); if (_productCheckStatus == ProductCheckStatus.Failed) @@ -206,13 +211,13 @@ internal TResponse DoRequest( using (var activity = _activitySource.StartActivity($"Elasticsearch: {request.HttpMethod} {urlTemplate}", ActivityKind.Client)) { - activity?.AddTag("db.system", "elasticsearch"); + activity?.SetTag("db.system", "elasticsearch"); activity?.SetCustomProperty("elastic.transport.client", true); response = _transport.Request(request.HttpMethod, resolvedUrl, postData, request.RequestParameters); if (response.ApiCallDetails.RequestBodyInBytes is not null) - activity?.AddTag("db.statement", System.Text.Encoding.UTF8.GetString(response.ApiCallDetails.RequestBodyInBytes)); + activity?.SetTag("db.statement", System.Text.Encoding.UTF8.GetString(response.ApiCallDetails.RequestBodyInBytes)); } PostRequestProductCheck(request, response);