Sync Main branch with WebSockets branch.

.gitignore

@@ -343,3 +343,6 @@ build/
 # vscode
 .vscode/
 .factorypath
+
+# Default Assets restore directory
+.assets

.vscode/cspell.json

@@ -16,6 +16,7 @@
     ".github/CODEOWNERS",
     ".gitignore",
     ".vscode/cspell.json",
+    "vcpkg-custom-ports",
     "ci.yml",
     "squid.conf*",
     "eng/common/**/*",
@@ -54,6 +55,7 @@
     "Deserializes",
     "DFETCH",
     "DMSVC",
+    "DVCPKG",
     "docfx",
     "DPAPI",
     "DRUN",
@@ -73,7 +75,9 @@
     "HKEY",
     "HRESULT",
     "IMDS",
+    "immutability",
     "Intel",
+    "issecret",
     "itfactor",
     "iusg",
     "jepio",

CMakeSettings.json

@@ -20,6 +20,64 @@
           "name": "MSVC_USE_STATIC_CRT",
           "value": "True",
           "type": "BOOL"
+        },
+        {
+          "name": "VCPKG_MANIFEST_MODE",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x64-DebugWithTests-OpenSSL111",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "VCPKG_TARGET_TRIPLET",
+          "value": "x64-windows-static",
+          "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "VCPKG_MANIFEST_MODE",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "VCPKG_OVERLAY_PORTS",
+          "value": "${projectDir}\\vcpkg-custom-ports",
+          "type": "STRING"
+        },
+        {
+          "name": "INSTALL_GTEST",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TESTING",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_CURL",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_SAMPLES",
+          "value": "True",
+          "type": "BOOL"
         }
       ]
     },
@@ -290,7 +348,7 @@
       "configurationType": "Debug",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DINSTALL_GTEST=OFF -DBUILD_TESTING=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_SAMPLES=ON -DBUILD_PERFORMANCE_TESTS=ON",
+      "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "variables": [
@@ -299,6 +357,88 @@
           "value": "x64-windows-static",
           "type": "STRING"
         },
+        {
+          "name": "INSTALL_GTEST",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TESTING",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_SAMPLES",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_PERFORMANCE_TESTS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_WINHTTP",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_CURL",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x64-ReleaseWithPerfTest",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": [
+        {
+          "name": "VCPKG_TARGET_TRIPLET",
+          "value": "x64-windows-static",
+          "type": "STRING"
+        },
+        {
+          "name": "INSTALL_GTEST",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TESTING",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_SAMPLES",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_PERFORMANCE_TESTS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_WINHTTP",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_CURL",
+          "value": "True",
+          "type": "BOOL"
+        },
         {
           "name": "MSVC_USE_STATIC_CRT",
           "value": "True",

README.md

@@ -324,6 +324,41 @@ The following SDK library releases are available on [vcpkg](https://github.com/m
 
 > NOTE: In case of getting linker errors when consuming the SDK on Windows, make sure that [vcpkg triplet](https://vcpkg.readthedocs.io/en/latest/users/triplets/) being consumed matches the [CRT link flags](https://docs.microsoft.com/cpp/build/reference/md-mt-ld-use-run-time-library?view=msvc-160) being set for your app or library build. See also `MSVC_USE_STATIC_CRT` build flag.
 
+## OpenSSL Version
+
+Several packages within the Azure SDK for C++ use the OpenSSL library. By default, the Azure SDK will use whatever the most recent version of OpenSSL is within the VCPKG repository.
+
+If you need to use a specific version of OpenSSL, you can use the vcpkg custom ports feature to specify the version of OpenSSL to use. 
+For example, if you want to use OpenSSL 1.1.1, you should create a folder named `vcpkg-custom-ports` next to to your vcpkg.json file.
+
+Navigate to your clone of the vcpkg vcpkg repo and execute "git checkout 3b3bd424827a1f7f4813216f6b32b6c61e386b2e" - this will reset your repo to the last version of OpenSSL 1.1.1
+in vcpkg. Then, copy the contents of the `ports/openssl` folder from the vcpkg repo to the `vcpkg-custom-ports` folder you created earlier:
+
+```sh
+cd <your vcpkg repo>
+git checkout 3b3bd424827a1f7f4813216f6b32b6c61e386b2e
+cd ports
+cp -r openssl <the location of the vcpkg-custom-ports directory listed above>
+```
+
+This will copy the port information for OpenSSL 1.1.1n to your vcpkg-custom-ports directory.
+
+Once that is done, you can install the custom port of OpenSSL 1.1.1n using the vcpkg tool:
+
+```sh
+vcpkg install --overlay-ports=<path to the vcpkg-custom-ports above>
+```
+
+If you are building using CMAKE, you can instruct CMAKE to apply the overlay ports using the following command line switches:
+
+```sh
+vcpkg -DVCPKG_MANIFEST_MODE=ON -DVCPKG_OVERLAY_PORTS=<path to the vcpkg-custom-ports above> -DVCPKG_MANIFEST_DIR=<path to the directory containing the vcpkg.json file>
+```
+
+In addition, if you need to consume OpenSSL from a dynamic linked library/shared object, you can set the VCPKG triplet to reflect that you want to build the library with dynamic 
+entries.Set the VCPKG_you can set the environment variable to `x64-windows-static` or `x64-windows-dynamic` depending on whether you want to use the static or dynamic version of OpenSSL. 
+Similarly you can use the x64-linux-dynamic and x64-linux-static triplet to specify consumption of libraries as a shared object or dynamic.
+
 ## Need help
 
 - For reference documentation visit the [Azure SDK for C++ documentation](https://azure.github.io/azure-sdk-for-cpp).

cmake-modules/AddGoogleTest.cmake

@@ -78,7 +78,8 @@ macro(add_gtest TESTNAME)
         else()
             gtest_discover_tests(${TESTNAME}
                 TEST_PREFIX "${TESTNAME}."
-                PROPERTIES FOLDER "Tests")
+                PROPERTIES FOLDER "Tests"
+                DISCOVERY_TIMEOUT 600)
         endif()
     else()
         add_test(${TESTNAME} ${TESTNAME})

cmake-modules/AzureVcpkg.cmake

@@ -22,7 +22,7 @@ macro(az_vcpkg_integrate)
       if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG})
         # GET VCPKG FROM SOURCE
         #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-        set(VCPKG_COMMIT_STRING f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit
+        set(VCPKG_COMMIT_STRING 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98) # default SDK tested commit
         if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
           set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
         endif()

cmake-modules/FolderList.cmake

@@ -18,9 +18,9 @@ macro(GetFolderList project)
         DownloadDepVersion(sdk/core azure-core 1.7.1)
         DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.0)
     elseif(${project} STREQUAL STORAGE_FILES_DATALAKE)
-        DownloadDepVersion(sdk/core azure-core 1.3.1)
-        DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2)
-        DownloadDepVersion(sdk/storage/azure-storage-blobs azure-storage-blobs 12.3.0)
+        DownloadDepVersion(sdk/core azure-core 1.7.1)
+        DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.0)
+        DownloadDepVersion(sdk/storage/azure-storage-blobs azure-storage-blobs 12.6.2)
     elseif(${project} STREQUAL STORAGE_FILES_SHARES)
         DownloadDepVersion(sdk/core azure-core 1.7.1)
         DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.0)

cmake-modules/PerfTest.cmake

@@ -0,0 +1,11 @@
+macro(SetPerfDeps PACKAGE VAR_RESULT)
+    string(TOUPPER ${PACKAGE} SUFFIX)
+    string(CONCAT VAR_TRIGGER "VCPKG-" ${SUFFIX})
+    message(STATUS "trigger name ${VAR_TRIGGER}")
+    if(DEFINED ENV{${VAR_TRIGGER}})
+        find_package(${PACKAGE} $ENV{${VAR_TRIGGER}} EXACT)
+        add_compile_definitions(${VAR_RESULT}="$ENV{${VAR_TRIGGER}}")
+    else()
+        add_compile_definitions(${VAR_RESULT}="source")
+    endif()
+endmacro()

doc/DistributedTracing.md

@@ -52,11 +52,7 @@ in-memory logger.
 opentelemetry::nostd::shared_ptr<opentelemetry::trace::TracerProvider>
 CreateOpenTelemetryProvider()
 {
-#if USE_MEMORY_EXPORTER
-    auto exporter = std::make_unique<opentelemetry::exporter::memory::InMemorySpanExporter>();
-#else
-    auto exporter = std::make_unique<opentelemetry::exporter::trace::OStreamSpanExporter>();
-#endif
+    auto exporter = std::make_unique<MyExporter>();
 
     // simple processor
     auto simple_processor = std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>(