Skip to content

Commit cad4b4e

Browse files
github-actions[bot]stevejgordon
github-actions[bot]
and
stevejgordon
authored
Refactor OpenTelemetry implementation with updated Transport (#7931) (#7935)
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent 26554db commit cad4b4e

File tree

150 files changed

+942
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+942
-288
lines changed

‎benchmarks/Benchmarks/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
},
6868
"Elastic.Transport": {
6969
"type": "Transitive",
70-
"resolved": "0.4.15",
71-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A=="
70+
"resolved": "0.4.16",
71+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg=="
7272
},
7373
"Elasticsearch.Net": {
7474
"type": "Transitive",
@@ -1172,7 +1172,7 @@
11721172
"elastic.clients.elasticsearch": {
11731173
"type": "Project",
11741174
"dependencies": {
1175-
"Elastic.Transport": "[0.4.15, )"
1175+
"Elastic.Transport": "[0.4.16, )"
11761176
}
11771177
}
11781178
}

‎benchmarks/Profiling/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"Elastic.Transport": {
3333
"type": "Transitive",
34-
"resolved": "0.4.15",
35-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A=="
34+
"resolved": "0.4.16",
35+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg=="
3636
},
3737
"Microsoft.Build.Tasks.Git": {
3838
"type": "Transitive",
@@ -88,7 +88,7 @@
8888
"elastic.clients.elasticsearch": {
8989
"type": "Project",
9090
"dependencies": {
91-
"Elastic.Transport": "[0.4.15, )"
91+
"Elastic.Transport": "[0.4.16, )"
9292
}
9393
}
9494
}

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"Elastic.Transport": {
3939
"type": "Transitive",
40-
"resolved": "0.4.15",
41-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A==",
40+
"resolved": "0.4.16",
41+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg==",
4242
"dependencies": {
4343
"Microsoft.CSharp": "4.7.0",
4444
"System.Buffers": "4.5.1",
@@ -152,7 +152,7 @@
152152
"elastic.clients.elasticsearch": {
153153
"type": "Project",
154154
"dependencies": {
155-
"Elastic.Transport": "[0.4.15, )"
155+
"Elastic.Transport": "[0.4.16, )"
156156
}
157157
}
158158
},
@@ -192,8 +192,8 @@
192192
},
193193
"Elastic.Transport": {
194194
"type": "Transitive",
195-
"resolved": "0.4.15",
196-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A==",
195+
"resolved": "0.4.16",
196+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg==",
197197
"dependencies": {
198198
"Microsoft.CSharp": "4.7.0",
199199
"System.Buffers": "4.5.1",
@@ -341,7 +341,7 @@
341341
"elastic.clients.elasticsearch": {
342342
"type": "Project",
343343
"dependencies": {
344-
"Elastic.Transport": "[0.4.15, )"
344+
"Elastic.Transport": "[0.4.16, )"
345345
}
346346
}
347347
},
@@ -390,8 +390,8 @@
390390
},
391391
"Elastic.Transport": {
392392
"type": "Transitive",
393-
"resolved": "0.4.15",
394-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A==",
393+
"resolved": "0.4.16",
394+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg==",
395395
"dependencies": {
396396
"Microsoft.CSharp": "4.7.0",
397397
"System.Buffers": "4.5.1",
@@ -538,7 +538,7 @@
538538
"elastic.clients.elasticsearch": {
539539
"type": "Project",
540540
"dependencies": {
541-
"Elastic.Transport": "[0.4.15, )"
541+
"Elastic.Transport": "[0.4.16, )"
542542
}
543543
}
544544
},
@@ -578,8 +578,8 @@
578578
},
579579
"Elastic.Transport": {
580580
"type": "Transitive",
581-
"resolved": "0.4.15",
582-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A==",
581+
"resolved": "0.4.16",
582+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg==",
583583
"dependencies": {
584584
"Microsoft.CSharp": "4.7.0",
585585
"System.Buffers": "4.5.1",
@@ -718,7 +718,7 @@
718718
"elastic.clients.elasticsearch": {
719719
"type": "Project",
720720
"dependencies": {
721-
"Elastic.Transport": "[0.4.15, )"
721+
"Elastic.Transport": "[0.4.16, )"
722722
}
723723
}
724724
},
@@ -758,8 +758,8 @@
758758
},
759759
"Elastic.Transport": {
760760
"type": "Transitive",
761-
"resolved": "0.4.15",
762-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A==",
761+
"resolved": "0.4.16",
762+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg==",
763763
"dependencies": {
764764
"Microsoft.CSharp": "4.7.0",
765765
"System.Buffers": "4.5.1",
@@ -867,7 +867,7 @@
867867
"elastic.clients.elasticsearch": {
868868
"type": "Project",
869869
"dependencies": {
870-
"Elastic.Transport": "[0.4.15, )"
870+
"Elastic.Transport": "[0.4.16, )"
871871
}
872872
}
873873
},
@@ -907,8 +907,8 @@
907907
},
908908
"Elastic.Transport": {
909909
"type": "Transitive",
910-
"resolved": "0.4.15",
911-
"contentHash": "XSuqHDVZ5Qd2A4g7JUa2zpYJaJgT2/dQUe3UdgcMXZ1NSrVTFHTE9pkTbf60l38JAlW38Ecfzve4H/YY7KG/2A=="
910+
"resolved": "0.4.16",
911+
"contentHash": "O2LHqnQTWAF0+cic9zYkZJ8m95cG9AnkRbwkRZogroWXZHh8oY5ewVsQsF+wwNHs/YWnNIBTq/7yqaFklBB/Wg=="
912912
},
913913
"Microsoft.Build.Tasks.Git": {
914914
"type": "Transitive",
@@ -964,7 +964,7 @@
964964
"elastic.clients.elasticsearch": {
965965
"type": "Project",
966966
"dependencies": {
967-
"Elastic.Transport": "[0.4.15, )"
967+
"Elastic.Transport": "[0.4.16, )"
968968
}
969969
}
970970
}

‎src/Elastic.Clients.Elasticsearch/Api/SearchRequest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6+
using System.Collections.Generic;
67
using Elastic.Clients.Elasticsearch.Requests;
78

89
namespace Elastic.Clients.Elasticsearch;
@@ -17,7 +18,7 @@ internal override void BeforeRequest()
1718
}
1819
}
1920

20-
protected override (string ResolvedUrl, string UrlTemplate) ResolveUrl(RouteValues routeValues, IElasticsearchClientSettings settings)
21+
protected override (string ResolvedUrl, string UrlTemplate, Dictionary<string, string>? resolvedRouteValues) ResolveUrl(RouteValues routeValues, IElasticsearchClientSettings settings)
2122
{
2223
if (Pit is not null && !string.IsNullOrEmpty(Pit.Id ?? string.Empty) && routeValues.ContainsKey("index"))
2324
{
@@ -61,7 +62,7 @@ internal override void BeforeRequest()
6162
}
6263
}
6364

64-
protected override (string ResolvedUrl, string UrlTemplate) ResolveUrl(RouteValues routeValues, IElasticsearchClientSettings settings)
65+
protected override (string ResolvedUrl, string UrlTemplate, Dictionary<string, string>? resolvedRouteValues) ResolveUrl(RouteValues routeValues, IElasticsearchClientSettings settings)
6566
{
6667
if ((Self.PitValue is not null || Self.PitDescriptor is not null || Self.PitDescriptorAction is not null) && routeValues.ContainsKey("index"))
6768
{

0 commit comments

Comments
 (0)