Skip to content

Update to latest transport to ensure ActivitySource is static. #7549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Update to latest transport to ensure ActivitySource is static. #7549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a2f115
Make activity source static
stevejgordon Apr 4, 2023
445196c
Update to Elastic.Transport 0.4.8
stevejgordon Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions benchmarks/Benchmarks/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1195,7 +1195,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/Profiling/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -131,7 +131,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
}
Expand Down
36 changes: 18 additions & 18 deletions src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -143,7 +143,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -332,7 +332,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -529,7 +529,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -709,7 +709,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -849,7 +849,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -989,7 +989,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public partial class ElasticsearchClient
{
private readonly HttpTransport<IElasticsearchClientSettings> _transport;

private readonly ActivitySource _activitySource = new("Elastic.Clients.Elasticsearch.ElasticsearchClient");
private static readonly ActivitySource _activitySource = new("Elastic.Clients.Elasticsearch.ElasticsearchClient");

internal static ConditionalWeakTable<JsonSerializerOptions, IElasticsearchClientSettings> SettingsTable { get; } = new();

Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Nullable>annotations</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Transport" Version="0.4.7" />
<PackageReference Include="Elastic.Transport" Version="0.4.8" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
36 changes: 18 additions & 18 deletions src/Elastic.Clients.Elasticsearch/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/Playground/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -153,7 +153,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down
18 changes: 9 additions & 9 deletions tests/Tests.ClusterLauncher/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1271,7 +1271,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -2588,7 +2588,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -3905,7 +3905,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests.Core/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1589,7 +1589,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests.Domain/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1142,7 +1142,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"tests.configuration": {
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "[0.4.7, )"
"Elastic.Transport": "[0.4.8, )"
}
},
"elastic.clients.elasticsearch.jsonnetserializer": {
Expand Down