Fix variable naming

Author: andrewlock

tracer/src/Datadog.Trace/DiagnosticListeners/SingleSpanAspNetCoreDiagnosticObserver.cs

@@ -165,26 +165,26 @@ protected override void OnNext(string eventName, object arg)
 
         private void OnHostingHttpRequestInStart(object arg)
         {
-            var shouldTrace = _tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId);
-            var shouldSecure = _security.AppsecEnabled;
+            var integrationEnabled = _tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId);
+            var appsecEnabled = _security.AppsecEnabled;
 
-            if (!shouldTrace && !shouldSecure)
+            if (!integrationEnabled && !appsecEnabled)
             {
                 return;
             }
 
             if (arg.TryDuckCast<AspNetCoreDiagnosticObserver.HttpRequestInStartStruct>(out var requestStruct))
             {
                 var httpContext = requestStruct.HttpContext;
-                if (shouldTrace)
+                if (integrationEnabled)
                 {
                     // Use an empty resource name here, as we will likely replace it as part of the request
                     // If we don't, update it in OnHostingHttpRequestInStop or OnHostingUnhandledException
                     // If the app is using resource-based sampling rules, then we need to set a resource straight
                     // away, so force that by using null.
                     var resourceName = _tracer.CurrentTraceSettings.HasResourceBasedSamplingRule ? null : string.Empty;
                     var scope = AspNetCoreRequestHandler.StartAspNetCoreSingleSpanPipelineScope(_tracer, _security, _iast, httpContext, resourceName);
-                    if (shouldSecure)
+                    if (appsecEnabled)
                     {
                         CoreHttpContextStore.Instance.Set(httpContext);
                         var securityReporter = new SecurityReporter(scope.Span, new SecurityCoordinator.HttpTransport(httpContext));
@@ -315,11 +315,11 @@ private void OnRoutingEndpointMatched(object arg)
 
         private void OnMvcBeforeAction(object arg)
         {
-            var shouldSecure = _security.AppsecEnabled;
-            var shouldUseIast = _iast.Settings.Enabled;
+            var appsecEnabled = _security.AppsecEnabled;
+            var iastEnabled = _iast.Settings.Enabled;
             var isCodeOriginEnabled = CurrentCodeOrigin is { Settings.CodeOriginForSpansEnabled: true };
 
-            if (!shouldSecure && !shouldUseIast && !isCodeOriginEnabled)
+            if (!appsecEnabled && !iastEnabled && !isCodeOriginEnabled)
             {
                 return;
             }
@@ -342,7 +342,7 @@ private void OnMvcBeforeAction(object arg)
 
                 _security.CheckPathParamsFromAction(httpContext, rootSpan, typedArg.ActionDescriptor?.Parameters, typedArg.RouteData.Values);
 
-                if (shouldUseIast)
+                if (iastEnabled)
                 {
                     rootSpan.Context.TraceContext.IastRequestContext?.AddRequestData(httpContext.Request, typedArg.RouteData?.Values);
                 }

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AspNetCore/AspNetCoreIisMvcTestBase.cs

@@ -32,7 +32,7 @@ protected AspNetCoreIisMvcTestBase(string sampleName, IisFixture fixture, ITestO
             SetServiceVersion("1.0.0");
 
             SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.RouteTemplateResourceNamesEnabled, (flags == AspNetCoreFeatureFlags.RouteTemplateResourceNames).ToString());
-            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspnetcoreEnabled, (flags == AspNetCoreFeatureFlags.SingleSpan).ToString());
+            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspNetCoreEnabled, (flags == AspNetCoreFeatureFlags.SingleSpan).ToString());
 
             Fixture = fixture;
         }

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AspNetCore/AspNetCoreMvcTestBase.cs

@@ -59,7 +59,7 @@ protected AspNetCoreMvcTestBase(string sampleName, AspNetCoreTestFixture fixture
             SetServiceVersion("1.0.0");
 
             SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.RouteTemplateResourceNamesEnabled, (flags == AspNetCoreFeatureFlags.RouteTemplateResourceNames).ToString());
-            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspnetcoreEnabled, (flags == AspNetCoreFeatureFlags.SingleSpan).ToString());
+            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspNetCoreEnabled, (flags == AspNetCoreFeatureFlags.SingleSpan).ToString());
 
             Fixture = fixture;
             Fixture.SetOutput(output);

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AspNetCore/AspNetCoreMvcWrongMethodTestBase.cs

@@ -30,7 +30,7 @@ protected AspNetCoreMvcWrongMethodTestBase(string testName, string sampleName, A
             this.fixture = fixture;
             _testName = testName;
 
-            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspnetcoreEnabled, singleSpan.ToString());
+            SetEnvironmentVariable(ConfigurationKeys.FeatureFlags.SingleSpanAspNetCoreEnabled, singleSpan.ToString());
         }
 
         public override Result ValidateIntegrationSpan(MockSpan span, string metadataSchemaVersion) =>