diff --git a/manifests/dotnet.yml b/manifests/dotnet.yml index 8e0043a7794..0fb977ccf08 100644 --- a/manifests/dotnet.yml +++ b/manifests/dotnet.yml @@ -796,9 +796,18 @@ manifest: tests/ffe/test_dynamic_evaluation.py::Test_FFE_Flag_Parse_Error_Isolation: bug (FFL-2184) tests/ffe/test_dynamic_evaluation.py::Test_FFE_Unknown_Operator_Tolerance: bug (FFL-2184) tests/ffe/test_exposure_egress.py: v3.36.0 - tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct: missing_feature (Not yet implemented) - tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct_Shutdown: missing_feature (Not yet implemented) - tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Sidecar: missing_feature (Not yet implemented) + tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct: + - weblog_declaration: + "*": irrelevant + poc: v3.55.0 # Requires dd-trace-dotnet#9235; not present in released 3.54.0. + tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct_Shutdown: + - weblog_declaration: + "*": irrelevant + poc: v3.55.0 # Requires dd-trace-dotnet#9235; not present in released 3.54.0. + tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Sidecar: + - weblog_declaration: + "*": irrelevant + poc: v3.55.0 # Requires dd-trace-dotnet#9235; not present in released 3.54.0. tests/ffe/test_exposures_datadog_agent.py: v3.36.0 tests/ffe/test_exposures_datadog_agent.py::Test_FFE_Exposure_Caching_Serial_Id_Appears: missing_feature (EX-3416) tests/ffe/test_exposures_datadog_agent.py::Test_FFE_Exposure_Caching_Serial_Id_Cycle: missing_feature (EX-3416) diff --git a/utils/build/docker/dotnet/weblog/Program.cs b/utils/build/docker/dotnet/weblog/Program.cs index 684ffb681ab..d773b53cd1a 100644 --- a/utils/build/docker/dotnet/weblog/Program.cs +++ b/utils/build/docker/dotnet/weblog/Program.cs @@ -1,6 +1,8 @@ using System; +using System.Text.Json; using System.Threading; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Http; using Datadog.Trace; @@ -37,7 +39,21 @@ public static void Main(string[] args) settings.LogsInjectionEnabled = true; Tracer.Configure(settings); } - CreateHostBuilder(args).Build().Run(); + var host = CreateHostBuilder(args).Build(); + if (Environment.GetEnvironmentVariable("SYSTEM_TESTS_FFE_SHUTDOWN_FLUSH_ENABLED") == "true") + { + host.Services.GetRequiredService().ApplicationStopped.Register(() => + { + Console.WriteLine(JsonSerializer.Serialize(new + { + @event = "system_tests.ffe.shutdown.server_closed", + timestamp = DateTimeOffset.UtcNow.ToString("O") + })); + Console.Out.Flush(); + }); + } + + host.Run(); } public static IHostBuilder CreateHostBuilder(string[] args) { diff --git a/utils/build/docker/dotnet/weblog/app.sh b/utils/build/docker/dotnet/weblog/app.sh index e1e317f764b..182fac2b980 100755 --- a/utils/build/docker/dotnet/weblog/app.sh +++ b/utils/build/docker/dotnet/weblog/app.sh @@ -8,6 +8,10 @@ if [ "${UDS_WEBLOG:-0}" = "1" ]; then ./set-uds-transport.sh fi +if [ "${SYSTEM_TESTS_FFE_SHUTDOWN_FLUSH_ENABLED:-}" = "true" ]; then + exec dotnet app.dll +fi + if ( ! dotnet app.dll); then echo recovering dump to /var/log/system-tests/dumps mkdir -p /var/log/system-tests/dumps