[fleet installer] Remove the global instrumentation commands (#7182)

## Summary of changes

- Removes the global instrumentation command
- Moves the global instrumentation logic into IIS command (currently
unused)
- Removes non-applicable smoke tests

## Reason for change

We are changing the approach to shipping the command, and don't want to
expose an additional command, as discussed with @bmermet

## Implementation details

- Move the logic previously in the "global" commands into the IIS
commands
- Refactor, so it's easy to switch to the alternative
- Remove the smoke tests that test with the "global" commands

## Test coverage

As long as the existing smoke tests pass, this is fine.

## Other details

We jumped the gun a bit merging those commands, so are backing them out.
See #7183 for an
alternative approach we're looking at.

Author: andrewlock

.azure-pipelines/ultimate-pipeline.yml

@@ -6006,81 +6006,6 @@ stages:
         - script: tracer\build.cmd CheckSmokeTestsForErrors
           displayName: CheckSmokeTestsForErrors
 
-- stage: fleet_installer_smoke_tests
-  dependsOn: [package_windows, generate_variables, merge_commit_id]
-  variables:
-    targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
-    targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
-    dockerComposePath: 'C:/docker-compose/docker-compose.exe'
-  jobs:
-    - template: steps/update-github-status-jobs.yml
-      parameters:
-        jobs: [windows]
-
-    - job: windows
-      timeoutInMinutes: 45 # should take ~15 mins as large Windows docker files
-      strategy:
-        matrix: $[ stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.fleet_installer_windows_smoke_tests_matrix'] ]
-      variables:
-        smokeTestAppDir: "$(System.DefaultWorkingDirectory)/tracer/test/test-applications/regression/AspNetCoreSmokeTest"
-      pool:
-        vmImage: windows-2022
-
-      steps:
-        - template: steps/install-docker-compose-v1.yml
-          parameters:
-            dockerComposePath: $(dockerComposePath)
-
-        - template: steps/clone-repo.yml
-          parameters:
-            targetShaId: $(targetShaId)
-            targetBranch: $(targetBranch)
-
-        - template: steps/download-artifact.yml
-          parameters:
-            artifact: windows-tracer-home.zip
-            path: $(smokeTestAppDir)/artifacts
-
-        - template: steps/download-artifact.yml
-          parameters:
-            artifact: fleet-installer
-            path: $(smokeTestAppDir)/artifacts/installer
-
-        - powershell: |
-            ls $(smokeTestAppDir)/artifacts
-            ls $(smokeTestAppDir)/artifacts/installer
-            mkdir -p artifacts/build_data/snapshots
-            mkdir -p artifacts/build_data/logs
-          displayName: Create test data directories
-
-        - bash: |
-            $(dockerComposePath) -f docker-compose.windows.yml -p $(DockerComposeProjectName) build \
-              --build-arg DOTNETSDK_VERSION=$(dotnetCoreSdkLatestVersionShort) \
-              --build-arg RUNTIME_IMAGE=$(runtimeImage) \
-              --build-arg PUBLISH_FRAMEWORK=$(publishFramework) \
-              --build-arg CHANNEL_32_BIT="$(channel32Bit)" \
-              fleet-installer-smoke-tests.windows
-          env:
-            dockerTag: $(dockerTag)
-          displayName: docker-compose build smoke-tests
-          retryCountOnTaskFailure: 3
-
-        - template: steps/run-snapshot-test.yml
-          parameters:
-            target: 'fleet-installer-smoke-tests.windows'
-            snapshotPrefix: "smoke_test"
-            isLinux: false
-            dockerComposePath: $(dockerComposePath)
-
-        - publish: artifacts/build_data
-          artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
-          condition: always()
-          continueOnError: true
-
-        - template: steps/install-latest-dotnet-sdk.yml
-        - script: tracer\build.cmd CheckSmokeTestsForErrors
-          displayName: CheckSmokeTestsForErrors
-
 - stage: dotnet_tool_nuget_smoke_tests_macos
   condition: and(succeeded(), or(eq(variables.isMainOrReleaseBranch, 'true'), eq(variables.run_all_installer_tests, 'true')))
   dependsOn: [dotnet_tool, generate_variables, merge_commit_id]

tracer/build/_build/Build.VariableGenerations.cs

@@ -1495,7 +1495,7 @@ void GenerateWindowsFleetInstallerIisSmokeTestsMatrix()
                     var matrix = (
                                      from platform in platforms
                                      from image in runtimeImages
-                                     from globalInstall in new[] { false, true }
+                                     from globalInstall in new[] { false } // global install isn't currently supported
                                      let installCommand = globalInstall ? "enable-global-instrumentation" : "enable-iis-instrumentation"
                                      let dockerTag = $"{image.PublishFramework}_{platform}_{image.RuntimeTag}_{(globalInstall ? "global" : "iis")}".Replace('.', '_')
                                      select new

tracer/src/Datadog.FleetInstaller/Commands/EnableGlobalInstrumentationCommand.cs

@@ -45,8 +45,44 @@ public Task ExecuteAsync(InvocationContext context)
         return Task.CompletedTask;
     }
 
+    internal static ReturnCode Execute(ILogger log, TracerValues tracerInstallValues)
+        => ExecuteIIs(log, tracerInstallValues);
+
+    internal static ReturnCode ExecuteGlobal(ILogger log, TracerValues tracerInstallValues)
+    {
+        log.WriteInfo("Enabling instrumentation for .NET tracer");
+
+        if (!GlobalEnvVariableHelper.SetMachineEnvironmentVariables(log, tracerInstallValues, out var previousVariables))
+        {
+            log.WriteError("Failed to set global environment variables");
+            return ReturnCode.ErrorSettingGlobalEnvironmentVariables;
+        }
+
+        // We can't enable iis instrumentation if IIS is not available or it's too low of a version
+        if (!HasValidIIsVersion(out var errorMessage))
+        {
+            // nothing more to do in this case
+            log.WriteInfo("Skipping IIS instrumentation. " + errorMessage);
+            log.WriteInfo("Instrumentation complete");
+            return ReturnCode.Success;
+        }
+
+        var iisResult = ExecuteIIs(log, tracerInstallValues);
+        if (iisResult is ReturnCode.Success)
+        {
+            log.WriteInfo("Instrumentation complete");
+            return ReturnCode.Success;
+        }
+
+        log.WriteInfo("Reverting global environment variables after failed install");
+        GlobalEnvVariableHelper.RevertMachineEnvironmentVariables(log, previousVariables);
+
+        log.WriteError("Instrumentation failed");
+        return iisResult;
+    }
+
     // Internal for testing
-    internal static ReturnCode Execute(ILogger log, TracerValues tracerValues)
+    internal static ReturnCode ExecuteIIs(ILogger log, TracerValues tracerValues)
     {
         log.WriteInfo("Enabling IIS instrumentation for .NET tracer");
 

tracer/src/Datadog.FleetInstaller/Commands/EnableIisInstrumentationCommand.cs

@@ -37,6 +37,28 @@ public Task ExecuteAsync(InvocationContext context)
 
     // Internal for testing
     internal static ReturnCode Execute(ILogger log)
+        => ExecuteIis(log);
+
+    internal static ReturnCode ExecuteGlobal(ILogger log)
+    {
+        log.WriteInfo("Removing global instrumentation for .NET tracer");
+
+        if (!GlobalEnvVariableHelper.RemoveMachineEnvironmentVariables(log))
+        {
+            log.WriteError("Failed to remove global environment variables. Apps may continue to be instrumented");
+            return ReturnCode.ErrorRemovingGlobalEnvironmentVariables;
+        }
+
+        var iisResult = ExecuteIis(log);
+        if (iisResult != ReturnCode.Success)
+        {
+            log.WriteError("Failed to remove IIS instrumentation. Apps may continue to be instrumented");
+        }
+
+        return iisResult;
+    }
+
+    internal static ReturnCode ExecuteIis(ILogger log)
     {
         log.WriteInfo("Removing IIS instrumentation for .NET tracer");
 

tracer/src/Datadog.FleetInstaller/Commands/RemoveGlobalInstrumentationCommand.cs

@@ -37,12 +37,6 @@
 rootCommand.AddExample("""
                        remove-iis-instrumentation"
                        """);
-rootCommand.AddExample("""
-                       enable-global-instrumentation --home-path "C:\datadog\versions\3.9.0"
-                       """);
-rootCommand.AddExample("""
-                       remove-global-instrumentation"
-                       """);
 rootCommand.AddExample("""
                        available-commands"
                        """);
@@ -51,8 +45,6 @@
 rootCommand.AddCommand(new UninstallVersionCommand());
 rootCommand.AddCommand(new EnableIisInstrumentationCommand());
 rootCommand.AddCommand(new RemoveIisInstrumentationCommand());
-rootCommand.AddCommand(new EnableGlobalInstrumentationCommand());
-rootCommand.AddCommand(new RemoveGlobalInstrumentationCommand());
 rootCommand.AddCommand(new AvailableCommandsCommand(rootCommand));
 
 return builder.Build().Invoke(args);