From e58a362d1df3d1d42e039ed4570c4330f1663eed Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 4 Apr 2023 16:29:18 +0100 Subject: [PATCH] Update to latest transport to ensure ActivitySource is static. (#7549) * Make activity source static * Update to Elastic.Transport 0.4.8 --- benchmarks/Benchmarks/packages.lock.json | 6 ++-- benchmarks/Profiling/packages.lock.json | 6 ++-- .../packages.lock.json | 36 +++++++++---------- .../Client/ElasticsearchClient.cs | 2 +- .../Elastic.Clients.Elasticsearch.csproj | 2 +- .../packages.lock.json | 36 +++++++++---------- src/Playground/packages.lock.json | 6 ++-- .../Tests.ClusterLauncher/packages.lock.json | 18 +++++----- tests/Tests.Core/packages.lock.json | 6 ++-- tests/Tests.Domain/packages.lock.json | 6 ++-- tests/Tests/packages.lock.json | 6 ++-- 11 files changed, 65 insertions(+), 65 deletions(-) diff --git a/benchmarks/Benchmarks/packages.lock.json b/benchmarks/Benchmarks/packages.lock.json index 86b4b2b9e4a..2b5d007176f 100644 --- a/benchmarks/Benchmarks/packages.lock.json +++ b/benchmarks/Benchmarks/packages.lock.json @@ -67,8 +67,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1195,7 +1195,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } } diff --git a/benchmarks/Profiling/packages.lock.json b/benchmarks/Profiling/packages.lock.json index f20638cd807..be25eca12fb 100644 --- a/benchmarks/Profiling/packages.lock.json +++ b/benchmarks/Profiling/packages.lock.json @@ -31,8 +31,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -131,7 +131,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } } diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json index 5068fe1d75b..f16fb9514e1 100644 --- a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json +++ b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json @@ -37,8 +37,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -143,7 +143,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } }, @@ -183,8 +183,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -332,7 +332,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } }, @@ -381,8 +381,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -529,7 +529,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } }, @@ -569,8 +569,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -709,7 +709,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } }, @@ -749,8 +749,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -849,7 +849,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } }, @@ -889,8 +889,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -989,7 +989,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } } } diff --git a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs index 177359d05bc..221a9a31df5 100644 --- a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs +++ b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs @@ -22,7 +22,7 @@ public partial class ElasticsearchClient { private readonly HttpTransport _transport; - private readonly ActivitySource _activitySource = new("Elastic.Clients.Elasticsearch.ElasticsearchClient"); + private static readonly ActivitySource _activitySource = new("Elastic.Clients.Elasticsearch.ElasticsearchClient"); internal static ConditionalWeakTable SettingsTable { get; } = new(); diff --git a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj index d61ad642046..9ebd82dac6b 100644 --- a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj +++ b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj @@ -18,7 +18,7 @@ annotations - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Elastic.Clients.Elasticsearch/packages.lock.json b/src/Elastic.Clients.Elasticsearch/packages.lock.json index 8d6ff9279d2..6d8e5bff965 100644 --- a/src/Elastic.Clients.Elasticsearch/packages.lock.json +++ b/src/Elastic.Clients.Elasticsearch/packages.lock.json @@ -22,9 +22,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -163,9 +163,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -347,9 +347,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -539,9 +539,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -714,9 +714,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -849,9 +849,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.7, )", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "requested": "[0.4.8, )", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", diff --git a/src/Playground/packages.lock.json b/src/Playground/packages.lock.json index 72a01219f8d..23e6a900827 100644 --- a/src/Playground/packages.lock.json +++ b/src/Playground/packages.lock.json @@ -48,8 +48,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -153,7 +153,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json index 7d7ada97466..8213120abfa 100644 --- a/tests/Tests.ClusterLauncher/packages.lock.json +++ b/tests/Tests.ClusterLauncher/packages.lock.json @@ -75,8 +75,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1271,7 +1271,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { @@ -1388,8 +1388,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -2588,7 +2588,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { @@ -2705,8 +2705,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -3905,7 +3905,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.Core/packages.lock.json b/tests/Tests.Core/packages.lock.json index 5ada8cf8b9d..df3f55ddbf2 100644 --- a/tests/Tests.Core/packages.lock.json +++ b/tests/Tests.Core/packages.lock.json @@ -137,8 +137,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1589,7 +1589,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.Domain/packages.lock.json b/tests/Tests.Domain/packages.lock.json index 9a771546b4e..43feb1689f1 100644 --- a/tests/Tests.Domain/packages.lock.json +++ b/tests/Tests.Domain/packages.lock.json @@ -57,8 +57,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1142,7 +1142,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "tests.configuration": { diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json index 22ad5a109b6..ae4cce9d73d 100644 --- a/tests/Tests/packages.lock.json +++ b/tests/Tests/packages.lock.json @@ -195,8 +195,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.7", - "contentHash": "07MpXg25VUnlWRwJEQ1JyD3CIjTDDUA7Fa9umL+sQ5sVJjjHijdZbKHAseJBR3Mji83KnZj2IDEKDrAUQ9Rdbw==", + "resolved": "0.4.8", + "contentHash": "AFPWZMiCFW33y5d7SBobCQ9JJN3h5+2VGhIp7bRoDOx95pAtrA3jw3OY8477eAavqfVNoKDPFwGthPxC2iDedw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1492,7 +1492,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.7, )" + "Elastic.Transport": "[0.4.8, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": {