Add provider guid cmake option (#210)

* Add a simple provider GUID cmake option

* Minor updates

* Add one comment

* Add a guard for the provider guid

* Add some cmake smarts to convert the GUID to what is needed in the code

* Minor fix

* Addressed one more CR comment

* Address last CR comment

v2/CMakeLists.txt

@@ -7,6 +7,36 @@ option(log_sink_console "Use the log console sink (send logs to console). Defaul
 option(log_sink_callback "Use the log callback sink (send logs to a custom callback function). Code must call log_sink_callback_set_callback. Default is OFF" OFF)
 option(log_sink_etw "Use the TraceLogging sink. Default is OFF" OFF)
 
+if(${log_sink_etw_provider_guid})
+    #log_sink_etw_provider_guid allows overriding the provider id to use in order to be able to separate logs for various projects
+    #by default this option is set to "", if log_sink_etw_provider_guid is not set a non empty string value, the ETW sink will use the Dad provider,
+    #which has been used since the beginnings of time for the MessagingStore team: DAD29F36-0A48-4DEF-9D50-8EF9036B92B4
+    set(log_sink_etw_provider_guid "" CACHE STRING "Provider GUID in the form DAD29F36-0A48-4DEF-9D50-8EF9036B92B4")
+endif()
+
+macro(ConvertGuid guid result_var)
+    # Split the GUID string by '-'
+    string(REPLACE "-" ";" guid_list ${guid})
+    list(GET guid_list 0 first_part)
+    list(GET guid_list 1 second_part)
+    list(GET guid_list 2 third_part)
+    list(GET guid_list 3 second_to_last_part)
+    list(GET guid_list 4 last_part)
+
+    # Split the last part into two-byte chunks
+    string(SUBSTRING ${second_to_last_part} 0 2 fourth_part)
+    string(SUBSTRING ${second_to_last_part} 2 2 fifth_part)
+    string(SUBSTRING ${last_part} 0 2 sixth_part)
+    string(SUBSTRING ${last_part} 2 2 seventh_part)
+    string(SUBSTRING ${last_part} 4 2 eighth_part)
+    string(SUBSTRING ${last_part} 6 2 ninth_part)
+    string(SUBSTRING ${last_part} 8 2 tenth_part)
+    string(SUBSTRING ${last_part} 10 2 eleventh_part)
+
+    # Convert to the desired format
+    set(${result_var} "(0x${first_part}, 0x${second_part}, 0x${third_part}, 0x${fourth_part}, 0x${fifth_part}, 0x${sixth_part}, 0x${seventh_part}, 0x${eighth_part}, 0x${ninth_part}, 0x${tenth_part}, 0x${eleventh_part})")
+endmacro()
+
 if(${log_abort_on_error})
     add_definitions(-DLOG_ABORT_ON_ERROR)
 endif() #(${log_abort_on_error})
@@ -21,6 +51,14 @@ endif() #(${log_sink_callback})
 
 if(${log_sink_etw})
     add_definitions(-DUSE_LOG_SINK_ETW)
+
+    if(NOT "${log_sink_etw_provider_guid}" STREQUAL "")
+        message(STATUS "Setting ETW provider GUID : ${log_sink_etw_provider_guid}")
+
+        ConvertGuid(${log_sink_etw_provider_guid} converted_log_sink_etw_provider_guid)
+
+        add_definitions(-DLOG_SINK_ETW_PROVIDER_GUID=${converted_log_sink_etw_provider_guid})
+    endif()
 endif() #(${log_sink_etw})
 
 set(c_logging_v2_h_files

v2/devdoc/log_sink_etw_requirements.md

@@ -30,7 +30,15 @@ Note: No other APIs (`deinit`, `log`) should be called while `init` executes.
 
 **SRS_LOG_SINK_ETW_01_008: [** `log_sink_etw.init` shall emit a `LOG_LEVEL_INFO` event as a self test, printing the fact that the provider was registered and from which executable (as obtained by calling `GetModuleFileNameA`). **]**
 
-**SRS_LOG_SINK_ETW_01_084: [** `log_sink_etw.init` shall use as provider GUID `DAD29F36-0A48-4DEF-9D50-8EF9036B92B4`. **]**
+**SRS_LOG_SINK_ETW_01_094: [** If `LOG_SINK_ETW_PROVIDER_GUID` is defined, its value should be used directly to initialize the provider GUID. **]**
+
+Note that the format for the contents of `LOG_SINK_ETW_PROVIDER_GUID` is the the format used by TraceLogging to initialize its provider `GUID`. It requires the paranthesis as in the below example:
+
+```c
+(0xDAD29F36, 0x0A48, 0x4DEF, 0x9D, 0x50, 0x8E, 0xF9, 0x03, 0x6B, 0x92, 0xB4)
+```
+
+**SRS_LOG_SINK_ETW_01_084: [** If `LOG_SINK_ETW_PROVIDER_GUID` is not defined, `log_sink_etw.init` shall use as provider GUID `DAD29F36-0A48-4DEF-9D50-8EF9036B92B4`. **]**
 
 **SRS_LOG_SINK_ETW_01_091: [** `log_sink_etw.init` shall succeed and return 0. **]**
 

v2/src/log_sink_etw.c

@@ -169,15 +169,17 @@ static const char event_name_unknown[] = "Unknown";
 // max metadata size
 #define MAX_METADATA_SIZE 4096
 
-// ID Work Item Type Title State Assigned To Effort Remaining Work Original Estimate Value Area Iteration Path Tags
-// 17751591 Task Have configurable provider To Do           One\Custom\AzureMessaging\Gallium\GaM2
+/* Codes_SRS_LOG_SINK_ETW_01_094: [ If LOG_SINK_ETW_PROVIDER_GUID is defined, its value should be used directly to initialize the provider GUID. ]*/
+#ifndef LOG_SINK_ETW_PROVIDER_GUID
+/*By default use DAD29F36-0A48-4DEF-9D50-8EF9036B92B4*/
+/* Codes_SRS_LOG_SINK_ETW_01_084: [ If LOG_SINK_ETW_PROVIDER_GUID is not defined, log_sink_etw.init shall use as provider GUID DAD29F36-0A48-4DEF-9D50-8EF9036B92B4. ]*/
+#define LOG_SINK_ETW_PROVIDER_GUID (0xDAD29F36, 0x0A48, 0x4DEF, 0x9D, 0x50, 0x8E, 0xF9, 0x03, 0x6B, 0x92, 0xB4)
+#endif
 
-/* Codes_SRS_LOG_SINK_ETW_01_084: [ log_sink_etw.init shall use as provider GUID DAD29F36-0A48-4DEF-9D50-8EF9036B92B4. ]*/
 TRACELOGGING_DEFINE_PROVIDER(
     log_sink_etw_provider,
     "block_storage_2",
-    (0xDAD29F36, 0x0A48, 0x4DEF, 0x9D, 0x50, 0x8E, 0xF9, 0x03, 0x6B, 0x92, 0xB4));
-/*DAD29F36-0A48-4DEF-9D50-8EF9036B92B4*/
+    LOG_SINK_ETW_PROVIDER_GUID);
 
 #define LOG_SINK_ETW_STATE_VALUES \
     LOG_SINK_ETW_STATE_NOT_INITIALIZED, \

v2/tests/CMakeLists.txt

@@ -21,6 +21,7 @@ if(${run_unittests})
        add_subdirectory(format_message_no_newline_ut)
        add_subdirectory(log_sink_etw_ut)
        add_subdirectory(log_sink_etw_2_ut)
+       add_subdirectory(log_sink_etw_custom_provider_id_ut)
        add_subdirectory(log_sink_etw_without_init_ut)
        add_subdirectory(log_lasterror_ut)
        add_subdirectory(log_hresult_ut)

v2/tests/log_sink_etw_custom_provider_id_ut/CMakeLists.txt

@@ -0,0 +1,12 @@
+#Copyright (c) Microsoft. All rights reserved.
+#Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+add_executable(log_sink_etw_custom_provider_id_ut
+    log_sink_etw_custom_provider_id_ut.c
+    log_sink_etw_mocked.c
+)
+
+include_directories(../../src)
+target_link_libraries(log_sink_etw_custom_provider_id_ut c_logging_v2)
+add_test(NAME log_sink_etw_custom_provider_id_ut COMMAND log_sink_etw_custom_provider_id_ut)
+set_target_properties(log_sink_etw_custom_provider_id_ut PROPERTIES FOLDER "tests/c_logging_v2")

v2/tests/log_sink_etw_custom_provider_id_ut/log_sink_etw_custom_provider_id_ut.c

@@ -0,0 +1,827 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// This test suite exists for the sole purpose of testing that we initialize the provider id to something else
+// than the default provider (the DAD provider)
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+#include "windows.h"
+#include "TraceLoggingProvider.h"
+#include "evntrace.h"
+
+#include "macro_utils/macro_utils.h"
+
+#include "c_logging/log_context_property_basic_types.h"
+#include "c_logging/log_context_property_bool_type.h"
+#include "c_logging/log_context_property_type_ascii_char_ptr.h"
+#include "c_logging/log_context_property_type_wchar_t_ptr.h"
+#include "c_logging/log_context_property_value_pair.h"
+#include "c_logging/log_level.h"
+#include "c_logging/log_sink_if.h"
+#include "c_logging/log_context.h"
+#include "c_logging/logger.h"
+
+#include "c_logging/log_sink_etw.h"
+
+// defines how many mock calls we can have
+#define MAX_MOCK_CALL_COUNT (128)
+
+#define FILE_EVENT_DESCRIPTOR_ENTRY 3
+#define FUNC_EVENT_DESCRIPTOR_ENTRY 4
+#define LINE_EVENT_DESCRIPTOR_ENTRY 5
+
+#define MOCK_CALL_TYPE_VALUES \
+    MOCK_CALL_TYPE_printf, \
+    MOCK_CALL_TYPE_log_context_get_property_value_pair_count, \
+    MOCK_CALL_TYPE_log_context_get_property_value_pairs, \
+    MOCK_CALL_TYPE_TraceLoggingRegister_EventRegister_EventSetInformation, \
+    MOCK_CALL_TYPE_GetModuleFileNameA, \
+    MOCK_CALL_TYPE__tlgCreate1Sz_char, \
+    MOCK_CALL_TYPE__tlgCreate1Sz_wchar_t, \
+    MOCK_CALL_TYPE_EventDataDescCreate, \
+    MOCK_CALL_TYPE__tlgWriteTransfer_EventWriteTransfer, \
+    MOCK_CALL_TYPE_log_context_property_if_get_type, \
+    MOCK_CALL_TYPE_vsnprintf, \
+    MOCK_CALL_TYPE_TraceLoggingUnregister
+
+MU_DEFINE_ENUM(MOCK_CALL_TYPE, MOCK_CALL_TYPE_VALUES)
+
+MU_DEFINE_ENUM_STRINGS(LOG_CONTEXT_PROPERTY_TYPE, LOG_CONTEXT_PROPERTY_TYPE_VALUES)
+
+// very poor mans mocks :-(
+
+#define MAX_PRINTF_CAPTURED_OUPUT_SIZE (LOG_MAX_MESSAGE_LENGTH * 2)
+
+static TraceLoggingHProvider test_provider;
+
+__pragma(pack(push, 1))
+typedef struct SELF_DESCRIBED_EVENT_TAG
+{
+    uint8_t _tlgBlobTyp;
+    uint8_t _tlgChannel;
+    uint8_t _tlgLevel;
+    uint8_t _tlgOpcode;
+    uint64_t _tlgKeyword;
+    uint16_t _tlgEvtMetaSize;
+    uint16_t _tlgEvtTag;
+    uint8_t metadata[];
+} SELF_DESCRIBED_EVENT;
+__pragma(pack(pop))
+
+typedef struct printf_CALL_TAG
+{
+    bool override_result;
+    int call_result;
+    char captured_output[MAX_PRINTF_CAPTURED_OUPUT_SIZE];
+} printf_CALL;
+
+typedef struct log_context_get_property_value_pair_count_CALL_TAG
+{
+    bool override_result;
+    uint32_t call_result;
+    LOG_CONTEXT_HANDLE captured_log_context;
+} log_context_get_property_value_pair_count_CALL;
+
+typedef struct log_context_get_property_value_pairs_CALL_TAG
+{
+    bool override_result;
+    const LOG_CONTEXT_PROPERTY_VALUE_PAIR* call_result;
+    LOG_CONTEXT_HANDLE captured_log_context;
+} log_context_get_property_value_pairs_CALL;
+
+typedef struct TraceLoggingRegister_EventRegister_EventSetInformation_CALL_TAG
+{
+    bool override_result;
+    TLG_STATUS call_result;
+    uint8_t enable_provider_level;
+    const char* expected_provider_id_as_string;
+} TraceLoggingRegister_EventRegister_EventSetInformation_CALL;
+
+typedef struct GetModuleFileNameA_CALL_TAG
+{
+    bool override_result; /*when override_result is TRUE then GetModuleFileNameA returns FALSE. Otherwise it doesn't fail and returns the current executable filename name*/
+} GetModuleFileNameA_CALL;
+
+typedef struct _tlgWriteTransfer_EventWriteTransfer_CALL_TAG
+{
+    bool override_result;
+    TLG_STATUS call_result;
+    SELF_DESCRIBED_EVENT* expected_self_described_event;
+    uint32_t expected_cData;
+    const EVENT_DATA_DESCRIPTOR* expected_pData;
+    bool ignore_file_and_func;
+} _tlgWriteTransfer_EventWriteTransfer_CALL;
+
+typedef struct log_context_property_if_get_type_CALL_TAG
+{
+    bool override_result;
+    LOG_CONTEXT_PROPERTY_TYPE call_result;
+} log_context_property_if_get_type_CALL;
+
+typedef struct vsnprintf_CALL_TAG
+{
+    bool override_result;
+    int call_result;
+    char captured_output[MAX_PRINTF_CAPTURED_OUPUT_SIZE];
+} vsnprintf_CALL;
+
+typedef struct TraceLoggingUnregister_CALL_TAG
+{
+    TraceLoggingHProvider hProvider;
+} TraceLoggingUnregister_CALL;
+
+typedef struct MOCK_CALL_TAG
+{
+    MOCK_CALL_TYPE mock_call_type;
+    union
+    {
+        printf_CALL printf_call;
+        log_context_get_property_value_pair_count_CALL log_context_get_property_value_pair_count_call;
+        log_context_get_property_value_pairs_CALL log_context_get_property_value_pairs_call;
+        TraceLoggingRegister_EventRegister_EventSetInformation_CALL TraceLoggingRegister_EventRegister_EventSetInformation_call;
+        GetModuleFileNameA_CALL GetModuleFileNameA_call;
+        _tlgWriteTransfer_EventWriteTransfer_CALL _tlgWriteTransfer_EventWriteTransfer_call;
+        log_context_property_if_get_type_CALL log_context_property_if_get_type_call;
+        vsnprintf_CALL vsnprintf_call;
+        TraceLoggingUnregister_CALL TraceLoggingUnregister_call;
+    };
+} MOCK_CALL;
+
+static char* stringify_bytes(const unsigned char* bytes, size_t byte_count)
+{
+    size_t i;
+    size_t pos = 0;
+    size_t stringified_length = 3 + (byte_count * 4);
+    char* result;
+
+    if (byte_count > 0)
+    {
+        stringified_length += (byte_count - 1);
+    }
+
+    result = malloc(stringified_length);
+    if (result != NULL)
+    {
+        result[pos++] = '[';
+
+        for (i = 0; i < byte_count; i++)
+        {
+            int sprintf_result = sprintf(&result[pos], "0x%02X%s", bytes[i], (i < byte_count - 1) ? "," : "");
+            pos += sprintf_result;
+        }
+        result[pos++] = ']';
+        result[pos] = '\0';
+    }
+
+    return result;
+}
+
+static MOCK_CALL expected_calls[MAX_MOCK_CALL_COUNT];
+static size_t expected_call_count;
+static size_t actual_call_count;
+static bool actual_and_expected_match;
+
+static void setup_mocks(void)
+{
+    expected_call_count = 0;
+    actual_call_count = 0;
+    actual_and_expected_match = true;
+}
+
+int mock_printf(const char* format, ...)
+{
+    int result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_printf))
+    {
+        actual_and_expected_match = false;
+        result = -1;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].printf_call.override_result)
+        {
+            result = expected_calls[actual_call_count].printf_call.call_result;
+        }
+        else
+        {
+            va_list args;
+            va_start(args, format);
+            // also capture the result in a variable for comparisons in tests
+            (void)vsnprintf(expected_calls[actual_call_count].printf_call.captured_output, sizeof(expected_calls[actual_call_count].printf_call.captured_output),
+                format, args);
+            va_end(args);
+
+            // call "real" function (or the best equivalent we have)
+            va_start(args, format);
+            result = vprintf(format, args);
+            va_end(args);
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+uint32_t mock_log_context_get_property_value_pair_count(LOG_CONTEXT_HANDLE log_context)
+{
+    uint32_t result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_log_context_get_property_value_pair_count))
+    {
+        actual_and_expected_match = false;
+        result = 0;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].log_context_get_property_value_pair_count_call.override_result)
+        {
+            result = expected_calls[actual_call_count].log_context_get_property_value_pair_count_call.call_result;
+        }
+        else
+        {
+            expected_calls[actual_call_count].log_context_get_property_value_pair_count_call.captured_log_context = log_context;
+
+            // call "real" function
+            result = log_context_get_property_value_pair_count(log_context);
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+const LOG_CONTEXT_PROPERTY_VALUE_PAIR* mock_log_context_get_property_value_pairs(LOG_CONTEXT_HANDLE log_context)
+{
+    const LOG_CONTEXT_PROPERTY_VALUE_PAIR* result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_log_context_get_property_value_pairs))
+    {
+        actual_and_expected_match = false;
+        result = NULL;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].log_context_get_property_value_pairs_call.override_result)
+        {
+            result = expected_calls[actual_call_count].log_context_get_property_value_pairs_call.call_result;
+        }
+        else
+        {
+            expected_calls[actual_call_count].log_context_get_property_value_pairs_call.captured_log_context = log_context;
+
+            // call "real" function
+            result = log_context_get_property_value_pairs(log_context);
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+TLG_STATUS mock_TraceLoggingRegister_EventRegister_EventSetInformation(const struct _tlgProvider_t* hProvider)
+{
+    TLG_STATUS result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_TraceLoggingRegister_EventRegister_EventSetInformation))
+    {
+        actual_and_expected_match = false;
+        result = E_FAIL;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.override_result)
+        {
+            result = expected_calls[actual_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.call_result;
+        }
+        else
+        {
+            // save the provider globally
+            test_provider = hProvider;
+            GUID provider_guid = TraceLoggingProviderId(hProvider);
+            char provider_guid_string[128];
+
+            (void)sprintf(provider_guid_string, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", provider_guid.Data1, provider_guid.Data2, provider_guid.Data3, provider_guid.Data4[0], provider_guid.Data4[1], provider_guid.Data4[2], provider_guid.Data4[3], provider_guid.Data4[4], provider_guid.Data4[5], provider_guid.Data4[6], provider_guid.Data4[7]);
+
+            if (strcmp(provider_guid_string, expected_calls[actual_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.expected_provider_id_as_string) != 0)
+            {
+                (void)printf("Expected provider id to be %s, actual = %s",
+                    expected_calls[actual_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.expected_provider_id_as_string, provider_guid_string);
+                actual_and_expected_match = false;
+
+                result = E_FAIL;
+            }
+            else
+            {
+                // call "real" function
+                result = TraceLoggingRegister_EventRegister_EventSetInformation(hProvider);
+
+                ((struct _tlgProvider_t*)test_provider)->LevelPlus1 = expected_calls[actual_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.enable_provider_level + 1;
+            }
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+static char GetModuleFileNameA_value[MAX_PATH];
+
+BOOL mock_GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize)
+{
+    (void)nSize;
+    (void)hModule;
+    TLG_STATUS result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_GetModuleFileNameA))
+    {
+        actual_and_expected_match = false;
+        result = FALSE;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].GetModuleFileNameA_call.override_result)
+        {
+            result = FALSE;
+        }
+        else
+        {
+            (void)strcpy(lpFilename, GetModuleFileNameA_value);
+            result = TRUE;
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+void mock__tlgCreate1Sz_char(PEVENT_DATA_DESCRIPTOR pDesc, char const* psz)
+{
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE__tlgCreate1Sz_char))
+    {
+        actual_and_expected_match = false;
+    }
+    else
+    {
+        // call "real" function
+        _tlgCreate1Sz_char(pDesc, psz);
+
+        actual_call_count++;
+    }
+}
+
+void mock__tlgCreate1Sz_wchar_t(PEVENT_DATA_DESCRIPTOR pDesc, wchar_t const* psz)
+{
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE__tlgCreate1Sz_wchar_t))
+    {
+        actual_and_expected_match = false;
+    }
+    else
+    {
+        // call "real" function
+        _tlgCreate1Sz_wchar_t(pDesc, psz);
+
+        actual_call_count++;
+    }
+}
+
+void mock_EventDataDescCreate(PEVENT_DATA_DESCRIPTOR EventDataDescriptor, const VOID* DataPtr, ULONG DataSize)
+{
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_EventDataDescCreate))
+    {
+        actual_and_expected_match = false;
+    }
+    else
+    {
+        // call "real" function
+        EventDataDescCreate(EventDataDescriptor, DataPtr, DataSize);
+
+        actual_call_count++;
+    }
+}
+
+errno_t mock__tlgWriteTransfer_EventWriteTransfer(TraceLoggingHProvider hProvider, void const* pEventMetadata, LPCGUID pActivityId, LPCGUID pRelatedActivityId, UINT32 cData, EVENT_DATA_DESCRIPTOR* pData)
+{
+    TLG_STATUS result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE__tlgWriteTransfer_EventWriteTransfer))
+    {
+        actual_and_expected_match = false;
+        result = E_FAIL;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.override_result)
+        {
+            result = expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.call_result;
+        }
+        else
+        {
+            SELF_DESCRIBED_EVENT* expected_self_described_event = expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_self_described_event;
+            SELF_DESCRIBED_EVENT* actual_self_described_event = (SELF_DESCRIBED_EVENT*)CONTAINING_RECORD(pEventMetadata, SELF_DESCRIBED_EVENT, _tlgChannel);
+            if (expected_self_described_event->_tlgLevel != actual_self_described_event->_tlgLevel)
+            {
+                (void)printf("Expected expected_self_described_event->_tlgLevel=%" PRIu8 ", actual=%" PRIu8 "\r\n",
+                    expected_self_described_event->_tlgLevel, actual_self_described_event->_tlgLevel);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            if (expected_self_described_event->_tlgEvtMetaSize != actual_self_described_event->_tlgEvtMetaSize)
+            {
+                (void)printf("Expected expected_self_described_event->_tlgEvtMetaSize=%" PRIu16 ", actual=%" PRIu16 "\r\n",
+                    expected_self_described_event->_tlgEvtMetaSize, actual_self_described_event->_tlgEvtMetaSize);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            if (expected_self_described_event->_tlgChannel != actual_self_described_event->_tlgChannel)
+            {
+                (void)printf("Expected expected_self_described_event->_tlgChannel=%" PRIu8 ", actual=%" PRIu8 "\r\n",
+                    expected_self_described_event->_tlgChannel, actual_self_described_event->_tlgChannel);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            if (expected_self_described_event->_tlgOpcode != actual_self_described_event->_tlgOpcode)
+            {
+                (void)printf("Expected expected_self_described_event->_tlgOpcode=%" PRIu8 ", actual=%" PRIu8 "\r\n",
+                    expected_self_described_event->_tlgOpcode, actual_self_described_event->_tlgOpcode);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            if (expected_self_described_event->_tlgKeyword != actual_self_described_event->_tlgKeyword)
+            {
+                (void)printf("Expected expected_self_described_event->_tlgKeyword=%" PRIu64 ", actual=%" PRIu64"\r\n",
+                    expected_self_described_event->_tlgKeyword, actual_self_described_event->_tlgKeyword);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            else if (memcmp(expected_self_described_event->metadata, actual_self_described_event->metadata, actual_self_described_event->_tlgEvtMetaSize - 4) != 0)
+            {
+                char* expected_bytes_as_string = stringify_bytes(expected_self_described_event->metadata, actual_self_described_event->_tlgEvtMetaSize - 4);
+                char* actual_bytes_as_string = stringify_bytes(actual_self_described_event->metadata, actual_self_described_event->_tlgEvtMetaSize - 4);
+                (void)printf("Event metadata does not match:\r\n Expected:%s\r\n Actual  :%s\r\n", expected_bytes_as_string, actual_bytes_as_string);
+                free(expected_bytes_as_string);
+                free(actual_bytes_as_string);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            else if (cData != expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_cData)
+            {
+                (void)printf("Expected cData=%" PRIu32 ", actual=%" PRIu32 "\r\n",
+                    expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_cData, cData);
+                actual_and_expected_match = false;
+                result = E_FAIL;
+            }
+            else
+            {
+                // only compare starting at the index 2
+                for (uint32_t i = 2; i < cData; i++)
+                {
+                    if (
+                        (expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.ignore_file_and_func) &&
+                        (
+                            (i == FILE_EVENT_DESCRIPTOR_ENTRY) ||
+                            (i == FUNC_EVENT_DESCRIPTOR_ENTRY) ||
+                            (i == LINE_EVENT_DESCRIPTOR_ENTRY)
+                            )
+                        )
+                    {
+                        continue;
+                    }
+
+                    if (pData[i].Size != expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_pData[i].Size)
+                    {
+                        (void)printf("Expected pData[%" PRIu32 "].Size=%" PRIu32 ", actual=%" PRIu32 "\r\n",
+                            i, expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_pData[i].Size, pData[i].Size);
+                        break;
+                    }
+                    if (memcmp((void*)(uintptr_t)pData[i].Ptr, (void*)(uintptr_t)expected_calls[actual_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_pData[i].Ptr, pData[i].Size) != 0)
+                    {
+                        (void)printf("Event descriptor memory at index %" PRIu32 " does not match\r\n",
+                            i);
+                        break;
+                    }
+                }
+
+                (void)hProvider;
+                (void)pActivityId;
+                (void)pRelatedActivityId;
+                result = S_OK;
+            }
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+LOG_CONTEXT_PROPERTY_TYPE mock_log_context_property_if_get_type(void)
+{
+    LOG_CONTEXT_PROPERTY_TYPE result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_log_context_property_if_get_type))
+    {
+        actual_and_expected_match = false;
+        result = (LOG_CONTEXT_PROPERTY_TYPE)0xFF;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].log_context_property_if_get_type_call.override_result)
+        {
+            result = expected_calls[actual_call_count].log_context_property_if_get_type_call.call_result;
+        }
+        else
+        {
+            result = (LOG_CONTEXT_PROPERTY_TYPE)0xFF;
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+int mock_vsnprintf(char* restrict s, size_t n, const char* restrict format, va_list args)
+{
+    int result;
+
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_vsnprintf))
+    {
+        actual_and_expected_match = false;
+        result = -1;
+    }
+    else
+    {
+        if (expected_calls[actual_call_count].printf_call.override_result)
+        {
+            result = expected_calls[actual_call_count].printf_call.call_result;
+        }
+        else
+        {
+            // also capture the result in a variable for comparisons in tests
+            (void)vsnprintf(expected_calls[actual_call_count].printf_call.captured_output, sizeof(expected_calls[actual_call_count].printf_call.captured_output),
+                format, args);
+
+            // call "real" function
+            result = vsnprintf(s, n, format, args);
+        }
+
+        actual_call_count++;
+    }
+
+    return result;
+}
+
+void mock_TraceLoggingUnregister(TraceLoggingHProvider hProvider)
+{
+    if ((actual_call_count == expected_call_count) ||
+        (expected_calls[actual_call_count].mock_call_type != MOCK_CALL_TYPE_TraceLoggingUnregister))
+    {
+        actual_and_expected_match = false;
+    }
+    else
+    {
+        expected_calls[actual_call_count].TraceLoggingUnregister_call.hProvider = hProvider;
+
+        // call "real" function
+        TraceLoggingUnregister(hProvider);
+
+        actual_call_count++;
+    }
+}
+
+#define POOR_MANS_ASSERT(cond) \
+    if (!(cond)) \
+    { \
+        (void)printf("%s:%d test failed\r\n", __FUNCTION__, __LINE__); \
+        abort(); \
+    } \
+
+static void setup_enabled_provider(UINT32 level)
+{
+    ((struct _tlgProvider_t*)test_provider)->LevelPlus1 = level + 1;
+}
+
+static void setup_printf_call(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_printf;
+    expected_calls[expected_call_count].printf_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup_log_context_get_property_value_pair_count_call(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_log_context_get_property_value_pair_count;
+    expected_calls[expected_call_count].log_context_get_property_value_pair_count_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup_log_context_get_property_value_pairs_call(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_log_context_get_property_value_pairs;
+    expected_calls[expected_call_count].log_context_get_property_value_pairs_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup_TraceLoggingRegister_EventRegister_EventSetInformation_call(const char* expected_provider_id_as_string, uint8_t enable_provider_level)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_TraceLoggingRegister_EventRegister_EventSetInformation;
+    expected_calls[expected_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.override_result = false;
+    expected_calls[expected_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.enable_provider_level = enable_provider_level;
+    expected_calls[expected_call_count].TraceLoggingRegister_EventRegister_EventSetInformation_call.expected_provider_id_as_string = expected_provider_id_as_string;
+    expected_call_count++;
+}
+
+static void setup_GetModuleFileNameA_call(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_GetModuleFileNameA;
+    expected_calls[expected_call_count].GetModuleFileNameA_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup__tlgCreate1Sz_char(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE__tlgCreate1Sz_char;
+    expected_call_count++;
+}
+
+static void setup__tlgCreate1Sz_wchar_t(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE__tlgCreate1Sz_wchar_t;
+    expected_call_count++;
+}
+
+static void setup_EventDataDescCreate(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_EventDataDescCreate;
+    expected_call_count++;
+}
+
+static void setup__tlgWriteTransfer_EventWriteTransfer(void* event_metadata, uint32_t cData, const EVENT_DATA_DESCRIPTOR* pData)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE__tlgWriteTransfer_EventWriteTransfer;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.override_result = false;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_self_described_event = event_metadata;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_cData = cData;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_pData = pData;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.ignore_file_and_func = false;
+    expected_call_count++;
+}
+
+static void setup__tlgWriteTransfer_EventWriteTransfer_with_ignore_file_and_func(void* event_metadata, uint32_t cData, const EVENT_DATA_DESCRIPTOR* pData, bool ignore_file_and_func)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE__tlgWriteTransfer_EventWriteTransfer;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.override_result = false;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_self_described_event = event_metadata;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_cData = cData;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.expected_pData = pData;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.ignore_file_and_func = ignore_file_and_func;
+    expected_call_count++;
+}
+
+static void setup_log_context_property_if_get_type(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_log_context_property_if_get_type;
+    expected_calls[expected_call_count]._tlgWriteTransfer_EventWriteTransfer_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup_vsnprintf_call(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_vsnprintf;
+    expected_calls[expected_call_count].vsnprintf_call.override_result = false;
+    expected_call_count++;
+}
+
+static void setup_TraceLoggingUnregister(void)
+{
+    expected_calls[expected_call_count].mock_call_type = MOCK_CALL_TYPE_TraceLoggingUnregister;
+    expected_call_count++;
+}
+
+static void test_log_sink_etw_log(LOG_LEVEL log_level, LOG_CONTEXT_HANDLE log_context, const char* file, const char* func, int line, const char* message_format, ...)
+{
+    va_list args;
+    va_start(args, message_format);
+    log_sink_etw.log(log_level, log_context, file, func, line, message_format, args);
+    va_end(args);
+}
+
+/* log_sink_etw.init */
+
+/* Tests_SRS_LOG_SINK_ETW_01_094: [ If LOG_SINK_ETW_PROVIDER_GUID is defined, its value should be used directly to initialize the provider GUID. ]*/
+static void log_sink_etw_init_with_custom_provider_id_works(void)
+{
+    // arrange
+    setup_mocks();
+
+    setup_TraceLoggingRegister_EventRegister_EventSetInformation_call("41FC493D-1BC2-4EA6-BB02-D9DEF0D7AF9E", TRACE_LEVEL_INFORMATION);
+
+    // self test event
+    setup_GetModuleFileNameA_call();
+
+    setup_vsnprintf_call(); // formatting message
+    setup__tlgCreate1Sz_char(); // message
+    setup__tlgCreate1Sz_char(); // file
+    setup__tlgCreate1Sz_char(); // func
+    setup_EventDataDescCreate(); // line
+    uint8_t extra_metadata_bytes[256];
+    uint8_t expected_event_bytes[sizeof(SELF_DESCRIBED_EVENT) + sizeof(extra_metadata_bytes)];
+    SELF_DESCRIBED_EVENT* expected_event_metadata = (SELF_DESCRIBED_EVENT*)&expected_event_bytes[0];
+    (void)memset(expected_event_metadata, 0, sizeof(SELF_DESCRIBED_EVENT));
+    expected_event_metadata->_tlgLevel = TRACE_LEVEL_INFORMATION;
+    expected_event_metadata->_tlgChannel = 11;
+    expected_event_metadata->_tlgOpcode = 0;
+    expected_event_metadata->_tlgKeyword = 0;
+    uint8_t* pos = (expected_event_bytes + sizeof(SELF_DESCRIBED_EVENT));
+    // event name
+    (void)memcpy(pos, "LogInfo", strlen("LogInfo") + 1);
+    pos += strlen("LogInfo") + 1;
+    // content field
+    (void)memcpy(pos, "content", strlen("content") + 1);
+    pos += strlen("content") + 1;
+    *pos = TlgInANSISTRING;
+    pos++;
+    // content field
+    (void)memcpy(pos, "file", strlen("file") + 1);
+    pos += strlen("file") + 1;
+    *pos = TlgInANSISTRING;
+    pos++;
+    // content field
+    (void)memcpy(pos, "func", strlen("func") + 1);
+    pos += strlen("func") + 1;
+    *pos = TlgInANSISTRING;
+    pos++;
+    // content field
+    (void)memcpy(pos, "line", strlen("line") + 1);
+    pos += strlen("line") + 1;
+    *pos = TlgInINT32;
+    pos++;
+
+    expected_event_metadata->_tlgEvtMetaSize = (uint16_t)(pos - (expected_event_bytes + sizeof(SELF_DESCRIBED_EVENT))) + 4;
+
+    int captured_line = __LINE__;
+
+    expected_calls[1].GetModuleFileNameA_call.override_result = true;
+
+    static const char expected_event_message[] = "ETW provider was registered succesfully (self test). Executable file full path name = some_test_executable.exe";
+
+    // construct event data descriptor array
+    EVENT_DATA_DESCRIPTOR expected_event_data_descriptors[6] =
+    {
+        { 0 },
+        { 0 },
+        {.Size = (ULONG)strlen(expected_event_message) + 1, .Ptr = (ULONGLONG)expected_event_message },
+        {.Size = (ULONG)strlen(__FILE__) + 1, .Ptr = (ULONGLONG)__FILE__ },
+        {.Size = (ULONG)strlen(__FUNCTION__) + 1, .Ptr = (ULONGLONG)__FUNCTION__ },
+        {.Size = sizeof(int32_t), .Ptr = (ULONGLONG)&captured_line}
+    };
+
+    setup__tlgWriteTransfer_EventWriteTransfer_with_ignore_file_and_func(expected_event_metadata, 6, expected_event_data_descriptors, /* ignore file and func data */true);
+
+    // act
+    POOR_MANS_ASSERT(log_sink_etw.init() == 0);
+
+    // assert
+    POOR_MANS_ASSERT(expected_call_count == actual_call_count);
+    POOR_MANS_ASSERT(actual_and_expected_match);
+}
+
+/* very "poor man's" way of testing, as no test harness and mocking framework are available */
+int main(void)
+{
+    /*suite setup*/
+    POOR_MANS_ASSERT(GetModuleFileNameA(NULL, GetModuleFileNameA_value, sizeof(GetModuleFileNameA_value)));
+
+    // make abort not popup
+    _set_abort_behavior(_CALL_REPORTFAULT, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+
+    log_sink_etw_init_with_custom_provider_id_works();
+
+    return 0;
+}
+

v2/tests/log_sink_etw_custom_provider_id_ut/log_sink_etw_mocked.c

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <time.h>
+#include <wchar.h>
+
+#include "windows.h"
+#include "TraceLoggingProvider.h"
+#include "evntrace.h"
+
+#include "c_logging/log_context.h"
+#include "c_logging/log_context_property_value_pair.h"
+
+//test with provider GUID 41FC493D-1BC2-4EA6-BB02-D9DEF0D7AF9E
+#define LOG_SINK_ETW_PROVIDER_GUID (0x41fc493d, 0x1bc2, 0x4ea6, 0xbb, 0x2, 0xd9, 0xde, 0xf0, 0xd7, 0xaf, 0x9e)
+
+#define printf mock_printf
+#define log_context_get_property_value_pair_count mock_log_context_get_property_value_pair_count
+#define log_context_get_property_value_pairs mock_log_context_get_property_value_pairs
+#define TraceLoggingRegister_EventRegister_EventSetInformation mock_TraceLoggingRegister_EventRegister_EventSetInformation
+#define GetModuleFileNameA mock_GetModuleFileNameA
+#define _tlgCreate1Sz_char mock__tlgCreate1Sz_char
+#define _tlgCreate1Sz_wchar_t mock__tlgCreate1Sz_wchar_t
+#define EventDataDescCreate mock_EventDataDescCreate
+#define _tlgWriteTransfer_EventWriteTransfer mock__tlgWriteTransfer_EventWriteTransfer
+#define vsnprintf mock_vsnprintf
+#undef TraceLoggingUnregister
+#define TraceLoggingUnregister mock_TraceLoggingUnregister
+
+int mock_printf(const char* format, ...);
+uint32_t mock_log_context_get_property_value_pair_count(LOG_CONTEXT_HANDLE log_context);
+const LOG_CONTEXT_PROPERTY_VALUE_PAIR* mock_log_context_get_property_value_pairs(LOG_CONTEXT_HANDLE log_context);
+TLG_STATUS mock_TraceLoggingRegister_EventRegister_EventSetInformation(const struct _tlgProvider_t* hProvider);
+BOOL mock_GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize);
+void mock__tlgCreate1Sz_char(PEVENT_DATA_DESCRIPTOR pDesc, char const* psz);
+void mock__tlgCreate1Sz_wchar_t(PEVENT_DATA_DESCRIPTOR pDesc, wchar_t const* psz);
+void mock_EventDataDescCreate(PEVENT_DATA_DESCRIPTOR EventDataDescriptor, const VOID* DataPtr, ULONG DataSize);
+TLG_STATUS mock__tlgWriteTransfer_EventWriteTransfer(TraceLoggingHProvider hProvider, void const* pEventMetadata, LPCGUID pActivityId, LPCGUID pRelatedActivityId, UINT32 cData, EVENT_DATA_DESCRIPTOR* pData);
+int mock_vsnprintf(char* s, size_t n, const char* format, va_list arg);
+void mock_TraceLoggingUnregister(TraceLoggingHProvider hProvider);
+
+#include "log_sink_etw.c"

v2/tests/log_sink_etw_ut/log_sink_etw_ut.c

@@ -751,7 +751,7 @@ static void when_TraceLoggingRegister_fails_log_sink_etw_init_fails(void)
 
 /* Tests_SRS_LOG_SINK_ETW_01_006: [ log_sink_etw.init shall register the ETW TraceLogging provider by calling TraceLoggingRegister (TraceLoggingRegister_EventRegister_EventSetInformation). ]*/
 /* Tests_SRS_LOG_SINK_ETW_01_008: [ log_sink_etw.init shall emit a LOG_LEVEL_INFO event as a self test, printing the fact that the provider was registered and from which executable (as obtained by calling GetModuleFileNameA). ]*/
-/* Tests_SRS_LOG_SINK_ETW_01_084: [ log_sink_etw.init shall use as provider GUID DAD29F36-0A48-4DEF-9D50-8EF9036B92B4. ]*/
+/* Tests_SRS_LOG_SINK_ETW_01_084: [ If LOG_SINK_ETW_PROVIDER_GUID is not defined, log_sink_etw.init shall use as provider GUID DAD29F36-0A48-4DEF-9D50-8EF9036B92B4. ]*/
 /* Tests_SRS_LOG_SINK_ETW_01_091: [ log_sink_etw.init shall succeed and return 0. ] */
 static void log_sink_etw_init_works(void)
 {