Skip to content
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

Jump to bottom

[Fleet Installer] Don't throw when deleting registry value if it's already deleted #6672

Merged
merged 1 commit into from
Feb 18, 2025
Merged

[Fleet Installer] Don't throw when deleting registry value if it's already deleted #6672

merged 1 commit into from
Feb 18, 2025

Conversation

andrewlock
Copy link
Member

Summary of changes

Don't throw when deleting registry value if it's already deleted.

Reason for change

The uninstall command should be idempotent. Currently, if you run it twice, it will fail, because it can't find the crash-tracking key to delete.

Implementation details

I assumed RegistryKey.DeleteValue() worked like File.Delete(). It doesn't, you need to pass throwOnMissingValue.

Test coverage

Yeah... I still need to write integration tests, and this will be part of them

@andrewlock andrewlock requested a review from a team as a code owner February 17, 2025 10:53
@andrewlock
Copy link
Member Author

andrewlock commented Feb 17, 2025 •
edited
Loading

Execution-Time Benchmarks Report ⏱️

Execution-time results for samples comparing the following branches/commits:

Execution-time benchmarks measure the whole time it takes to execute a program. And are intended to measure the one-off costs. Cases where the execution time results for the PR are worse than latest master results are shown in red. The following thresholds were used for comparing the execution times:

  • Welch test with statistical test for significance of 5%
  • Only results indicating a difference greater than 5% and 5 ms are considered.

Note that these results are based on a single point-in-time result for each branch. For full results, see the dashboard.

Graphs show the p99 interval based on the mean and StdDev of the test run, as well as the mean value of the run (shown as a diamond below the graph).

gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (69ms)  : 67, 71
     .   : milestone, 69,
    master - mean (69ms)  : 66, 71
     .   : milestone, 69,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (997ms)  : 975, 1020
     .   : milestone, 997,
    master - mean (996ms)  : 972, 1019
     .   : milestone, 996,
Loading 
gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (102ms)  : 100, 104
     .   : milestone, 102,
    master - mean (101ms)  : 99, 103
     .   : milestone, 101,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (677ms)  : 653, 702
     .   : milestone, 677,
    master - mean (675ms)  : 660, 691
     .   : milestone, 675,
Loading 
gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (89ms)  : 87, 91
     .   : milestone, 89,
    master - mean (89ms)  : 87, 91
     .   : milestone, 89,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (634ms)  : 613, 655
     .   : milestone, 634,
    master - mean (634ms)  : 614, 654
     .   : milestone, 634,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (192ms)  : 188, 196
     .   : milestone, 192,
    master - mean (191ms)  : 187, 195
     .   : milestone, 191,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (1,116ms)  : 1088, 1144
     .   : milestone, 1116,
    master - mean (1,113ms)  : 1085, 1140
     .   : milestone, 1113,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (272ms)  : 268, 276
     .   : milestone, 272,
    master - mean (271ms)  : 266, 276
     .   : milestone, 271,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (869ms)  : 830, 908
     .   : milestone, 869,
    master - mean (868ms)  : 837, 898
     .   : milestone, 868,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6672) - mean (263ms)  : 260, 267
     .   : milestone, 263,
    master - mean (262ms)  : 258, 267
     .   : milestone, 262,

    section CallTarget+Inlining+NGEN
    This PR (6672) - mean (847ms)  : 813, 881
     .   : milestone, 847,
    master - mean (848ms)  : 818, 878
     .   : milestone, 848,
Loading

@andrewlock
Copy link
Member Author

andrewlock commented Feb 17, 2025 •
edited
Loading

Benchmarks Report for tracer 🐌

Benchmarks for #6672 compared to master:

  • 2 benchmarks are slower, with geometric mean 1.138
  • All benchmarks have the same allocations

The following thresholds were used for comparing the benchmark speeds:

  • Mann–Whitney U test with statistical test for significance of 5%
  • Only results indicating a difference greater than 10% and 0.3 ns are considered.

Allocation changes below 0.5% are ignored.

Benchmark details

Benchmarks.Trace.ActivityBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master StartStopWithChild net6.0 7.89μs 45ns 321ns 0.0148 0.00738 0 5.61 KB
master StartStopWithChild netcoreapp3.1 10.2μs 56ns 331ns 0.0244 0.00977 0 5.8 KB
master StartStopWithChild net472 16μs 61ns 236ns 1.04 0.299 0.102 6.22 KB
#6672 StartStopWithChild net6.0 7.72μs 43ns 279ns 0.0159 0.00397 0 5.62 KB
#6672 StartStopWithChild netcoreapp3.1 10μs 56.8ns 377ns 0.025 0.01 0 5.8 KB
#6672 StartStopWithChild net472 15.7μs 43.8ns 170ns 1.04 0.311 0.0957 6.21 KB
Benchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master WriteAndFlushEnrichedTraces net6.0 491μs 526ns 2.04μs 0 0 0 2.7 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 648μs 459ns 1.78μs 0 0 0 2.7 KB
master WriteAndFlushEnrichedTraces net472 870μs 491ns 1.77μs 0.431 0 0 3.3 KB
#6672 WriteAndFlushEnrichedTraces net6.0 476μs 2.34μs 9.94μs 0 0 0 2.7 KB
#6672 WriteAndFlushEnrichedTraces netcoreapp3.1 646μs 455ns 1.7μs 0 0 0 2.7 KB
#6672 WriteAndFlushEnrichedTraces net472 847μs 445ns 1.66μs 0.422 0 0 3.3 KB
Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendRequest net6.0 130μs 525ns 2.03μs 0.198 0 0 14.47 KB
master SendRequest netcoreapp3.1 143μs 500ns 1.94μs 0.218 0 0 17.27 KB
master SendRequest net472 0.00978ns 0.00216ns 0.00835ns 0 0 0 0 b
#6672 SendRequest net6.0 131μs 495ns 1.92μs 0.193 0 0 14.47 KB
#6672 SendRequest netcoreapp3.1 150μs 306ns 1.18μs 0.227 0 0 17.27 KB
#6672 SendRequest net472 0.00579ns 0.00193ns 0.00749ns 0 0 0 0 b
Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master WriteAndFlushEnrichedTraces net6.0 583μs 3.25μs 20.3μs 0.598 0 0 41.63 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 651μs 2.86μs 11.1μs 0.316 0 0 41.74 KB
master WriteAndFlushEnrichedTraces net472 836μs 3.85μs 14.4μs 8.19 2.59 0.431 53.27 KB
#6672 WriteAndFlushEnrichedTraces net6.0 565μs 3.15μs 19.4μs 0.539 0 0 41.52 KB
#6672 WriteAndFlushEnrichedTraces netcoreapp3.1 659μs 3.42μs 15.7μs 0.332 0 0 41.75 KB
#6672 WriteAndFlushEnrichedTraces net472 882μs 4.43μs 18.8μs 8.19 2.59 0.431 53.31 KB
Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteNonQuery net6.0 1.35μs 1.2ns 4.65ns 0.0143 0 0 1.02 KB
master ExecuteNonQuery netcoreapp3.1 1.71μs 1.13ns 4.36ns 0.0138 0 0 1.02 KB
master ExecuteNonQuery net472 2.11μs 2.75ns 10.7ns 0.156 0.00106 0 987 B
#6672 ExecuteNonQuery net6.0 1.26μs 1ns 3.89ns 0.0145 0 0 1.02 KB
#6672 ExecuteNonQuery netcoreapp3.1 1.75μs 2.95ns 11ns 0.0129 0 0 1.02 KB
#6672 ExecuteNonQuery net472 2μs 1.65ns 6.19ns 0.156 0.001 0 987 B
Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master CallElasticsearch net6.0 1.31μs 0.593ns 2.22ns 0.0139 0 0 976 B
master CallElasticsearch netcoreapp3.1 1.54μs 0.821ns 3.18ns 0.0128 0 0 976 B
master CallElasticsearch net472 2.51μs 1.61ns 6.23ns 0.157 0 0 995 B
master CallElasticsearchAsync net6.0 1.29μs 0.767ns 2.97ns 0.013 0 0 952 B
master CallElasticsearchAsync netcoreapp3.1 1.65μs 0.879ns 3.17ns 0.014 0 0 1.02 KB
master CallElasticsearchAsync net472 2.51μs 0.746ns 2.69ns 0.167 0 0 1.05 KB
#6672 CallElasticsearch net6.0 1.21μs 0.758ns 2.94ns 0.0135 0 0 976 B
#6672 CallElasticsearch netcoreapp3.1 1.59μs 0.805ns 3.01ns 0.0135 0 0 976 B
#6672 CallElasticsearch net472 2.46μs 2.33ns 9.01ns 0.158 0 0 995 B
#6672 CallElasticsearchAsync net6.0 1.37μs 0.404ns 1.46ns 0.0131 0 0 952 B
#6672 CallElasticsearchAsync netcoreapp3.1 1.64μs 0.644ns 2.5ns 0.014 0 0 1.02 KB
#6672 CallElasticsearchAsync net472 2.54μs 1.91ns 7.4ns 0.167 0 0 1.05 KB
Benchmarks.Trace.GraphQLBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #6672

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.GraphQLBenchmark.ExecuteAsync‑net6.0 1.157 1,185.63 1,372.35

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteAsync net6.0 1.19μs 0.383ns 1.48ns 0.0137 0 0 952 B
master ExecuteAsync netcoreapp3.1 1.62μs 1.5ns 5.79ns 0.0122 0 0 952 B
master ExecuteAsync net472 1.84μs 0.6ns 2.16ns 0.145 0 0 915 B
#6672 ExecuteAsync net6.0 1.37μs 1.08ns 4.18ns 0.0136 0 0 952 B
#6672 ExecuteAsync netcoreapp3.1 1.69μs 0.663ns 2.57ns 0.0128 0 0 952 B
#6672 ExecuteAsync net472 1.89μs 0.804ns 3.11ns 0.145 0 0 915 B
Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendAsync net6.0 4.42μs 1.17ns 4.37ns 0.0309 0 0 2.31 KB
master SendAsync netcoreapp3.1 5.35μs 5.4ns 19.5ns 0.0376 0 0 2.85 KB
master SendAsync net472 7.42μs 1.17ns 4.37ns 0.494 0 0 3.12 KB
#6672 SendAsync net6.0 4.31μs 1.21ns 4.54ns 0.0322 0 0 2.31 KB
#6672 SendAsync netcoreapp3.1 5.18μs 2.2ns 8.5ns 0.0391 0 0 2.85 KB
#6672 SendAsync net472 7.61μs 2.29ns 8.87ns 0.493 0 0 3.12 KB
Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 1.47μs 0.602ns 2.33ns 0.0227 0 0 1.64 KB
master EnrichedLog netcoreapp3.1 2.18μs 0.913ns 3.41ns 0.0216 0 0 1.64 KB
master EnrichedLog net472 2.54μs 0.954ns 3.57ns 0.249 0 0 1.57 KB
#6672 EnrichedLog net6.0 1.52μs 0.604ns 2.18ns 0.0227 0 0 1.64 KB
#6672 EnrichedLog netcoreapp3.1 2.24μs 1.55ns 5.81ns 0.0223 0 0 1.64 KB
#6672 EnrichedLog net472 2.72μs 1.02ns 3.67ns 0.249 0 0 1.57 KB
Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 113μs 140ns 525ns 0.0562 0 0 4.28 KB
master EnrichedLog netcoreapp3.1 119μs 152ns 590ns 0.0595 0 0 4.28 KB
master EnrichedLog net472 149μs 119ns 460ns 0.669 0.223 0 4.46 KB
#6672 EnrichedLog net6.0 115μs 142ns 532ns 0.0572 0 0 4.28 KB
#6672 EnrichedLog netcoreapp3.1 117μs 159ns 616ns 0.0582 0 0 4.28 KB
#6672 EnrichedLog net472 151μs 341ns 1.32μs 0.677 0.226 0 4.46 KB
Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 3.09μs 0.966ns 3.74ns 0.0307 0 0 2.2 KB
master EnrichedLog netcoreapp3.1 4.1μs 1.99ns 7.69ns 0.0287 0 0 2.2 KB
master EnrichedLog net472 4.82μs 1.91ns 7.15ns 0.319 0 0 2.02 KB
#6672 EnrichedLog net6.0 3.24μs 6.95ns 26.9ns 0.0303 0 0 2.2 KB
#6672 EnrichedLog netcoreapp3.1 4.34μs 4.12ns 15.4ns 0.0299 0 0 2.2 KB
#6672 EnrichedLog net472 4.8μs 1.78ns 6.89ns 0.321 0 0 2.02 KB
Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendReceive net6.0 1.33μs 0.776ns 3.01ns 0.0159 0 0 1.14 KB
master SendReceive netcoreapp3.1 1.88μs 2.78ns 10.8ns 0.015 0 0 1.14 KB
master SendReceive net472 2.05μs 0.792ns 2.96ns 0.183 0 0 1.16 KB
#6672 SendReceive net6.0 1.34μs 0.775ns 2.9ns 0.016 0 0 1.14 KB
#6672 SendReceive netcoreapp3.1 1.71μs 1.03ns 4ns 0.0155 0 0 1.14 KB
#6672 SendReceive net472 2.06μs 1.1ns 4.13ns 0.183 0 0 1.16 KB
Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 2.88μs 0.712ns 2.76ns 0.0217 0 0 1.6 KB
master EnrichedLog netcoreapp3.1 3.82μs 1.98ns 7.67ns 0.021 0 0 1.65 KB
master EnrichedLog net472 4.29μs 4.29ns 16ns 0.322 0 0 2.04 KB
#6672 EnrichedLog net6.0 2.71μs 1.24ns 4.64ns 0.0229 0 0 1.6 KB
#6672 EnrichedLog netcoreapp3.1 3.79μs 1.66ns 6.44ns 0.0228 0 0 1.65 KB
#6672 EnrichedLog net472 4.29μs 2.53ns 9.46ns 0.323 0 0 2.04 KB
Benchmarks.Trace.SpanBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master StartFinishSpan net6.0 397ns 0.466ns 1.8ns 0.00815 0 0 576 B
master StartFinishSpan netcoreapp3.1 607ns 0.892ns 3.45ns 0.0076 0 0 576 B
master StartFinishSpan net472 589ns 0.939ns 3.51ns 0.0918 0 0 578 B
master StartFinishScope net6.0 485ns 0.717ns 2.78ns 0.00983 0 0 696 B
master StartFinishScope netcoreapp3.1 742ns 2.23ns 8.62ns 0.00941 0 0 696 B
master StartFinishScope net472 828ns 1.73ns 6.72ns 0.104 0 0 658 B
#6672 StartFinishSpan net6.0 398ns 0.54ns 2.09ns 0.00811 0 0 576 B
#6672 StartFinishSpan netcoreapp3.1 604ns 3.1ns 13.9ns 0.00759 0 0 576 B
#6672 StartFinishSpan net472 627ns 0.571ns 2.21ns 0.0917 0 0 578 B
#6672 StartFinishScope net6.0 465ns 0.285ns 1.07ns 0.00984 0 0 696 B
#6672 StartFinishScope netcoreapp3.1 725ns 0.576ns 2.23ns 0.00945 0 0 696 B
#6672 StartFinishScope net472 869ns 0.915ns 3.54ns 0.104 0 0 658 B
Benchmarks.Trace.TraceAnnotationsBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #6672

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.TraceAnnotationsBenchmark.RunOnMethodBegin‑net6.0 1.119 642.65 719.20

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master RunOnMethodBegin net6.0 643ns 0.873ns 3.38ns 0.0096 0 0 696 B
master RunOnMethodBegin netcoreapp3.1 947ns 1.87ns 7.23ns 0.00917 0 0 696 B
master RunOnMethodBegin net472 1.09μs 2.22ns 8.29ns 0.105 0 0 658 B
#6672 RunOnMethodBegin net6.0 718ns 0.764ns 2.96ns 0.00962 0 0 696 B
#6672 RunOnMethodBegin netcoreapp3.1 887ns 1.06ns 4.1ns 0.00928 0 0 696 B
#6672 RunOnMethodBegin net472 1.08μs 1.22ns 4.72ns 0.104 0 0 658 B

@andrewlock andrewlock force-pushed the andrew/win-ssi/dont-crash-if-unable-to-uninstall-reg-key branch from 64f40ed to e251d32 Compare February 17, 2025 12:19
@andrewlock andrewlock merged commit f68b537 into master Feb 18, 2025
140 of 142 checks passed
@andrewlock andrewlock deleted the andrew/win-ssi/dont-crash-if-unable-to-uninstall-reg-key branch February 18, 2025 14:34
@github-actions github-actions bot added this to the vNext-v3 milestone Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevingosse kevingosse kevingosse approved these changes

Assignees
No one assigned
Labels
area:ssi
Projects
None yet
Milestone
3.11.0
Development

Successfully merging this pull request may close these issues.
2 participants
@andrewlock @kevingosse