consolidate/cleanup SA1000 (#2577)

open-telemetry · Nov 9, 2021 · 0ed4ed6 · 0ed4ed6
1 parent 11654f1
commit 0ed4ed6
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 deletions.
diff --git a/build/OpenTelemetry.prod.loose.ruleset b/build/OpenTelemetry.prod.loose.ruleset
@@ -5,7 +5,8 @@
     <Description Resource="OpenTelemetrySDKRules_Description" />
   </Localization>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="SA1000" Action="Warning" />
+    <!-- SA1000 KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214 -->
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1001" Action="Warning" />
     <Rule Id="SA1002" Action="Warning" />
     <Rule Id="SA1003" Action="Warning" />

diff --git a/build/OpenTelemetry.prod.ruleset b/build/OpenTelemetry.prod.ruleset
@@ -5,6 +5,8 @@
     <Description Resource="OpenTelemetrySDKRules_Description" />
   </Localization>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <!-- SA1000 KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214 -->
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1200" Action="None" />
     <Rule Id="SA1401" Action="None" />
     <Rule Id="SA1512" Action="None" />

diff --git a/build/OpenTelemetry.test.ruleset b/build/OpenTelemetry.test.ruleset
@@ -6,6 +6,8 @@
   </Localization>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
+    <!-- SA1000 KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214 -->
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1200" Action="None" />
     <Rule Id="SA1401" Action="None" />
     <Rule Id="SA1512" Action="None" />

diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props
@@ -2,7 +2,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenTelemetry.sln'))\build\Common.nonprod.props" />
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn),SA1000</NoWarn>
     <OutputType>Exe</OutputType>
     <!-- https://dotnet.microsoft.com/download/dotnet-core -->
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>

diff --git a/examples/Console/TestPrometheusExporter.cs b/examples/Console/TestPrometheusExporter.cs
@@ -56,7 +56,6 @@ internal static object Run(int port, int totalDurationInMins)
                 })
                 .Build();
 
-#pragma warning disable SA1000 // KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214
             ObservableGauge<long> gauge = MyMeter.CreateObservableGauge(
             "myGauge",
             () =>
@@ -82,7 +81,6 @@ internal static object Run(int port, int totalDurationInMins)
                 }
             });
             writeMetricTask.Start();
-#pragma warning restore SA1000 // KeywordsMustBeSpacedCorrectly
 
             token.CancelAfter(totalDurationInMins * 60 * 1000);
 

diff --git a/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj b/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn),SA1000</NoWarn>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>

diff --git a/test/OpenTelemetry.Tests/Metrics/MetricAPITest.cs b/test/OpenTelemetry.Tests/Metrics/MetricAPITest.cs
@@ -26,7 +26,6 @@
 
 namespace OpenTelemetry.Metrics.Tests
 {
-#pragma warning disable SA1000 // KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214
     public class MetricApiTest
     {
         private const int MaxTimeToAllowForFlush = 10000;
@@ -655,5 +654,4 @@ private class UpdateThreadArguments<T>
             public T DeltaValueUpdatedByEachCall;
         }
     }
-#pragma warning restore SA1000 // KeywordsMustBeSpacedCorrectly
 }
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs b/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs
@@ -23,7 +23,6 @@
 
 namespace OpenTelemetry.Metrics.Tests
 {
-#pragma warning disable SA1000 // KeywordsMustBeSpacedCorrectly https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3214
     public class MetricViewTests
     {
         private const int MaxTimeToAllowForFlush = 10000;
@@ -559,5 +558,4 @@ public void MetricStreamConfigurationForDropMustNotAllowOverriding()
             Assert.Equal(Aggregation.Drop, MetricStreamConfiguration.Drop.Aggregation);
         }
     }
-#pragma warning restore SA1000 // KeywordsMustBeSpacedCorrectly
 }