Azure · LarryOsterman · Jul 27, 2022 · Jun 17, 2022 · Jun 20, 2022 · Jun 28, 2022
@@ -84,6 +84,7 @@
     "ncus",
     "Niels",
     "nlohmann",
+    "nohup",
     "nostd",
     "noclean",
     "NOCLOSE",
@@ -99,6 +100,7 @@
     "pdbs",
     "Piotrowski",
     "PUCHAR",
+    "PVOID",
     "pwsh",
     "Ragrs",
     "Ragzrs",

@@ -32,6 +32,12 @@ parameters:
   - name: TestEnv
     type: object
     default: []
+  - name: PreTestSteps
+    type: object
+    default: []
+  - name: PostTestSteps
+    type: object
+    default: []
 
 jobs:
   - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -53,6 +59,8 @@ jobs:
         LineCoverageTarget: ${{ parameters.LineCoverageTarget }}
         BranchCoverageTarget: ${{ parameters.BranchCoverageTarget }}
         TestEnv: ${{ parameters.TestEnv }}
+        PreTestSteps: ${{ parameters.PreTestSteps }}
+        PostTestSteps: ${{ parameters.PostTestSteps }}
 
   # Disable build for cpp - client
   - ${{ if ne(parameters.ServiceDirectory, 'not-specified' )}}:

@@ -46,6 +46,13 @@ parameters:
   - name: UsePlatformContainer
     type: boolean
     default: false
+  - name: PreTestSteps
+    type: object
+    default: []
+  - name: PostTestSteps
+    type: object
+    default: []
+
 
 jobs:
   - job:
@@ -137,6 +144,8 @@ jobs:
           BuildArgs: "$(BuildArgs)"
           Env: "$(CmakeEnvArg)"
 
+      - ${{ parameters.PreTestSteps }}
+
       - pwsh: |
           ctest `
             -C Debug `
@@ -148,6 +157,8 @@ jobs:
         workingDirectory: build
         displayName: Test
 
+      - ${{ parameters.PostTestSteps }}
+
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: cTest

@@ -36,6 +36,12 @@ parameters:
 - name: UsePlatformContainer
   type: boolean
   default: false
+- name: PreTestSteps
+  type: object
+  default: []
+- name: PostTestSteps
+  type: object
+  default: []
 
 jobs:
 - job: ValidateLive
@@ -126,6 +132,8 @@ jobs:
         Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
       SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
 
+  - ${{ parameters.PreTestSteps }}
+
     # For non multi-config generator use the same build configuration to run tests
     # We don't need to set it to invoke ctest
     # Visual Studio generator used in CI is a multi-config generator.
@@ -141,6 +149,8 @@ jobs:
       succeeded(),
       ne(variables['RunSamples'], '1'))
 
+  - ${{ parameters.PostTestSteps }}
+
   - task: PublishTestResults@2
     inputs:
       testResultsFormat: cTest

@@ -67,6 +67,12 @@ parameters:
 - name: UnsupportedClouds
   type: string
   default: ''
+- name: PreTestSteps
+  type: object
+  default: []
+- name: PostTestSteps
+  type: object
+  default: []
 
 
 stages:
@@ -96,6 +102,8 @@ stages:
           ${{ if eq(parameters.ServiceDirectory, 'template') }}:
             TestPipeline: true
           TestEnv: ${{ parameters.TestEnv }}
+          PreTestSteps: ${{ parameters.PreTestSteps }}
+          PostTestSteps: ${{ parameters.PostTestSteps }}
 
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(parameters.LiveTestCtestRegex, '')) }}:
     - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -110,6 +118,8 @@ stages:
         Clouds: ${{ parameters.Clouds }}
         SupportedClouds: ${{ parameters.SupportedClouds }}
         UnsupportedClouds: ${{ parameters.UnsupportedClouds }}
+        PreTestSteps: ${{ parameters.PreTestSteps }}
+        PostTestSteps: ${{ parameters.PostTestSteps }}
 
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), not(endsWith(variables['Build.DefinitionName'], ' - tests'))) }}:
     - template: archetype-cpp-release.yml

@@ -29,6 +29,12 @@ parameters:
 - name: UnsupportedClouds
   type: string
   default: ''
+- name: PreTestSteps
+  type: object
+  default: []
+- name: PostTestSteps
+  type: object
+  default: []
 
 stages:
 - ${{ each cloud in parameters.CloudConfig }}:
@@ -57,3 +63,5 @@ stages:
                 Coverage: ${{ parameters.Coverage}}
                 CoverageReportPath: ${{ parameters.CoverageReportPath}}
                 TimeoutInMinutes: ${{ parameters.TimeoutInMinutes}}
+                PreTestSteps: ${{ parameters.PreTestSteps }}
+                PostTestSteps: ${{ parameters.PostTestSteps }}
@@ -36,7 +36,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
         find_package(azure-core-cpp REQUIRED)
       endif()
     endif()
-    find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED)
+    find_package(opentelemetry-cpp CONFIG REQUIRED)
 
     set(
       AZURE_CORE_OPENTELEMETRY_HEADER

@@ -531,6 +531,9 @@ TEST_F(OpenTelemetryTests, SetStatus)
 
     span->SetStatus(Azure::Core::Tracing::_internal::SpanStatus::Error, {});
     span->SetStatus(Azure::Core::Tracing::_internal::SpanStatus::Ok, {});
+    EXPECT_THROW(
+        span->SetStatus(static_cast<Azure::Core::Tracing::_internal::SpanStatus>(357), {}),
+        std::runtime_error);
 
     span->End({});
 
@@ -553,7 +556,7 @@ TEST_F(OpenTelemetryTests, SetStatus)
 
     span->SetStatus(Azure::Core::Tracing::_internal::SpanStatus::Error, "Something went wrong.");
 
-    span->End({});
+    span->End(Azure::DateTime(std::chrono::system_clock::now()));
 
     // Return the collected spans.
     auto spans = m_spanData->GetSpans();

@@ -42,14 +42,20 @@ if(BUILD_TRANSPORT_CURL)
     src/http/curl/curl_connection_pool_private.hpp
     src/http/curl/curl_connection_private.hpp
     src/http/curl/curl_session_private.hpp
-  )
+    src/http/curl/curl_websockets.cpp
+   )
   SET(CURL_TRANSPORT_ADAPTER_INC
     inc/azure/core/http/curl_transport.hpp
+    inc/azure/core/http/websockets/curl_websockets_transport.hpp
   )
 endif()
 if(BUILD_TRANSPORT_WINHTTP)
-  SET(WIN_TRANSPORT_ADAPTER_SRC src/http/winhttp/win_http_transport.cpp)
-  SET(WIN_TRANSPORT_ADAPTER_INC inc/azure/core/http/win_http_transport.hpp)
+  SET(WIN_TRANSPORT_ADAPTER_SRC 
+    src/http/winhttp/win_http_transport.cpp
+    src/http/winhttp/win_http_websockets.cpp)
+ SET(WIN_TRANSPORT_ADAPTER_INC 
+    inc/azure/core/http/win_http_transport.hpp
+    inc/azure/core/http/websockets/win_http_websockets_transport.hpp)
 endif()
 
 set(
@@ -74,6 +80,8 @@ set(
     inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/raw_response.hpp
     inc/azure/core/http/transport.hpp
+    inc/azure/core/http/websockets/websockets.hpp
+    inc/azure/core/http/websockets/websockets_transport.hpp
     inc/azure/core/internal/client_options.hpp
     inc/azure/core/internal/contract.hpp
     inc/azure/core/internal/cryptography/sha_hash.hpp
@@ -132,6 +140,8 @@ set(
     src/http/transport_policy.cpp
     src/http/url.cpp
     src/http/user_agent.cpp
+    src/http/websockets/websockets.cpp
+    src/http/websockets/websockets_impl.cpp
     src/io/body_stream.cpp
     src/io/random_access_file_body_stream.cpp
     src/logger.cpp

@@ -18,7 +18,10 @@ namespace Azure { namespace Core {
 
   /**
    * @brief Used to convert one form of data  into another, for example encoding binary data into
-   * Base64 text.
+   * Base64 encoded octets.
+   *
+   * @note Base64 encoded data is a subset of the ASCII encoding (characters 0-127). As such,
+   * it can be considered a subset of UTF-8.
    */
   class Convert final {
   private:
@@ -31,17 +34,17 @@ namespace Azure { namespace Core {
 
   public:
     /**
-     * @brief Encodes the vector of binary data into UTF-8 encoded text represented as Base64.
+     * @brief Encodes a vector of binary data using Base64.
      *
-     * @param data The input vector that contains binary data that needs to be encoded.
-     * @return The UTF-8 encoded text in Base64.
+     * @param data The input vector that contains binary data to be encoded.
+     * @return The Base64 encoded contents of the vector.
      */
     static std::string Base64Encode(const std::vector<uint8_t>& data);
 
     /**
-     * @brief Decodes the UTF-8 encoded text represented as Base64 into binary data.
+     * @brief Decodes a Base64 encoded data into a vector of binary data.
      *
-     * @param text The input UTF-8 encoded text in Base64 that needs to be decoded.
+     * @param text Base64 encoded data to be decoded.
      * @return The decoded binary data.
      */
     static std::vector<uint8_t> Base64Decode(const std::string& text);

@@ -120,6 +120,11 @@ namespace Azure { namespace Core { namespace Cryptography {
   /**
    * @brief Represents the class for the MD5 hash function which maps binary data of an arbitrary
    * length to small binary data of a fixed length.
+   *
+   * @warning MD5 is a deprecated hashing algorithm and SHOULD NOT be used,
+   * unless it is used to implement a specific protocol (See RFC 6151 for more information
+   * about the weaknesses of the MD5 hash function). Client implementers should strongly prefer the
+   * SHA256, SHA384, and SHA512 hash functions.
    */
   class Md5Hash final : public Hash {
 

@@ -13,6 +13,7 @@
 #include "azure/core/http/transport.hpp"
 
 namespace Azure { namespace Core { namespace Http {
+  class CurlNetworkConnection;
 
   namespace _detail {
     /**
@@ -46,7 +47,7 @@ namespace Azure { namespace Core { namespace Http {
   /**
    * @brief Set the libcurl connection options like a proxy and CA path.
    */
-  struct CurlTransportOptions final
+  struct CurlTransportOptions
   {
     /**
      * @brief The string for the proxy is passed directly to the libcurl handle without any parsing.
@@ -126,10 +127,17 @@ namespace Azure { namespace Core { namespace Http {
   /**
    * @brief Concrete implementation of an HTTP Transport that uses libcurl.
    */
-  class CurlTransport final : public HttpTransport {
+  class CurlTransport : public HttpTransport {
   private:
     CurlTransportOptions m_options;
 
+  protected:
+    /**
+     * @brief Called when an HTTP response indicates the connection should be upgraded to
+     * a websocket. Takes ownership of the CurlNetworkConnection object.
+     */
+    virtual void OnUpgradedConnection(std::unique_ptr<CurlNetworkConnection>&&){};
+
   public:
     /**
      * @brief Construct a new CurlTransport object.
@@ -140,6 +148,12 @@ namespace Azure { namespace Core { namespace Http {
     {
     }
 
+    // See also:
+    // [Core Guidelines C.35: "A base class destructor should be either public
+    // and virtual or protected and
+    // non-virtual"](http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#c35-a-base-class-destructor-should-be-either-public-and-virtual-or-protected-and-non-virtual)
+    virtual ~CurlTransport() = default;
+
     /**
      * @brief Implements interface to send an HTTP Request and produce an HTTP RawResponse
      *

@@ -66,6 +66,12 @@ namespace Azure { namespace Core { namespace Http {
      * @return A reference to this instance.
      */
     HttpTransport& operator=(const HttpTransport& other) = default;
+
+    /**
+     * @brief Returns true if the HttpTransport supports WebSockets (the ability to
+     * communicate bidirectionally on the TCP connection used by the HTTP transport).
+     */
+    virtual bool HasWebSocketSupport() const { return false; }
   };
 
 }}} // namespace Azure::Core::Http