profiler unit test update

newrelic · Sep 5, 2024 · 5302237 · 5302237
1 parent b801666
commit 5302237
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.cpp b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.cpp
@@ -73,7 +73,7 @@ namespace NewRelic { namespace Profiler { namespace Configuration { namespace Te
             Assert::IsFalse(configuration.ShouldInstrument(L"foo.exe", L"", L"", L"", false));
         }
 
-        TEST_METHOD(should_instrument_azure_function_functionsnethost_commandline)
+        TEST_METHOD(should_not_instrument_azure_function_app_pool_id_in_commandline)
         {
             std::wstring configurationXml(L"\
     <?xml version=\"1.0\"?>\
@@ -87,10 +87,10 @@ namespace NewRelic { namespace Profiler { namespace Configuration { namespace Te
 
             Configuration configuration(configurationXml, _missingConfig, L"", systemCalls);
 
-            Assert::IsTrue(configuration.ShouldInstrument(L"w3wp.exe", L"", L"foo", L"FunctionsNetHost.exe blah blah blah", true));
+            Assert::IsFalse(configuration.ShouldInstrument(L"w3wp.exe", L"", L"FooBarBaz", L"blah blah blah FooBarBaz blah blah blah", true));
         }
 
-        TEST_METHOD(should_not_instrument_azure_function_app_pool_id_in_commandline)
+        TEST_METHOD(should_instrument_azure_function_fallback_to_app_pool_checking)
         {
             std::wstring configurationXml(L"\
     <?xml version=\"1.0\"?>\
@@ -104,10 +104,10 @@ namespace NewRelic { namespace Profiler { namespace Configuration { namespace Te
 
             Configuration configuration(configurationXml, _missingConfig, L"", systemCalls);
 
-            Assert::IsFalse(configuration.ShouldInstrument(L"w3wp.exe", L"", L"FooBarBaz", L"blah blah blah FooBarBaz blah blah blah", true));
+            Assert::IsTrue(configuration.ShouldInstrument(L"w3wp.exe", L"", L"foo", L"", true));
         }
 
-        TEST_METHOD(should_instrument_azure_function_fallback_to_app_pool_checking)
+        TEST_METHOD(should_not_instrument_azure_function_func_exe_process_path)
         {
             std::wstring configurationXml(L"\
     <?xml version=\"1.0\"?>\
@@ -121,10 +121,10 @@ namespace NewRelic { namespace Profiler { namespace Configuration { namespace Te
 
             Configuration configuration(configurationXml, _missingConfig, L"", systemCalls);
 
-            Assert::IsTrue(configuration.ShouldInstrument(L"w3wp.exe", L"", L"foo", L"", true));
+            Assert::IsFalse(configuration.ShouldInstrument(L"func.exe", L"", L"FooBarBaz", L"blah blah blah FooBarBaz blah blah blah", true));
         }
 
-        TEST_METHOD(should_not_instrument_azure_function_func_exe_process_path)
+        TEST_METHOD(should_instrument_azure_function_functionsnethost_exe_process_path)
         {
             std::wstring configurationXml(L"\
     <?xml version=\"1.0\"?>\
@@ -138,10 +138,9 @@ namespace NewRelic { namespace Profiler { namespace Configuration { namespace Te
 
             Configuration configuration(configurationXml, _missingConfig, L"", systemCalls);
 
-            Assert::IsFalse(configuration.ShouldInstrument(L"func.exe", L"", L"FooBarBaz", L"blah blah blah FooBarBaz blah blah blah", true));
+            Assert::IsFalse(configuration.ShouldInstrument(L"functionsnethost.exe", L"", L"FooBarBaz", L"blah blah blah FooBarBaz blah blah blah", true));
         }
 
-
         TEST_METHOD(instrument_process)
         {
             ProcessesPtr processes(new Processes());

diff --git a/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h b/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h
@@ -91,7 +91,7 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter {
         {
             // Azure Functions sets the FUNCTIONS_WORKER_RUNTIME environment variable to "dotnet-isolated" when running in the .NET worker.
             auto functionsWorkerRuntime = TryGetEnvironmentVariable(_X("FUNCTIONS_WORKER_RUNTIME"));
-            return functionsWorkerRuntime != nullptr && functionsWorkerRuntime->length() > 0;
+            return functionsWorkerRuntime != nullptr && !functionsWorkerRuntime->empty();
         }
 
         virtual bool IsAzureFunctionLogLevelOverrideEnabled() {