Amqp gearama2

CMakeLists.txt

@@ -120,7 +120,7 @@ add_subdirectory(sdk/core)
 add_subdirectory(sdk/attestation)
 # AMQP doesn't work for UWP yet, and eventhubs depends on AMQP, so we cannot include eventhubs on UWP.
 if (NOT BUILD_WINDOWS_UWP)
-  add_subdirectory(sdk/eventhubs)
+    add_subdirectory(sdk/eventhubs)
 endif()
 add_subdirectory(sdk/identity)
 add_subdirectory(sdk/keyvault)

CMakeSettings.json

@@ -56,7 +56,8 @@
           "value": "True",
           "type": "BOOL"
         }
-      ]
+      ],
+      "cmakeToolchain": "D:/vcpkg/scripts/buildsystems/vcpkg.cmake"
     },
     {
       "name": "x64-DebugWithTests-OpenSSL111",

cmake-modules/FolderList.cmake

@@ -30,6 +30,10 @@ macro(GetFolderList project)
     elseif(${project} STREQUAL STORAGE_QUEUES)
         DownloadDepVersion(sdk/core azure-core 1.5.0)
         DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.3)
+    elseif(${project} STREQUAL MESSAGING)
+        DownloadDepVersion(sdk/core azure-core 1.8.0)
+        DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.1)
+    elseif(${project} STREQUAL STORAGE_FILES_DATALAKE)
     endif()
     list(REMOVE_DUPLICATES BUILD_FOLDERS)
 endmacro()
@@ -52,6 +56,9 @@ endmacro()
 
 macro(SetCompileOptions project)
     message ("setting up compile options for ${project}")
+    if(${project} STREQUAL MESSAGING)
+        option(ENABLE_AZURE_CORE_AMQP "Enable AMQP." ON)
+    endif()
     # Compile Options
     SetGlobalOptions()
 endmacro()

sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp

@@ -130,6 +130,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal {
    */
   class Management final {
   public:
+    Management() = default;
     /**
      * @brief Create a new Management object instance.
      *

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp

@@ -26,7 +26,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
 
   using UniqueMessageHeaderHandle = Azure::Core::_internal::UniqueHandle<HEADER_INSTANCE_TAG>;
 
-  struct MessageHeader final
+  struct MessageHeader
   {
 
     MessageHeader() = default;

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp

@@ -43,7 +43,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
 
   constexpr int AmqpMessageFormatValue = 0; // Specifies the message format for an AMQP message.
 
-  class AmqpMessage final {
+  class AmqpMessage {
   public:
     /** @brief Construct a new AMQP Message object. */
     AmqpMessage() = default;
@@ -268,7 +268,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models { namespace
    * @remarks This class should not be used directly. It is used by the uAMQP interoperability
    * layer.
    */
-  class AmqpMessageFactory final {
+  class AmqpMessageFactory {
   public:
     static AmqpMessage FromUamqp(UniqueMessageHandle const& properties);
     static AmqpMessage FromUamqp(MESSAGE_INSTANCE_TAG* properties);

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp

@@ -24,7 +24,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
 
   using UniquePropertiesHandle = Azure::Core::_internal::UniqueHandle<PROPERTIES_INSTANCE_TAG>;
 
-  struct MessageProperties final
+  struct MessageProperties
   {
     MessageProperties() = default;
     ~MessageProperties() = default;
@@ -60,7 +60,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models { namespace
    * @remarks This class should not be used directly. It is used by the uAMQP interoperability
    * layer.
    */
-  class MessagePropertiesFactory final {
+  class MessagePropertiesFactory {
   public:
     static MessageProperties FromUamqp(UniquePropertiesHandle const& properties);
     static UniquePropertiesHandle ToUamqp(MessageProperties const& properties);

sdk/core/azure-core-amqp/inc/azure/core/amqp/session.hpp

@@ -120,6 +120,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal {
         SessionOptions const& options = {},
         SessionEvents* eventHandler = nullptr);
 
+    Session() = default;
     /** @brief Destroys the session object. */
     ~Session() noexcept;
 

sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp

@@ -8,12 +8,22 @@
 #include <iostream>
 #include <limits>
 #include <string>
-
+#include <azure/core/internal/environment.hpp>
 #define EH_CONNECTION_STRING "<<<Replace with the connection string from your eventhubs instance>>>"
 
 int main()
 {
-  Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions;
+  /*
+  * std::string connectionString
+      = Azure::Core::_internal::Environment::GetVariable("EVENTHUB_CONNECTION_STRING")
+      + ";EntityPath=eventhub";
+  auto credential
+      = std::make_shared<Azure::Core::Amqp::_internal::ServiceBusSasConnectionStringCredential>(
+          connectionString);
+  std::string hostUrl = "amqps://" + credential->GetHostName() + "/" + credential->GetEntityPath()
+      + "/ConsumerGroups/$Default/Partitions/1";
+  */
+    Azure::Core::Amqp::_internal::ConnectionOptions connectionOptions;
   connectionOptions.ContainerId = "whatever";
   connectionOptions.EnableTrace = false;
   connectionOptions.SaslCredentials
@@ -38,11 +48,11 @@ int main()
   Azure::Core::Amqp::_internal::MessageReceiver receiver(session, hostUrl, receiverOptions);
 
   // Open the connection to the remote.
-  receiver.Open();
+  receiver.Open();  
 
   auto timeStart = std::chrono::high_resolution_clock::now();
 
-  constexpr int maxMessageReceiveCount = 1000;
+  constexpr int maxMessageReceiveCount = 10000;
 
   int messageReceiveCount = 0;
   while (messageReceiveCount < maxMessageReceiveCount)

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp

@@ -15,7 +15,7 @@
 
 int main()
 {
-  std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING");
+  std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING")+ ";EntityPath=eventhub";
 
   auto credential
       = std::make_shared<Azure::Core::Amqp::_internal::ServiceBusSasConnectionStringCredential>(

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp

@@ -12,10 +12,13 @@
 #include <iostream>
 #include <limits>
 #include <string>
+#include <azure/core/internal/environment.hpp>
 
 int main()
 {
-  std::string eventhubConnectionString = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING");
+  std::string eventhubConnectionString
+      = GetEnvHelper::GetEnv("EVENTHUB_CONNECTION_STRING") + ";EntityPath=eventhub";
+
 
   auto credential{
       std::make_shared<Azure::Core::Amqp::_internal::ServiceBusSasConnectionStringCredential>(
@@ -37,10 +40,11 @@ int main()
 
   Azure::Core::Amqp::_internal::Session session(connection, credential, sessionOptions);
 
-  constexpr int maxMessageSendCount = 1000;
+  constexpr int maxMessageSendCount = 5;
   Azure::Core::Amqp::Models::AmqpMessage message;
   message.SetBody(Azure::Core::Amqp::Models::AmqpBinaryData{'H', 'e', 'l', 'l', 'o'});
 
+
   Azure::Core::Amqp::_internal::MessageSenderOptions senderOptions;
   senderOptions.EnableTrace = true;
   senderOptions.Name = "sender-link";

sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt

@@ -22,7 +22,6 @@ if(FETCH_SOURCE_DEPS)
     SetCompileOptions(MESSAGING)
 endif()
 
-
 include(AzureVersion)
 include(AzureCodeCoverage)
 include(AzureTransportAdapters)
@@ -33,37 +32,86 @@ include(AzureBuildTargetForCI)
 # Add create_map_file function
 include(CreateMapFile)
 
+if(FETCH_SOURCE_DEPS)
+    GetFolderList(KEYS)
+    foreach(oneFolder IN LISTS BUILD_FOLDERS)
+        message("add folder ${oneFolder}")
+        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
+    endforeach()
+elseif(NOT AZ_ALL_LIBRARIES)
+  find_package(azure-core-cpp "1.9.0" CONFIG QUIET)
+  find_package(azure-storage-blobs-cpp "12.7.0" CONFIG QUIET)
+  if(NOT azure-core-cpp_FOUND)
+    find_package(azure-core-cpp "1.9.0" REQUIRED)
+    find_package(azure-storage-blobs-cpp "12.7.0" REQUIRED)
+  endif()
+endif()
+
 set(
   AZURE_MESSAGING_EVENTHUBS_HEADER
-  inc/azure/messaging/eventhubs/eventhubs.hpp
-  inc/azure/messaging/eventhubs.hpp
+    inc/azure/messaging/eventhubs.hpp
+    inc/azure/messaging/eventhubs/dll_import_export.hpp
+    inc/azure/messaging/eventhubs/producer_client.hpp
+    inc/azure/messaging/eventhubs/event_data_batch.hpp
+    inc/azure/messaging/eventhubs/retry_operation.hpp
+    inc/azure/messaging/eventhubs/consumer_client.hpp
+    inc/azure/messaging/eventhubs/partition_client.hpp
+    inc/azure/messaging/eventhubs/processor_load_balancer.hpp
+    inc/azure/messaging/eventhubs/processor_partition_client.hpp
+    inc/azure/messaging/eventhubs/checkpoint_store.hpp
+    inc/azure/messaging/eventhubs/rtti.hpp
+    inc/azure/messaging/eventhubs/processor.hpp
+    inc/azure/messaging/eventhubs/models/amqp_message.hpp
+    inc/azure/messaging/eventhubs/models/management_models.hpp
+    inc/azure/messaging/eventhubs/models/checkpoint_store_models.hpp
+    inc/azure/messaging/eventhubs/models/consumer_client_models.hpp
+    inc/azure/messaging/eventhubs/models/event_data_batch_models.hpp
+    inc/azure/messaging/eventhubs/models/partition_client_models.hpp
+    inc/azure/messaging/eventhubs/models/processor_models.hpp
+    inc/azure/messaging/eventhubs/models/processor_load_balancer_models.hpp
+    inc/azure/messaging/eventhubs/models/producer_client_models.hpp
 )
 
 set(
   AZURE_MESSAGING_EVENTHUBS_SOURCE
-  src/eventhubs.cpp
-  src/private/package_version.hpp
+    src/private/package_version.hpp
+    src/producer_client.cpp
+    src/retry_operation.cpp
+    src/consumer_client.cpp
+    src/checkpoint_store.cpp
+    src/processor_load_balancer.cpp
 )
 add_library(
   azure-messaging-eventhubs
-    ${AZURE_MESSAGING_EVENTHUBS_HEADER} 
-    ${AZURE_MESSAGING_EVENTHUBS_SOURCE}
- )
-
-target_include_directories(azure-messaging-eventhubs  PUBLIC
+    ${AZURE_MESSAGING_EVENTHUBS_HEADER} ${AZURE_MESSAGING_EVENTHUBS_SOURCE}
+   )
+create_per_service_target_build(messaging azure-messaging-eventhubs)
+add_library(Azure::azure-messaging-eventhubs ALIAS azure-messaging-eventhubs)
+
+target_include_directories(
+  azure-messaging-eventhubs  
+    PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
       $<INSTALL_INTERFACE:include>
 )
+# Include shared source code
+# NOTE: Use shared-code only within .cpp files. DO NEVER consume the shared-code from header files.
+target_include_directories(
+  azure-messaging-eventhubs
+    PRIVATE
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../azure-messaging-eventhubs/inc>
+)
 
-target_link_libraries(azure-messaging-eventhubs PUBLIC Azure::azure-core)
+target_link_libraries(azure-messaging-eventhubs PUBLIC Azure::azure-core Azure::azure-core-amqp Azure::azure-storage-blobs)
 
 # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF
-create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
+create_code_coverage(messaging azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")
 
 get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
 generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION})
 
 if(BUILD_TESTING)
+  add_compile_definitions(TESTING_BUILD_AMQP)
   if (NOT AZ_ALL_LIBRARIES OR FETCH_SOURCE_DEPS)
     include(AddGoogleTest)
     enable_testing ()
@@ -75,11 +123,13 @@ endif()
 az_vcpkg_export(
     azure-messaging-eventhubs
     MESSAGING_EVENTHUBS
-    "azure/messaging/eventhubs/dll_import_export.hpp"
+    azure/messaging/eventhubs/dll_import_export.hpp
   )
 
 az_rtti_setup(
   azure-messaging-eventhubs
   MESSAGING_EVENTHUBS
-  "azure/messaging/eventhubs/rtti.hpp"
+  azure/messaging/eventhubs/rtti.hpp
 )
+
+unset(FETCH_SOURCE_DEPS CACHE)

sdk/eventhubs/azure-messaging-eventhubs/ci.yml

@@ -20,13 +20,13 @@ pr:
       - hotfix/*
   paths:
     include:
-      - sdk/eventhubs/azure-messaging-eventhubs
+      - sdk/eventhubs
       - eng/common/testproxy
 
 stages:
-  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+  - template: ../../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
-      ServiceDirectory: eventhubs/azure-messaging-eventhubs
+      ServiceDirectory: eventhubs
       CtestRegex: "azure-messaging-eventhubs.*"
       LiveTestCtestRegex: "azure-messaging-eventhubs.*"
       LiveTestTimeoutInMinutes: 120
@@ -53,11 +53,11 @@ stages:
         - Name: Default
           Value: ''
         - Name: Test
-          Value: '-DBUILD_TESTING=ON'
+          Value: '-DBUILD_TESTING=ON -DENABLE_AZURE_CORE_AMQP=ON'
         - Name: Samples
-          Value: '-DBUILD_TESTING=ON -DBUILD_SAMPLES=ON'
+          Value: '-DBUILD_TESTING=ON -DBUILD_SAMPLES=ON -DENABLE_AZURE_CORE_AMQP=ON'
         - Name: Performance
-          Value: '-DBUILD_TESTING=ON -DBUILD_SAMPLES=ON -DBUILD_PERFORMANCE_TESTS=ON'
+          Value: '-DBUILD_TESTING=ON -DBUILD_SAMPLES=ON -DBUILD_PERFORMANCE_TESTS=ON -DENABLE_AZURE_CORE_AMQP=ON'
       CMakeSourceTestOptions:
         - Name: Source
-          Value: '-DFETCH_SOURCE_DEPS=ON'
+          Value: '-DFETCH_SOURCE_DEPS=OFF'

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs.hpp

@@ -7,5 +7,23 @@
  */
 
 #pragma once
-
-#include "azure/messaging/eventhubs/eventhubs.hpp"
+#include "azure/messaging/eventhubs/dll_import_export.hpp"
+#include "azure/messaging/eventhubs/models/amqp_message.hpp"
+#include "azure/messaging/eventhubs/checkpoint_store.hpp"
+#include "azure/messaging/eventhubs/consumer_client.hpp"
+#include "azure/messaging/eventhubs/event_data_batch.hpp"
+#include "azure/messaging/eventhubs/partition_client.hpp"
+#include "azure/messaging/eventhubs/processor_load_balancer.hpp"
+#include "azure/messaging/eventhubs/producer_client.hpp"
+#include "azure/messaging/eventhubs/retry_operation.hpp"
+#include "azure/messaging/eventhubs/rtti.hpp"
+#include "azure/messaging/eventhubs/processor.hpp"
+#include "azure/messaging/eventhubs/models/amqp_message.hpp"
+#include "azure/messaging/eventhubs/models/management_models.hpp"
+#include "azure/messaging/eventhubs/models/checkpoint_store_models.hpp"
+#include "azure/messaging/eventhubs/models/consumer_client_models.hpp"
+#include "azure/messaging/eventhubs/models/event_data_batch_models.hpp"
+#include "azure/messaging/eventhubs/models/partition_client_models.hpp"
+#include "azure/messaging/eventhubs/models/processor_models.hpp"
+#include "azure/messaging/eventhubs/models/processor_load_balancer_models.hpp"
+#include "azure/messaging/eventhubs/models/producer_client_models.hpp"