Merge branch 'master' into develop

Author: alexcamposruiz

.github/workflows/build.yml

@@ -18,7 +18,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        architecture: [{name: x64Linux4gcc7.3.0, os: ubuntu-20.04}]
+
+    runs-on: ${{ matrix.architecture.os }}
     name: Build examples
 
     # This job will be executed if the "PR handler" finalized successfully or
@@ -33,6 +37,50 @@ jobs:
 
     steps:
 
+      # Download the artifacts generated by "PR Handler" if this workflow was
+      # triggered by a workflow_run event.
+      - name: Download artifact
+        if: ${{ github.event_name == 'workflow_run' }}
+        uses: actions/[email protected]
+        with:
+          script: |
+            var fs = require('fs');
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{ github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "targetbranch"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            fs.writeFileSync('${{github.workspace}}/targetbranch.zip', Buffer.from(download.data));
+
+      # Unzip the artifacts.
+      - name: Unzip artifact
+        if: ${{ github.event_name == 'workflow_run' }}
+        run: unzip targetbranch.zip
+
+        # Save the PR number to send messages to the user that opened it.
+      - name: Get target branch
+        if: ${{ github.event_name == 'workflow_run' }}
+        id: target_branch
+        run: echo "TARGET_BRANCH=$(cat targetbranch)" >> $GITHUB_OUTPUT
+
+      # Sparse-checkout: we clone just the scripts from the target branch for
+      # sefaty reasons.
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.target_branch.outputs.TARGET_BRANCH }}
+          sparse-checkout: resources/ci_cd/
+          sparse-checkout-cone-mode: false
+        if: ${{ github.event_name == 'workflow_run' }}
+
       # Download the artifacts generated by "PR Handler" if this workflow was
       # triggered by a workflow_run event.
       - name: Download artifact
@@ -60,13 +108,13 @@ jobs:
       # Unzip the artifacts.
       - name: Unzip artifact
         if: ${{ github.event_name == 'workflow_run' }}
-        run: unzip pr.zip
+        run: unzip -n pr.zip
 
       # Save the PR number to send messages to the user that opened it.
-      - name: Save PR number
+      - name: Get PR number
         if: ${{ github.event_name == 'workflow_run' }}
         id: pr_number
-        run: echo '::set-output name=PR_NUMBER::'$(cat NR)
+        run: echo "PR_NUMBER=$(cat NR)" >> $GITHUB_OUTPUT
 
       # Send an information message to the user that opened the pull request.
       - name: Send information message
@@ -91,10 +139,10 @@ jobs:
         if: ${{ github.event_name == 'push' }}
 
       # Setup Python. If you need another version, just change it below.
-      - name: Setup Python 3.7
+      - name: Setup Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.11
 
       - name: Set up Clang
         uses: egor-tensin/setup-clang@v1
@@ -105,14 +153,17 @@ jobs:
       # Install the dependencies to run the Python scripts.
       - name: Install dependencies
         run: |
-          pip install scan-build
+          pip install -r resources/ci_cd/requirements.txt
 
       # This script downloads the mandatory libraries of RTI Connext DDS for
       # compiling the examples
       - name: Install RTI Connext DDS
-        run: python resources/ci_cd/linux_install.py
+        run: python resources/ci_cd/linux_install.py -a ${{ matrix.architecture.name }}
         env:
-          RTI_MIN_PACKAGE_URL: ${{ secrets.RTI_MIN_PACKAGE_URL }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          RTI_AWS_BUCKET: ${{ secrets.RTI_AWS_BUCKET }}
+          RTI_AWS_PATH: ${{ secrets.RTI_AWS_PATH }}
 
       # This script will compile the examples and execute the static analysis.
       - name: Build all the examples

.github/workflows/prhandler.yml

@@ -25,11 +25,30 @@ jobs:
       - name: Save PR number
         run: echo ${{ github.event.number }} > ${{ github.workspace }}/NR
 
+      # Save the PR number for the next workflow to create the current
+      # workflow artifact along with the repository itself.
+      - name: Save target branch
+        run: echo ${{ github.base_ref }} > ${{ github.workspace }}/targetbranch
+
       # Upload the artifacts to GitHub so that they can be used in the next
       # workflow.
-      - name: Upload generated artifact
+      - name: Upload PR changes
         uses: actions/upload-artifact@v3
         with:
           name: pr
-          path: ${{ github.workspace }}
+          path: |
+            ${{ github.workspace }}
+            !${{ github.workspace }}/resources/ci_cd
+            !${{ github.workspace }}/.git
+            !${{ github.workspace }}/targetbranch
+          if-no-files-found: error
+
+      # Upload the artifacts to GitHub so that they can be used in the next
+      # workflow.
+      - name: Upload target branch name
+        uses: actions/upload-artifact@v3
+        with:
+          name: targetbranch
+          path: |
+            ${{ github.workspace }}/targetbranch
           if-no-files-found: error

README.md

@@ -16,9 +16,10 @@ for further information about how to contribute with new examples to this reposi
 The examples contained in the
 [master](https://github.com/rticommunity/rticonnextdds-examples/tree/master)
 branch of this repository have been built and tested against RTI Connext DDS
-7.1.0. If you need examples that have been built and tested against older
+7.2.0. If you need examples that have been built and tested against older
 versions of RTI Connext DDS, please check out the appropriate branch:
 
+- [release/7.1.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.1.0)
 - [release/7.0.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.0.0)
 - [release/6.1.1](https://github.com/rticommunity/rticonnextdds-examples/tree/release/6.1.1)
 - [release/6.1.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/6.1.0)

VERSION

@@ -0,0 +1 @@
+7.2.0

examples/CMakeLists.txt

@@ -34,20 +34,33 @@ option(CONNEXTDDS_BUILD_WEB_INTEGRATION_SERVICE_EXAMPLES
     OFF
 )
 
+option(CONNEXTDDS_BUILD_CONNEXT_SECURE_EXAMPLES
+    "Build Connext Secure examples"
+    OFF
+)
+
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/connext_dds")
 
 if(CONNEXTDDS_BUILD_PERSISTENCE_SERVICE_EXAMPLES)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/persistence_service")
 endif()
+
 if(CONNEXTDDS_BUILD_RECORDING_SERVICE_EXAMPLES)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/recording_service")
 endif()
+
 if(CONNEXTDDS_BUILD_ROUTING_SERVICE_EXAMPLES)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/routing_service")
 endif()
+
 if(CONNEXTDDS_BUILD_WEB_INTEGRATION_SERVICE_EXAMPLES)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/web_integration_service")
 endif()
+
 if(CONNEXTDDS_BUILD_CLOUD_DISCOVERY_SERVICE_EXAMPLES)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/cloud_discovery_service")
 endif()
+
+if(CONNEXTDDS_BUILD_CONNEXT_SECURE_EXAMPLES)
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/connext_secure")
+endif()

examples/connext_dds/CMakeLists.txt

@@ -75,6 +75,7 @@ if(NOT DEFINED CONNEXTDDS_CONNEXT_DDS_EXAMPLES)
         "custom_transport"
         "deadline_contentfilter"
         # "discovery_snapshot"
+        "distributed_logger"
         "dynamic_data_using_publisher_subscriber"
         "flat_data_api"
         "flat_data_latency"

examples/connext_dds/asynchronous_publication/cs/AsyncPublicationExample.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rti.ConnextDds.Extra" Version="7.0.0" />
+    <PackageReference Include="Rti.ConnextDds.Extra" Version="7.2.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
   </ItemGroup>
 

examples/connext_dds/coherent_presentation/c++11/application.hpp

@@ -19,6 +19,22 @@
 
 namespace application {
 
+ // Catch control-C and tell application to shut down
+ bool shutdown_requested = false;
+
+ inline void stop_handler(int)
+ {
+     shutdown_requested = true;
+     std::cout << "preparing to shut down..." << std::endl;
+ }
+
+ inline void setup_signal_handlers()
+ {
+     signal(SIGINT, stop_handler);
+     signal(SIGTERM, stop_handler);
+ }
+
+
 enum class ParseReturn { ok, failure, exit };
 
 struct ApplicationArguments {

examples/connext_dds/custom_flow_controller/cs/FlowControllerExample.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rti.ConnextDds.Extra" Version="7.0.0" />
+    <PackageReference Include="Rti.ConnextDds.Extra" Version="7.2.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
   </ItemGroup>
 

examples/connext_dds/distributed_logger/README.md

@@ -0,0 +1,55 @@
+# Example Code: Distributed Logger
+
+## Concept
+
+RTI Distributed Logger is an API that allows publishing log messages to a DDS Topic.
+This will allow your distributed application to send log messages that can be monitored
+using tools such as RTI Spy or RTI Admin Console.
+
+It is also possible to use the API directly, creating your own logging infrastructure.
+
+## Example Description
+
+Similar examples are available in other programming languages in the
+`rti_workspace/<version>/examples/distributed_logger/<language>/`
+folder created under your home directory when RTI Connext is installed.
+
+This example shows a simple application running Distributed Logger to
+log several messages using different configurations.
+
+The log messages can then be visualized using RTI Tools such as RTI Spy
+or RTI Admin Console.
+For example, you may find RTI Spy in your RTI Connext DDS installation
+and run it from a terminal as follows:
+
+```sh
+cd rti_connext_dds-7.2.0/bin
+./rtiddsspy -printSample
+```
+
+Once the Distributed Logger example is running in a different terminal,
+you should start seeing state information along with the logged messages
+on RTI Spy:
+
+```txt
+RTI Connext DDS Spy built with DDS version: 7.2.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+rtiddsspy is listening for data, press CTRL+C to stop it.
+
+[...]
+
+09:02:38 New data          from 192.168.1.228   : topic="rti/distlog" type="com::rti::dl::LogMessage"
+hostAndAppId:
+   rtps_host_id: 16867916
+   rtps_app_id: 1940525435
+level: 400
+category: ""
+message: "This is a warning message"
+messageId: 1
+
+[...]
+```
+
+To learn more about the *Distributed Logger*, refer to the Connext DDS
+API online documentation. (Eg.
+[Modern C++ Distributed Logger](https://community.rti.com/static/documentation/connext-dds/7.2.0/doc/api/connext_dds/distributed_logger/api_cpp2/index.html)).