Removed utils function

Author: daniel-romano-DD

shared/src/native-src/util.cpp

@@ -6,24 +6,9 @@
 #include <sstream>
 #include <string> //NOLINT
 #include <vector>
-#include "../../../shared/src/native-src/version.h"
-
 
 namespace shared
 {
-    shared::WSTRING nameW = WStr("");
-    WCHAR* GetDatadogAssemblyString()
-    {
-        if (nameW.empty())
-        {
-            std::string version = ::PROFILER_VERSION;
-            std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
-            shared::WSTRING nameW = ToWSTRING(name);
-        }
-
-        return (WCHAR*) (nameW.c_str());
-    }
-
     template <typename In, typename Out>
     void Split(const In& s, typename In::value_type delim, Out result)
     {

shared/src/native-src/util.h

@@ -24,8 +24,6 @@
 
 namespace shared
 {
-    WCHAR* GetDatadogAssemblyString();
-
     template <typename In, typename Out>
     void Split(const WSTRING& s, typename In::value_type delim, Out result);
 

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

@@ -511,14 +511,18 @@ internal static void GenerateNativeFile(Dictionary<CallTargetDefinitionSource, T
                 // </copyright>
                 // <auto-generated/>
                 #include "generated_definitions.h"
+                #include "../../../../shared/src/native-src/version.h"
 
                 namespace trace
                 {
                 int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
                 {
+                std::string version = PROFILER_VERSION;
+                std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
+                shared::WSTRING nameW = ToWSTRING(name);
+                WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
                 """);
 
-            sb.AppendLine($"WCHAR* assemblyName = GetDatadogAssemblyString();");
             sb.AppendLine();
 
             // Retrieve all signatures

tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp

@@ -4,12 +4,16 @@
 // </copyright>
 // <auto-generated/>
 #include "generated_definitions.h"
+#include "../../../../shared/src/native-src/version.h"
 
 namespace trace
 {
 int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
 {
-WCHAR* assemblyName = GetDatadogAssemblyString();
+std::string version = PROFILER_VERSION;
+std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
+shared::WSTRING nameW = ToWSTRING(name);
+WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
 
 WCHAR* sig000[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),};
 WCHAR* sig001[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),(WCHAR*)WStr("!!0"),};