temp

Author: Kielek

src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt

@@ -98,12 +98,6 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BIN_DIR})
 
 # Add custom commands to setup dependencies via git
 
-add_custom_command(
-    OUTPUT ${OUTPUT_DEPS_DIR}/re2/obj/libre2.a
-    COMMAND git clone -c advice.detachedHead=false --quiet --depth 1 --branch 2023-03-01 https://github.com/google/re2.git && cd re2 && env ARFLAGS=\"-r -s -c\" CXXFLAGS=\"-std=c++11 -O3 -g -fPIC\" make
-    WORKING_DIRECTORY ${OUTPUT_DEPS_DIR}
-)
-
 add_custom_command(
     OUTPUT ${OUTPUT_DEPS_DIR}/fmt/libfmt.a
     COMMAND git clone -c advice.detachedHead=false --quiet --depth 1 --branch 10.1.1 https://github.com/fmtlib/fmt.git && cd fmt && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DFMT_TEST=0 -DFMT_DOC=0 . && make
@@ -191,7 +185,6 @@ add_library("OpenTelemetry.AutoInstrumentation.Native.static" STATIC
         lib/coreclr/src/pal/prebuilt/idl/corprof_i.cpp
         # Source dependencies retrievied via additional commands using git
         ${OUTPUT_DEPS_DIR}/fmt/libfmt.a
-        ${OUTPUT_DEPS_DIR}/re2/obj/libre2.a
 )
 
 set_target_properties("OpenTelemetry.AutoInstrumentation.Native.static" PROPERTIES PREFIX "")
@@ -204,19 +197,16 @@ target_include_directories("OpenTelemetry.AutoInstrumentation.Native.static"
         PUBLIC lib/coreclr/src/inc
         PUBLIC lib/spdlog/include
         PUBLIC ${OUTPUT_DEPS_DIR}/fmt/include
-        PUBLIC ${OUTPUT_DEPS_DIR}/re2
 )
 
 # Define linker libraries
 if (ISMACOS)
     target_link_libraries("OpenTelemetry.AutoInstrumentation.Native.static"
-        ${OUTPUT_DEPS_DIR}/re2/obj/libre2.a
         ${OUTPUT_DEPS_DIR}/fmt/libfmt.a
         ${CMAKE_DL_LIBS}
     )
 elseif(ISLINUX)
     target_link_libraries("OpenTelemetry.AutoInstrumentation.Native.static"
-        ${OUTPUT_DEPS_DIR}/re2/obj/libre2.a
         ${OUTPUT_DEPS_DIR}/fmt/libfmt.a
         ${CMAKE_DL_LIBS}
         -static-libgcc

src/OpenTelemetry.AutoInstrumentation.Native/cor_profiler.cpp

@@ -7,11 +7,7 @@
 #include <corprof.h>
 #include <string>
 #include <typeinfo>
-#ifdef _WIN32
 #include <regex>
-#else
-#include <re2/re2.h>
-#endif
 
 #include "clr_helpers.h"
 #include "dllmain.h"
@@ -75,19 +71,11 @@ HRESULT STDMETHODCALLTYPE CorProfiler::Initialize(IUnknown* cor_profiler_info_un
 
         // Update the list also in SmokeTests.NativeLogsHaveNoSensitiveData
         const auto secrets_pattern = "(?:^|_)(API|TOKEN|SECRET|KEY|PASSWORD|PASS|PWD|HEADER|CREDENTIALS)(?:_|$)";
-#ifdef _WIN32
         const std::regex secrets_regex(secrets_pattern, std::regex_constants::ECMAScript | std::regex_constants::icase);
-#else
-        static re2::RE2 re(secrets_pattern, RE2::Quiet);
-#endif
 
         for (const auto& env_variable : env_variables)
         {
-#ifdef _WIN32
             if (!std::regex_search(ToString(env_variable), secrets_regex))
-#else
-            if (!re2::RE2::PartialMatch(ToString(env_variable), re))
-#endif
             {
                 Logger::Debug("  ", env_variable);
             }

src/OpenTelemetry.AutoInstrumentation.Native/integration.cpp

@@ -3,11 +3,7 @@
 
 #include "integration.h"
 
-#ifdef _WIN32
 #include <regex>
-#else
-#include <re2/re2.h>
-#endif
 #include <sstream>
 
 #include <unordered_map>
@@ -77,8 +73,6 @@ Version GetVersionFromAssemblyReferenceString(const WSTRING& str)
         return {major, minor, build, revision};
     }
 
-#ifdef _WIN32
-
     static auto re = std::wregex(WStr("Version=([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)"));
 
     std::wsmatch match;
@@ -90,13 +84,6 @@ Version GetVersionFromAssemblyReferenceString(const WSTRING& str)
         WSTRINGSTREAM(match.str(4)) >> revision;
     }
 
-#else
-
-    static re2::RE2 re("Version=([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)", RE2::Quiet);
-    re2::RE2::PartialMatch(ToString(str), re, &major, &minor, &build, &revision);
-
-#endif
-
     return {major, minor, build, revision};
 }
 
@@ -109,27 +96,13 @@ WSTRING GetLocaleFromAssemblyReferenceString(const WSTRING& str)
         return locale;
     }
 
-#ifdef _WIN32
-
     static auto  re = std::wregex(WStr("Culture=([a-zA-Z0-9]+)"));
     std::wsmatch match;
     if (std::regex_search(str, match, re) && match.size() == 2)
     {
         locale = match.str(1);
     }
 
-#else
-
-    static re2::RE2 re("Culture=([a-zA-Z0-9]+)", RE2::Quiet);
-
-    std::string match;
-    if (re2::RE2::PartialMatch(ToString(str), re, &match))
-    {
-        locale = ToWSTRING(match);
-    }
-
-#endif
-
     return locale;
 }
 
@@ -142,8 +115,6 @@ PublicKey GetPublicKeyFromAssemblyReferenceString(const WSTRING& str)
         return PublicKey(data);
     }
 
-#ifdef _WIN32
-
     static auto  re = std::wregex(WStr("PublicKeyToken=([a-fA-F0-9]{16})"));
     std::wsmatch match;
     if (std::regex_search(str, match, re) && match.size() == 2)
@@ -157,23 +128,6 @@ PublicKey GetPublicKeyFromAssemblyReferenceString(const WSTRING& str)
         }
     }
 
-#else
-
-    static re2::RE2 re("PublicKeyToken=([a-fA-F0-9]{16})");
-    std::string     match;
-    if (re2::RE2::PartialMatch(ToString(str), re, &match))
-    {
-        for (int i = 0; i < 8; i++)
-        {
-            auto          s = match.substr(i * 2, 2);
-            unsigned long x;
-            std::stringstream(s) >> std::hex >> x;
-            data[i] = BYTE(x);
-        }
-    }
-
-#endif
-
     return PublicKey(data);
 }