diff --git a/CHANGELOG.md b/CHANGELOG.md index 9091791ea7..c57f7f373b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h traces instrumentation for versions `1.8.0`+. - Support for `temporality_preference` in file-based configuration for Console Metric Exporter. +- Enable ASLR, CET and CFG for native profiler libraries on Windows. ### Changed diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.DLL.vcxproj b/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.DLL.vcxproj index 2a8bdd3df9..ee707a1706 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.DLL.vcxproj +++ b/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.DLL.vcxproj @@ -40,6 +40,7 @@ v143 true Unicode + true DynamicLibrary @@ -53,6 +54,7 @@ v143 true Unicode + true @@ -155,6 +157,7 @@ stdcpp17 true $(LIB_INCLUDES);%(AdditionalIncludeDirectories) + Guard Windows @@ -162,6 +165,8 @@ true true .\OpenTelemetry.AutoInstrumentation.Native.def + true + true IF EXIST "$(SolutionDir)pre-build-events-cpp.bat" CALL "$(SolutionDir)pre-build-events-cpp.bat" "$(TargetPath)" "$(TargetFileName)" "$(TargetDir)" "$(TargetName)" @@ -182,6 +187,7 @@ stdcpp17 true $(LIB_INCLUDES);%(AdditionalIncludeDirectories) + Guard Windows @@ -189,6 +195,8 @@ true true .\OpenTelemetry.AutoInstrumentation.Native.def + true + true IF EXIST "$(SolutionDir)pre-build-events-cpp.bat" CALL "$(SolutionDir)pre-build-events-cpp.bat" "$(TargetPath)" "$(TargetFileName)" "$(TargetDir)" "$(TargetName)" diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj b/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj index 601baa80b7..62a30dcdb5 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj +++ b/src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj @@ -47,12 +47,14 @@ v143 true Unicode + true StaticLibrary false v143 true + true Unicode @@ -138,12 +140,15 @@ _TARGET_64BIT;BIT64;HOST_64BIT;AMD64;_UNICODE;UNICODE;OTEL_AUTO_VERSION_MAJOR=$(OTEL_AUTO_VERSION_MAJOR);OTEL_AUTO_VERSION_MINOR=$(OTEL_AUTO_VERSION_MINOR);OTEL_AUTO_VERSION_PATCH=$(OTEL_AUTO_VERSION_PATCH);%(PreprocessorDefinitions) $(LIB_INCLUDES);%(AdditionalIncludeDirectories) true + Guard $(LIB_INCLUDES);%(AdditionalLibraryDirectories) $(LIB_INCLUDES);%(AdditionalLibraryDirectories) + true + true @@ -162,12 +167,15 @@ _UNICODE;UNICODE;X86;HOST_X86;OTEL_AUTO_VERSION_MAJOR=$(OTEL_AUTO_VERSION_MAJOR);OTEL_AUTO_VERSION_MINOR=$(OTEL_AUTO_VERSION_MINOR);OTEL_AUTO_VERSION_PATCH=$(OTEL_AUTO_VERSION_PATCH);%(PreprocessorDefinitions) $(LIB_INCLUDES);%(AdditionalIncludeDirectories) true + Guard $(LIB_INCLUDES);%(AdditionalLibraryDirectories) $(LIB_INCLUDES);%(AdditionalLibraryDirectories) + true + true