Merge branch 'main' into onsuccess-callback

Author: willhoy

.github/workflows/build.yml

@@ -28,6 +28,8 @@ jobs:
     #Only run for push to main
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # Needed to push to gh-pages
     steps:
       - uses: actions/checkout@v3
       - name: Doxygenize

Makefile

@@ -32,15 +32,15 @@ clean:
 	rm -rf $(BUILD_FOLDER)
 
 docker-setup:
-	cd $(SRC_FOLDER)/dockerfiles && docker-compose build --pull 
+	cd $(SRC_FOLDER)/dockerfiles && docker compose build --pull 
 
 docker-build:
-	cd $(SRC_FOLDER)/dockerfiles && docker-compose run dev make full
+	cd $(SRC_FOLDER)/dockerfiles && docker compose run dev make full
 
 docker-test:
-	cd $(SRC_FOLDER)/dockerfiles && docker-compose run dev make full-test
+	cd $(SRC_FOLDER)/dockerfiles && docker compose run dev make full-test
 
 docker-shell:
-	cd $(SRC_FOLDER)/dockerfiles && docker-compose run dev
+	cd $(SRC_FOLDER)/dockerfiles && docker compose run dev
 
 .PHONY: build init unit integration clean full full-test

docs/doxygen.md

@@ -18,7 +18,7 @@ Metric publisher is used to publish internal library metrics. Users can provide
 
 Error callback is called when a connection or channel is closed by the RabbitMQ broker.
 
-Important -- `RabbitContext` object must outlive other library objects (`VHost`, `Producer`, `Consumer`).
+**Important** -- `RabbitContext` object **must outlive** other library objects (`VHost`, `Producer`, `Consumer`).
 
 ```cpp
 
@@ -51,6 +51,7 @@ bsl::shared_ptr<rmqa::VHost> vhost = context.createVHostConnection(
 
 Creating a `rmqa::VHost` instance **does not** immediately create a connection with the RabbitMQ broker. These connections are created lazily when calling `rmqa::VHost::createProducer` and `rmqa::VHost::createConsumer`.
 
+**Important** -- `VHost` object **must outlive** other library objects (`Producer`, `Consumer`).
 
 ## Topology
 

src/rmq/rmqamqp/rmqamqp_connection.cpp

@@ -630,9 +630,10 @@ class Connection::ConnectionMethodProcessor {
         conn.sendConnectionCloseOk();
 
         if (closeMethod.classId() || closeMethod.methodId()) {
-            conn.d_retryHandler->errorCallback()("Connection error " +
-                                                     closeMethod.replyText(),
-                                                 closeMethod.replyCode());
+            conn.d_retryHandler->errorCallback()(
+                "Connection=" + conn.d_connectionName + " Connection error " +
+                    closeMethod.replyText(),
+                closeMethod.replyCode());
         }
     }
 

src/rmq/rmqio/rmqio_asioconnection.cpp

@@ -433,7 +433,6 @@ AsioConnection<SocketType>::prepareBuffer()
 template <typename SocketType>
 bool AsioConnection<SocketType>::doRead(bsl::size_t bytes_transferred)
 {
-
     bool success = true;
 
     // d_inbound is setup with a buffer size of maxFrameSize in ::prepareBuffer
@@ -444,20 +443,21 @@ bool AsioConnection<SocketType>::doRead(bsl::size_t bytes_transferred)
     bsl::size_t bytes_decoded                       = 0;
     boost::asio::streambuf::const_buffers_type bufs = d_inbound->data();
     bsl::vector<rmqamqpt::Frame> readFrames;
-    for (boost::asio::streambuf::const_buffers_type::const_iterator i =
-             bufs.begin();
-         i != bufs.end();
-         ++i) {
-        boost::asio::const_buffer buf(*i);
-        Decoder::ReturnCode rcode =
-            d_frameDecoder->appendBytes(&readFrames, buf.data(), buf.size());
+
+    for (const boost::asio::const_buffer* it =
+             boost::asio::buffer_sequence_begin(bufs);
+         it != boost::asio::buffer_sequence_end(bufs);
+         ++it) {
+        const boost::asio::const_buffer& buffer = *it;
+        Decoder::ReturnCode rcode               = d_frameDecoder->appendBytes(
+            &readFrames, buffer.data(), buffer.size());
         if (rcode != Decoder::OK) {
             BALL_LOG_WARN << "Bad rcode from decoder: " << rcode;
             // Fail but we still want to process frames we were able to decode
             success = false;
-            break;
-        };
-        bytes_decoded += buf.size();
+            break; // Exit the loop on error
+        }
+        bytes_decoded += buffer.size();
     }
 
     if (bytes_decoded != bytes_transferred) {

src/rmq/rmqio/rmqio_asioeventloop.cpp

@@ -108,8 +108,15 @@ void AsioEventLoop::onThreadStarted()
     d_condition.broadcast();
 }
 
-void AsioEventLoop::postImpl(const Item& item) { d_context.post(item); }
-void AsioEventLoop::dispatchImpl(const Item& item) { d_context.dispatch(item); }
+void AsioEventLoop::postImpl(const Item& item)
+{
+    boost::asio::post(d_context, item);
+}
+
+void AsioEventLoop::dispatchImpl(const Item& item)
+{
+    boost::asio::dispatch(d_context, item);
+}
 
 bsl::shared_ptr<rmqio::Resolver>
 AsioEventLoop::resolver(bool shuffleConnectionEndpoints)

src/tests/rmqa/rmqa_connectionstring.t.cpp

@@ -15,6 +15,8 @@
 
 #include <rmqa_connectionstring.h>
 
+#include <rmqtestutil_testsuite.t.h>
+
 #include <bsl_string.h>
 
 #include <gmock/gmock.h>
@@ -98,10 +100,6 @@ const ConnectionStringTestCase k_CONN_STRING_TESTS[] = {
     {"amqp://rabbit1.:", false, "", "", "", "", "", ""},
 };
 
-// We need to stick to INSTANTIATE_TEST_CASE_P for a while longer
-// But we do want to build with -Werror in our CI
-#pragma GCC diagnostic warning "-Wdeprecated-declarations"
-
-INSTANTIATE_TEST_CASE_P(ConnectionStringTests,
+RMQTESTUTIL_TESTSUITE_P(ConnectionStringTests,
                         ConnectionStringPTests,
                         testing::ValuesIn(k_CONN_STRING_TESTS));

src/tests/rmqa/rmqa_consumerimpl.t.cpp

@@ -23,6 +23,7 @@
 #include <rmqtestutil_mockchannel.t.h>
 #include <rmqtestutil_mockeventloop.t.h>
 #include <rmqtestutil_savethreadid.h>
+#include <rmqtestutil_testsuite.t.h>
 
 #include <rmqt_consumerackbatch.h>
 #include <rmqt_envelope.h>
@@ -449,11 +450,7 @@ TEST_P(ConsumerImplTests, UpdateCallbackFromTwoThreadsAtOnce)
     EXPECT_TRUE(future2.blockResult());
 }
 
-// We need to stick to INSTANTIATE_TEST_CASE_P for a while longer
-// But we do want to build with -Werror in our CI
-#pragma GCC diagnostic warning "-Wdeprecated-declarations"
-
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ConsumerImplTests,
                         Values(CONSUMER, TRACING_CONSUMER),
                         ConsumerImplTests::PrintParamName());

src/tests/rmqa/rmqa_producerimpl.t.cpp

@@ -22,6 +22,7 @@
 #include <rmqtestutil_mockchannel.t.h>
 #include <rmqtestutil_mockeventloop.t.h>
 #include <rmqtestutil_savethreadid.h>
+#include <rmqtestutil_testsuite.t.h>
 
 #include <rmqp_producer.h>
 #include <rmqt_confirmresponse.h>
@@ -815,32 +816,28 @@ TEST_P(TracingProducerImplTests, SendConfirmCallsTracing)
     d_threadPool.drain();
 }
 
-// We need to stick to INSTANTIATE_TEST_CASE_P for a while longer
-// But we do want to build with -Werror in our CI
-#pragma GCC diagnostic warning "-Wdeprecated-declarations"
-
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ProducerImplTests,
                         Values(PRODUCER, TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ProducerImplConfirmTypeTests,
                         Values(PRODUCER, TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ProducerImplCallbackLifetimeTests,
                         Values(PRODUCER, TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ProducerImplMaxOutstandingTests,
                         Values(PRODUCER, TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         ProducerImplUpdateTopology,
                         Values(PRODUCER, TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());
 
-INSTANTIATE_TEST_CASE_P(AllMembers,
+RMQTESTUTIL_TESTSUITE_P(AllMembers,
                         TracingProducerImplTests,
                         Values(TRACING_PRODUCER),
                         ProducerImplTests::PrintParamName());

src/tests/rmqamqp/rmqamqp_connection.t.cpp

@@ -149,7 +149,8 @@ class MockConnection : public rmqio::Connection {
 
             BSLS_ASSERT_OPT(rc == Frame::OK);
 
-            d_eventLoop.post(
+            boost::asio::post(
+                d_eventLoop,
                 bdlf::BindUtil::bind(d_connectionCallbacks.onRead, decoded));
         }
     }
@@ -158,7 +159,8 @@ class MockConnection : public rmqio::Connection {
     {
         BALL_LOG_TRACE << "MockConnection close";
 
-        d_eventLoop.post(bdlf::BindUtil::bind(cb, GRACEFUL_DISCONNECT));
+        boost::asio::post(d_eventLoop,
+                          bdlf::BindUtil::bind(cb, GRACEFUL_DISCONNECT));
     }
 
     void asyncWriteImpl(
@@ -177,7 +179,7 @@ class MockConnection : public rmqio::Connection {
             rmqamqpt::Method(
                 rmqamqpt::ConnectionMethod(rmqamqpt::ConnectionCloseOk())));
 
-        d_eventLoop.post(callback);
+        boost::asio::post(d_eventLoop, callback);
 
         if (!closeOk) {
             feedNextFrame();
@@ -303,7 +305,7 @@ ACTION_P3(ConnectMockConnection, mockConnectPtrPtr, replayFrame, eventLoop)
 
     ON_CALL(**mockConnectPtrPtr, isConnected()).WillByDefault(Return(true));
 
-    eventLoop.get().post(arg4);
+    boost::asio::post(eventLoop.get(), arg4);
 
     return *mockConnectPtrPtr;
 }