Skip to content

Commit b0e417b

Browse files
miniduikbootminiduikboot
committed
Update to OTel 1.9.0
1 parent 72dfc13 commit b0e417b

File tree

4 files changed

+56
-69
lines changed

4 files changed

+56
-69
lines changed

‎Boot.Metrics/Boot.Metrics.csproj

+13-19
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
1+
<?xml version="1.0"?>
2+
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
66
<VersionPrefix>9999</VersionPrefix>
7-
87
<ImplicitUsings>enable</ImplicitUsings>
98
<Nullable>enable</Nullable>
109
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -13,27 +12,22 @@
1312
<CodeAnalysisRuleSet>../ProjectRules.ruleset</CodeAnalysisRuleSet>
1413
<IsPackable>true</IsPackable>
1514
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
16-
1715
<Description>Exposes OpenTelemetry/Prometheus metrics</Description>
1816
<Authors>miniduikboot</Authors>
1917
</PropertyGroup>
20-
2118
<ItemGroup>
22-
<PackageReference Include="Impostor.Api" Version="1.9.2" ExcludeAssets="runtime" />
23-
19+
<PackageReference Include="Impostor.Api" Version="1.9.2" ExcludeAssets="runtime"/>
2420
<!-- OpenTelemetry -->
25-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
26-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
27-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
28-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
29-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
30-
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
31-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
32-
21+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0"/>
22+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2"/>
23+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
24+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
25+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
26+
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.7"/>
27+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
3328
<!-- Code style libraries -->
34-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.26.0.92422" PrivateAssets="all" />
35-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
36-
<AdditionalFiles Include="../stylecop.json" />
29+
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="all"/>
30+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all"/>
31+
<AdditionalFiles Include="../stylecop.json"/>
3732
</ItemGroup>
38-
3933
</Project>

‎Boot.Metrics/ClientMetrics.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void OnClientConnected(IClientConnectedEvent e)
5151
_totalClientCounter.Add(1, GetClientTags(e.Client));
5252
}
5353

54-
private TagList GetClientTags(IClient client)
54+
private static TagList GetClientTags(IClient client)
5555
{
5656
return new TagList
5757
{

‎Boot.Metrics/GameMetrics.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void OnGameStarted(IGameStartedEvent e)
5858
_totalGameCounter.Add(1, GetGameTags(e.Game, MetricsProfile.StartedGames));
5959
}
6060

61-
private TagList GetGameTags(IGame game, MetricsProfile profile)
61+
private static TagList GetGameTags(IGame game, MetricsProfile profile)
6262
{
6363
// Bucket playercount above 20 to reduce cardinality
6464
var playerCount = game.PlayerCount;

‎Boot.Metrics/packages.lock.json

+41-48
Original file line numberDiff line numberDiff line change
@@ -16,77 +16,75 @@
1616
},
1717
"OpenTelemetry.Exporter.Console": {
1818
"type": "Direct",
19-
"requested": "[1.8.1, )",
20-
"resolved": "1.8.1",
21-
"contentHash": "XmMaxVoJjVYwEpV3XCvntSGbmRelhQv0gT1JSTRK5BRXgq7OunU18GJtJsgkQW0bRf1y4nevkxo5QDts62j41Q==",
19+
"requested": "[1.9.0, )",
20+
"resolved": "1.9.0",
21+
"contentHash": "TbScDLSc6kcji+/wZYIf8/HBV2SnttzN7PNxr3TYczlmGlU4K2ugujp6seSktEO4OaAvKRd7Y3CG3SKNj0C+1Q==",
2222
"dependencies": {
23-
"OpenTelemetry": "1.8.1",
24-
"System.Text.Encodings.Web": "4.7.2",
25-
"System.Text.Json": "4.7.2"
23+
"OpenTelemetry": "1.9.0"
2624
}
2725
},
2826
"OpenTelemetry.Exporter.Prometheus.AspNetCore": {
2927
"type": "Direct",
30-
"requested": "[1.7.0-rc.1, )",
31-
"resolved": "1.7.0-rc.1",
32-
"contentHash": "tlA8oDOZoyFAkKA5StEPdzCyFf/6N/8y0Ymjae1dJYEfxPmNrcrtEHxuxtd0h5GwrIKnVpkb/hJMopHOErnSqQ==",
28+
"requested": "[1.9.0-beta.2, )",
29+
"resolved": "1.9.0-beta.2",
30+
"contentHash": "JZXcHp2MkV/as8aLyJDapWkSNLhaQUWNnG1u2oOssq8Sg8217cX8D782sNJSzb7UfhzscR8pbzv6RZTsmPcHVw==",
3331
"dependencies": {
34-
"OpenTelemetry": "1.7.0-rc.1"
32+
"OpenTelemetry": "[1.9.0, 2.0.0)"
3533
}
3634
},
3735
"OpenTelemetry.Extensions.Hosting": {
3836
"type": "Direct",
39-
"requested": "[1.8.1, )",
40-
"resolved": "1.8.1",
41-
"contentHash": "vAiiKFPGDUkCUu+edSZf95n33AC7VdynDG+wF+KolTQL+8YphlvQ5wn06PDegD0CJVqk8imwqN+LCb/JjsGxKA==",
37+
"requested": "[1.9.0, )",
38+
"resolved": "1.9.0",
39+
"contentHash": "QBQPrKDVCXxTBE+r8tgjmFNKKHi4sKyczmip2XGUcjy8kk3quUNhttnjiMqC4sU50Hemmn4i5752Co26pnKe3A==",
4240
"dependencies": {
4341
"Microsoft.Extensions.Hosting.Abstractions": "8.0.0",
44-
"OpenTelemetry": "1.8.1"
42+
"OpenTelemetry": "1.9.0"
4543
}
4644
},
4745
"OpenTelemetry.Instrumentation.AspNetCore": {
4846
"type": "Direct",
49-
"requested": "[1.8.1, )",
50-
"resolved": "1.8.1",
51-
"contentHash": "dRb1LEXSH95LGEubk96kYyBmGuny9/qycH9KqL8FXcOv446Xi53EW56TVE4wTMv4HPfn+rL3B9pPQ5RX7zD4Yw==",
47+
"requested": "[1.9.0, )",
48+
"resolved": "1.9.0",
49+
"contentHash": "x4HuWBw1rbWZUh5j8/GpXz3xa7JnrTuKne+ACmBqvcoO/rNGkG7HayRruwoQ7gf52xpMtRGr4gxlhLW8eU0EiQ==",
5250
"dependencies": {
53-
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.0"
51+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)"
5452
}
5553
},
5654
"OpenTelemetry.Instrumentation.Http": {
5755
"type": "Direct",
58-
"requested": "[1.8.1, )",
59-
"resolved": "1.8.1",
60-
"contentHash": "l1KaO1U+v11X/kfZ8tcONc5l1qoP6nPk6yPrXBJNH0Wb6NEBTdEgI1dtJBbqOnjOrI2XS09le0ZGooh9ZVkZ3Q==",
56+
"requested": "[1.9.0, )",
57+
"resolved": "1.9.0",
58+
"contentHash": "+ZXppf8Qxz3OdC803T8fB6i8iSscc8PsxMnM/JizSOYmkz+8vGiScEiaBBBFNZtMh2KpA0q+qxwnSwQUkbvzog==",
6159
"dependencies": {
6260
"Microsoft.Extensions.Configuration": "8.0.0",
6361
"Microsoft.Extensions.Options": "8.0.0",
64-
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.0"
62+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)"
6563
}
6664
},
6765
"OpenTelemetry.Instrumentation.Process": {
6866
"type": "Direct",
69-
"requested": "[0.5.0-beta.5, )",
70-
"resolved": "0.5.0-beta.5",
71-
"contentHash": "jWGUzdqfdGkkUWzeuCzxf3Ict+XDt2mTtGTjnIsytl1QYtxQs9+OyZYPV2UmaK31syl89ugup09x7mWVjH7qIw==",
67+
"requested": "[0.5.0-beta.7, )",
68+
"resolved": "0.5.0-beta.7",
69+
"contentHash": "v+g5CPU/sJhyc1FTOgTaQTwvrQXquSxdndF+E3fS8SXYPLVAa2INHa8jqCFKvYp1rO+yaVizRw1gCOaDJJzauA==",
7270
"dependencies": {
73-
"OpenTelemetry.Api": "[1.8.0, 2.0.0)"
71+
"OpenTelemetry.Api": "[1.9.0, 2.0.0)"
7472
}
7573
},
7674
"OpenTelemetry.Instrumentation.Runtime": {
7775
"type": "Direct",
78-
"requested": "[1.8.1, )",
79-
"resolved": "1.8.1",
80-
"contentHash": "eorE+GDtia+UNC5j1g5SqhnR7ghqiqsoCsEqnKYtKqj1jzhk90Di6e4fA8sSJLTQYYVqiZY/pLbnGTycnavBfg==",
76+
"requested": "[1.9.0, )",
77+
"resolved": "1.9.0",
78+
"contentHash": "6raJb9Pvi1CaBB59SX86Mr9NQiQbiv9ialO+cQKFRGCq3Bl2WC8cTTcbfGtaRX0quqWnZC/dK7xrXuOuYcwANA==",
8179
"dependencies": {
82-
"OpenTelemetry.Api": "[1.8.1, 2.0.0)"
80+
"OpenTelemetry.Api": "[1.9.0, 2.0.0)"
8381
}
8482
},
8583
"SonarAnalyzer.CSharp": {
8684
"type": "Direct",
87-
"requested": "[9.26.0.92422, )",
88-
"resolved": "9.26.0.92422",
89-
"contentHash": "xfyzQhAZ5Qyxkl/KkLUfvLQR6eMCXJG1bngvJNFypZYkuGU0Inb4lWi6I6HCgUnVCJSoafLRJzyWC0HYinhR3A=="
85+
"requested": "[9.32.0.97167, )",
86+
"resolved": "9.32.0.97167",
87+
"contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg=="
9088
},
9189
"StyleCop.Analyzers": {
9290
"type": "Direct",
@@ -248,29 +246,29 @@
248246
},
249247
"OpenTelemetry": {
250248
"type": "Transitive",
251-
"resolved": "1.8.1",
252-
"contentHash": "70pb4YyPJnoV3vZOxpusEzBqgY6NyLwyruhas5d3bUO10GnldRWGE8DF4UusbinxnTLOpSmNzsaOb5R1v+Mt0g==",
249+
"resolved": "1.9.0",
250+
"contentHash": "7scS6BUhwYeSXEDGhCxMSezmvyCoDU5kFQbmfyW9iVvVTcWhec+1KIN33/LOCdBXRkzt2y7+g03mkdAB0XZ9Fw==",
253251
"dependencies": {
254252
"Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0",
255253
"Microsoft.Extensions.Logging.Configuration": "8.0.0",
256-
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.1"
254+
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.9.0"
257255
}
258256
},
259257
"OpenTelemetry.Api": {
260258
"type": "Transitive",
261-
"resolved": "1.8.1",
262-
"contentHash": "QCwCJp/ndXzlTBiTJjcpkpi4tntv1qSRJMXv0YNKcptE/FRMufiIA7IWTegS7C1/r3YQQwGiwdHARcZcS41JMw==",
259+
"resolved": "1.9.0",
260+
"contentHash": "Xz8ZvM1Lm0m7BbtGBnw2JlPo++YKyMp08zMK5p0mf+cIi5jeMt2+QsYu9X6YEAbjCxBQYwEak5Z8sY6Ig2WcwQ==",
263261
"dependencies": {
264262
"System.Diagnostics.DiagnosticSource": "8.0.0"
265263
}
266264
},
267265
"OpenTelemetry.Api.ProviderBuilderExtensions": {
268266
"type": "Transitive",
269-
"resolved": "1.8.1",
270-
"contentHash": "/M1vkPg2i2UpnHMlV8kFS4ct9O2cg3C+KVgPI/6G/tp99AzwGIvZZv0NswnjKBqis/Lr9Lv2eeF1yvG1KpBP/w==",
267+
"resolved": "1.9.0",
268+
"contentHash": "L0D4LBR5JFmwLun5MCWVGapsJLV0ANZ+XXu9NEI3JE/HRKkRuUO+J2MuHD5DBwiU//QMYYM4B22oev1hVLoHDQ==",
271269
"dependencies": {
272270
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
273-
"OpenTelemetry.Api": "1.8.1"
271+
"OpenTelemetry.Api": "1.9.0"
274272
}
275273
},
276274
"StyleCop.Analyzers.Unstable": {
@@ -285,13 +283,8 @@
285283
},
286284
"System.Text.Encodings.Web": {
287285
"type": "Transitive",
288-
"resolved": "4.7.2",
289-
"contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA=="
290-
},
291-
"System.Text.Json": {
292-
"type": "Transitive",
293-
"resolved": "4.7.2",
294-
"contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg=="
286+
"resolved": "4.5.0",
287+
"contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g=="
295288
}
296289
}
297290
}

0 commit comments

Comments
 (0)