From 7e7ae71c8a4f1b78de741dd72cf6518322150bf2 Mon Sep 17 00:00:00 2001
From: Daniel Edwards <daniel.edwards@vector.com>
Date: Thu, 31 Oct 2024 10:40:11 +0100
Subject: [PATCH] config: allow overriding rpc and pub/sub labels (#87)

Co-authored-by: Konrad Breitsprecher <konrad.breitsprecher@vector.com>
---
 .../ITest_Internals_DataPubSub.cpp            |  54 +++++++++
 .../ITest_Internals_DataPubSub.hpp            |  14 +--
 .../IntegrationTests/ITest_Internals_Rpc.cpp  |  59 ++++++++++
 .../IntegrationTests/ITest_Internals_Rpc.hpp  |  18 +--
 .../config/ParticipantConfiguration.cpp       |  70 ++++++++++++
 .../config/ParticipantConfiguration.hpp       |  31 ++++++
 .../ParticipantConfiguration.schema.json      |  37 ++++++
 .../ParticipantConfigurationFromXImpl.cpp     |  23 ++++
 .../config/ParticipantConfiguration_Full.json |  28 +++++
 .../config/ParticipantConfiguration_Full.yaml |  16 +++
 SilKit/source/config/SilKitYamlHelper.hpp     |  12 ++
 SilKit/source/config/YamlConversion.cpp       |  61 ++++++++++
 SilKit/source/config/YamlConversion.hpp       |   4 +
 SilKit/source/config/YamlSchema.cpp           |   4 +
 .../source/core/participant/Participant.hpp   |   4 +
 .../core/participant/Participant_impl.hpp     | 105 ++++++++++++------
 .../services/logging/SilKitFmtFormatters.hpp  |   7 ++
 docs/CHANGELOG.rst                            |   5 +
 docs/configuration/services-configuration.rst |  37 ++++++
 19 files changed, 537 insertions(+), 52 deletions(-)

diff --git a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp
index e743ccb0c..5f5287031 100644
--- a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp
+++ b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp
@@ -501,6 +501,60 @@ TEST_F(ITest_Internals_DataPubSub, test_1pub_1sub_sync_mixed_labels)
     RunSyncTest(pubsubs);
 }
 
+// Matching mandatory labels provided by a participant configuration
+TEST_F(ITest_Internals_DataPubSub, test_1pub_1sub_sync_label_override)
+{
+    const uint32_t numMsgToPublish = defaultNumMsgToPublish;
+    const uint32_t numMsgToReceive = numMsgToPublish;
+
+    auto pub1Config = SilKit::Config::ParticipantConfigurationFromStringImpl(R"(
+DataPublishers:
+  - Name: PubCtrl1
+    Labels:
+      - Key: OverrideKeyA
+        Value: OverrideValueA
+        Kind: Optional
+      - Key: OverrideKeyB
+        Value: OverrideValueB
+        Kind: Mandatory
+)");
+
+    auto sub1Config = SilKit::Config::ParticipantConfigurationFromStringImpl(R"(
+DataSubscribers:
+  - Name: SubCtrl1
+    Labels:
+      - Key: OverrideKeyA
+        Value: OverrideValueA
+        Kind: Mandatory
+      - Key: OverrideKeyB
+        Value: OverrideValueB
+        Kind: Optional
+)");
+
+    std::vector<PubSubParticipant> pubsubs;
+    pubsubs.push_back({"Pub1",
+                       {{"PubCtrl1",
+                         "TopicA",
+                         {"A"},
+                         {{"kA", "vA", MatchingLabel::Kind::Mandatory}, {"kB", "vB", MatchingLabel::Kind::Mandatory}},
+                         0,
+                         defaultMsgSize,
+                         numMsgToPublish}},
+                       {},
+                       pub1Config});
+    pubsubs.push_back({"Sub1",
+                       {},
+                       {{"SubCtrl1",
+                         "TopicA",
+                         {"A"},
+                         {{"kA", "NOT vA", MatchingLabel::Kind::Mandatory}},
+                         defaultMsgSize,
+                         numMsgToReceive,
+                         1}},
+                       sub1Config});
+
+    RunSyncTest(pubsubs);
+}
 
 // Wrong mandatory label value -> Expect no reception
 TEST_F(ITest_Internals_DataPubSub, test_1pub_1sub_sync_wrong_mandatory_label_value)
diff --git a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp
index ca2690684..91c8d97c7 100644
--- a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp
+++ b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp
@@ -184,27 +184,27 @@ class ITest_Internals_DataPubSub : public testing::Test
     struct PubSubParticipant
     {
         PubSubParticipant(const std::string& newName)
+            : PubSubParticipant(newName, {}, {})
         {
-            name = newName;
         }
         PubSubParticipant(const std::string& newName, const std::vector<DataPublisherInfo>& newDataPublishers,
                           const std::vector<DataSubscriberInfo>& newDataSubscribers,
                           std::shared_ptr<SilKit::Config::IParticipantConfiguration> newConfig =
                               SilKit::Config::MakeEmptyParticipantConfigurationImpl())
+            : config{std::move(newConfig)}
+            , name{newName}
+            , dataSubscribers{newDataSubscribers}
+            , dataPublishers{newDataPublishers}
         {
-            config = newConfig;
-            name = newName;
-            dataSubscribers = newDataSubscribers;
-            dataPublishers = newDataPublishers;
         }
 
-        std::shared_ptr<SilKit::Config::IParticipantConfiguration> config = MakeEmptyParticipantConfigurationImpl();
+        std::shared_ptr<SilKit::Config::IParticipantConfiguration> config;
         bool delayedDefaultDataHandler = false;
         std::string name;
         std::vector<DataSubscriberInfo> dataSubscribers;
         std::vector<DataPublisherInfo> dataPublishers;
         std::unique_ptr<SilKit::IParticipant> participant;
-        SilKit::Core::IParticipantInternal* participantImpl;
+        SilKit::Core::IParticipantInternal* participantImpl = nullptr;
 
         // Common
         std::promise<void> participantCreatedPromise;
diff --git a/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp b/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp
index ea567fb11..1d1825fc8 100644
--- a/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp
+++ b/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp
@@ -24,6 +24,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "ITest_Internals_Rpc.hpp"
 
+#include "ParticipantConfigurationFromXImpl.hpp"
+
 namespace {
 
 //--------------------------------------
@@ -295,6 +297,63 @@ TEST_F(ITest_Internals_Rpc, test_1client_1server_sync_labels)
     RunSyncTest(rpcs);
 }
 
+// Matching mandatory and optional labels on both sides provided by a participant configuration
+TEST_F(ITest_Internals_Rpc, test_1client_1server_sync_label_override)
+{
+    const uint32_t numCallsToReceive = defaultNumCalls;
+    const uint32_t numCallsToReturn = defaultNumCalls;
+
+    auto client1Config = SilKit::Config::ParticipantConfigurationFromStringImpl(R"(
+RpcClients:
+  - Name: ClientCtrl1
+    Labels:
+      - Key: OverrideKeyA
+        Value: OverrideValueA
+        Kind: Mandatory
+      - Key: OverrideKeyB
+        Value: OverrideValueB
+        Kind: Optional
+)");
+
+    auto server1Config = SilKit::Config::ParticipantConfigurationFromStringImpl(R"(
+RpcServers:
+  - Name: ServerCtrl1
+    Labels:
+      - Key: OverrideKeyA
+        Value: OverrideValueA
+        Kind: Optional
+      - Key: OverrideKeyB
+        Value: OverrideValueB
+        Kind: Mandatory
+)");
+
+    std::vector<RpcParticipant> rpcs;
+    rpcs.push_back({"Client1",
+                    {},
+                    {{"ClientCtrl1",
+                      "TestFuncA",
+                      "A",
+                      {{"KeyA", "ValA", SilKit::Services::MatchingLabel::Kind::Mandatory},
+                       {"KeyB", "ValB", SilKit::Services::MatchingLabel::Kind::Mandatory}},
+                      defaultMsgSize,
+                      defaultNumCalls,
+                      numCallsToReturn}},
+                    {"TestFuncA"},
+                    client1Config});
+    rpcs.push_back({"Server1",
+                    {{"ServerCtrl1",
+                      "TestFuncA",
+                      "A",
+                      {{"KeyA", "ValA2", SilKit::Services::MatchingLabel::Kind::Optional}},
+                      defaultMsgSize,
+                      numCallsToReceive}},
+                    {},
+                    {},
+                    server1Config});
+
+    RunSyncTest(rpcs);
+}
+
 // No communication with server2 (missing mandatory label on client)
 TEST_F(ITest_Internals_Rpc, test_1client_2server_sync_wrong_mandatory_label)
 {
diff --git a/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp b/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp
index 2a00550d4..4919499ab 100644
--- a/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp
+++ b/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp
@@ -260,22 +260,24 @@ class ITest_Internals_Rpc : public testing::Test
     struct RpcParticipant
     {
         RpcParticipant(const std::string& newName, const std::vector<std::string>& newExpectedFunctionNames)
+            : RpcParticipant(newName, {}, {}, newExpectedFunctionNames)
         {
-            name = newName;
-            expectedFunctionNames = newExpectedFunctionNames;
         }
 
         RpcParticipant(const std::string& newName, std::vector<RpcServerInfo> newRpcServers,
-                       std::vector<RpcClientInfo> newRpcClients, std::vector<std::string> newExpectedFunctionNames)
-            : expectedFunctionNames{std::move(newExpectedFunctionNames)}
+                       std::vector<RpcClientInfo> newRpcClients, std::vector<std::string> newExpectedFunctionNames,
+                       std::shared_ptr<SilKit::Config::IParticipantConfiguration> newConfig =
+                           SilKit::Config::MakeEmptyParticipantConfigurationImpl())
+            : config{std::move(newConfig)}
+            , name{newName}
+            , expectedFunctionNames{std::move(newExpectedFunctionNames)}
         {
-            name = newName;
-
             std::for_each(newRpcServers.begin(), newRpcServers.end(), [this](const auto& info) { AddRpcServer(info); });
 
             std::for_each(newRpcClients.begin(), newRpcClients.end(), [this](const auto& info) { AddRpcClient(info); });
         }
 
+        std::shared_ptr<SilKit::Config::IParticipantConfiguration> config;
         std::string name;
         std::vector<std::unique_ptr<RpcClientState>> rpcClients;
         std::vector<std::unique_ptr<RpcServerState>> rpcServers;
@@ -395,9 +397,7 @@ class ITest_Internals_Rpc : public testing::Test
     {
         try
         {
-            participant.participant = SilKit::CreateParticipantImpl(
-                SilKit::Config::MakeParticipantConfigurationWithLoggingImpl(SilKit::Services::Logging::Level::Warn),
-                participant.name, registryUri);
+            participant.participant = SilKit::CreateParticipantImpl(participant.config, participant.name, registryUri);
             participant.participantImpl =
                 dynamic_cast<SilKit::Core::IParticipantInternal*>(participant.participant.get());
 
diff --git a/SilKit/source/config/ParticipantConfiguration.cpp b/SilKit/source/config/ParticipantConfiguration.cpp
index 147e4390f..103c6e6e7 100755
--- a/SilKit/source/config/ParticipantConfiguration.cpp
+++ b/SilKit/source/config/ParticipantConfiguration.cpp
@@ -20,3 +20,73 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "ParticipantConfiguration.hpp"
+
+#include <string>
+#include <type_traits>
+
+namespace SilKit {
+namespace Config {
+namespace v1 {
+
+auto Label::ToPublicApi() const -> SilKit::Services::MatchingLabel
+{
+    SilKit::Services::MatchingLabel result;
+
+    result.key = key;
+    result.value = value;
+
+    switch (kind)
+    {
+    case Kind::Mandatory:
+        result.kind = SilKit::Services::MatchingLabel::Kind::Mandatory;
+        break;
+    case Kind::Optional:
+        result.kind = SilKit::Services::MatchingLabel::Kind::Optional;
+        break;
+    default:
+        throw SilKit::ConfigurationError{
+            "Invalid SilKit::Config::v1::MatchingLabel::Kind("
+            + std::to_string(static_cast<std::underlying_type_t<Label::Kind>>(kind)) + ")"};
+    }
+
+    return result;
+}
+
+
+auto Label::FromPublicApi(const SilKit::Services::MatchingLabel& label) -> Label
+{
+    Label result;
+
+    result.key = label.key;
+    result.value = label.value;
+
+    switch (label.kind)
+    {
+    case SilKit::Services::MatchingLabel::Kind::Mandatory:
+        result.kind = Label::Kind::Mandatory;
+        break;
+    case SilKit::Services::MatchingLabel::Kind::Optional:
+        result.kind = Label::Kind::Optional;
+        break;
+    default:
+        throw SilKit::ConfigurationError{
+            "Invalid SilKit::Services::MatchingLabel::Kind("
+            + std::to_string(static_cast<std::underlying_type_t<SilKit::Services::MatchingLabel::Kind>>(label.kind))
+            + ")"};
+    }
+
+    return result;
+}
+
+
+auto Label::VectorFromPublicApi(const std::vector<SilKit::Services::MatchingLabel>& labels) -> std::vector<Label>
+{
+    std::vector<SilKit::Config::v1::Label> result;
+    std::transform(labels.begin(), labels.end(), std::back_inserter(result), Label::FromPublicApi);
+    return result;
+}
+
+
+} // namespace v1
+} // namespace Config
+} // namespace SilKit
\ No newline at end of file
diff --git a/SilKit/source/config/ParticipantConfiguration.hpp b/SilKit/source/config/ParticipantConfiguration.hpp
index 2f4f09cd8..01010d279 100644
--- a/SilKit/source/config/ParticipantConfiguration.hpp
+++ b/SilKit/source/config/ParticipantConfiguration.hpp
@@ -24,6 +24,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include <array>
 #include <chrono>
 #include <iostream>
+#include <ostream>
 #include <string>
 #include <vector>
 
@@ -32,6 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "silkit/services/logging/LoggingDatatypes.hpp"
 #include "silkit/services/pubsub/PubSubDatatypes.hpp"
 #include "silkit/services/rpc/RpcDatatypes.hpp"
+#include "silkit/services/datatypes.hpp"
 
 #include "Configuration.hpp"
 #include "Optional.hpp"
@@ -136,6 +138,27 @@ struct FlexrayController
     Replay replay;
 };
 
+// ================================================================================
+//  Labels for Data Publisher/Subscriber and Rpc Servcer/Client service
+// ================================================================================
+
+struct Label
+{
+    enum struct Kind
+    {
+        Optional,
+        Mandatory,
+    };
+
+    std::string key;
+    std::string value;
+    Kind kind;
+
+    auto ToPublicApi() const -> SilKit::Services::MatchingLabel;
+    static auto FromPublicApi(const SilKit::Services::MatchingLabel& label) -> Label;
+    static auto VectorFromPublicApi(const std::vector<SilKit::Services::MatchingLabel>& labels) -> std::vector<Label>;
+};
+
 // ================================================================================
 //  Data Publisher/Subscriber service
 // ================================================================================
@@ -150,6 +173,7 @@ struct DataPublisher
 
     std::string name;
     SilKit::Util::Optional<std::string> topic;
+    SilKit::Util::Optional<std::vector<Label>> labels;
 
     //! \brief History length of a DataPublisher.
     SilKit::Util::Optional<size_t> history{0};
@@ -168,6 +192,7 @@ struct DataSubscriber
 
     std::string name;
     SilKit::Util::Optional<std::string> topic;
+    SilKit::Util::Optional<std::vector<Label>> labels;
 
     std::vector<std::string> useTraceSinks;
     Replay replay;
@@ -187,6 +212,7 @@ struct RpcServer
 
     std::string name;
     SilKit::Util::Optional<std::string> functionName;
+    SilKit::Util::Optional<std::vector<Label>> labels;
 
     std::vector<std::string> useTraceSinks;
     Replay replay;
@@ -202,6 +228,7 @@ struct RpcClient
 
     std::string name;
     SilKit::Util::Optional<std::string> functionName;
+    SilKit::Util::Optional<std::vector<Label>> labels;
 
     std::vector<std::string> useTraceSinks;
     Replay replay;
@@ -368,6 +395,10 @@ bool operator==(const Middleware& lhs, const Middleware& rhs);
 bool operator==(const ParticipantConfiguration& lhs, const ParticipantConfiguration& rhs);
 bool operator==(const TimeSynchronization& lhs, const TimeSynchronization& rhs);
 bool operator==(const Experimental& lhs, const Experimental& rhs);
+bool operator==(const Label& lhs, const Label& rhs);
+
+auto operator<<(std::ostream& out, const Label::Kind& kind) -> std::ostream&;
+auto operator<<(std::ostream& out, const Label& label) -> std::ostream&;
 
 bool operator<(const MetricsSink& lhs, const MetricsSink& rhs);
 bool operator>(const MetricsSink& lhs, const MetricsSink& rhs);
diff --git a/SilKit/source/config/ParticipantConfiguration.schema.json b/SilKit/source/config/ParticipantConfiguration.schema.json
index 04706fab4..e5c997b6d 100644
--- a/SilKit/source/config/ParticipantConfiguration.schema.json
+++ b/SilKit/source/config/ParticipantConfiguration.schema.json
@@ -414,6 +414,31 @@
       "type": "string",
       "description": "Name of the RPC function called by RpcClients on RpcServers"
     },
+    "MatchingLabel": {
+      "type": "object",
+      "properties": {
+        "Key": {
+          "type": "string",
+          "description": "Label key"
+        },
+        "Value": {
+          "type": "string",
+          "description": "Label value"
+        },
+        "Kind": {
+          "type": "string",
+          "description": "Label kind",
+          "enum": ["Mandatory", "Optional"]
+        }
+      }
+    },
+    "Labels": {
+      "type": "array",
+      "description": "Override the matching labels assigned to the controller",
+      "items": {
+        "$ref": "#/definitions/MatchingLabel"
+      }
+    },
     "Logging": {
       "type": "object",
       "description": "Configures the properties of the SIL Kit Logging Service",
@@ -573,6 +598,9 @@
           },
           "Topic": {
             "$ref": "#/definitions/Topic"
+          },
+          "Labels": {
+            "$ref": "#/definitions/Labels"
           }
         },
         "additionalProperties": false,
@@ -590,6 +618,9 @@
           },
           "Topic": {
             "$ref": "#/definitions/Topic"
+          },
+          "Labels": {
+            "$ref": "#/definitions/Labels"
           }
         },
         "additionalProperties": false,
@@ -607,6 +638,9 @@
           },
           "FunctionName": {
             "$ref": "#/definitions/RpcFunctionName"
+          },
+          "Labels": {
+            "$ref": "#/definitions/Labels"
           }
         },
         "additionalProperties": false,
@@ -624,6 +658,9 @@
           },
           "FunctionName": {
             "$ref": "#/definitions/RpcFunctionName"
+          },
+          "Labels": {
+            "$ref": "#/definitions/Labels"
           }
         },
         "additionalProperties": false,
diff --git a/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp b/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp
index 3039388d2..8fbe5e40f 100644
--- a/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp
+++ b/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp
@@ -813,6 +813,29 @@ bool operator>(const MetricsSink& lhs, const MetricsSink& rhs)
     return !(lhs < rhs);
 }
 
+bool operator==(const Label& lhs, const Label& rhs)
+{
+    return lhs.key == rhs.key && lhs.value == rhs.value && lhs.kind == rhs.kind;
+}
+
+auto operator<<(std::ostream& out, const Label::Kind& kind) -> std::ostream&
+{
+    switch (kind)
+    {
+    case Label::Kind::Mandatory:
+        return out << "Mandatory";
+    case Label::Kind::Optional:
+        return out << "Optional";
+    default:
+        return out << "MatchingLabel::Kind(" << static_cast<std::underlying_type_t<Label::Kind>>(kind) << ")";
+    }
+}
+
+auto operator<<(std::ostream& out, const Label& label) -> std::ostream&
+{
+    return out << "MatchingLabel{" << label.key << ", " << label.value << ", " << label.kind << "}";
+}
+
 } // namespace v1
 
 
diff --git a/SilKit/source/config/ParticipantConfiguration_Full.json b/SilKit/source/config/ParticipantConfiguration_Full.json
index e58ed724e..7dcfdbf32 100644
--- a/SilKit/source/config/ParticipantConfiguration_Full.json
+++ b/SilKit/source/config/ParticipantConfiguration_Full.json
@@ -150,6 +150,13 @@
     {
       "Name": "Publisher1",
       "Topic": "Temperature",
+      "Labels": [
+        {
+          "Key": "A",
+          "Value": "B",
+          "Kind": "Optional"
+        }
+      ],
       "UseTraceSinks": [
         "Sink1"
       ]
@@ -159,6 +166,13 @@
     {
       "Name": "Subscriber1",
       "Topic": "Temperature",
+      "Labels": [
+        {
+          "Key": "C",
+          "Value": "D",
+          "Kind": "Mandatory"
+        }
+      ],
       "UseTraceSinks": [
         "Sink1"
       ]
@@ -168,6 +182,13 @@
     {
       "Name": "Server1",
       "FunctionName": "Function1",
+      "Labels": [
+        {
+          "Key": "E",
+          "Value": "F",
+          "Kind": "Optional"
+        }
+      ],
       "UseTraceSinks": [
         "Sink1"
       ]
@@ -177,6 +198,13 @@
     {
       "Name": "Client1",
       "FunctionName": "Function1",
+      "Labels": [
+        {
+          "Key": "G",
+          "Value": "H",
+          "Kind": "Mandatory"
+        }
+      ],
       "UseTraceSinks": [
         "Sink1"
       ]
diff --git a/SilKit/source/config/ParticipantConfiguration_Full.yaml b/SilKit/source/config/ParticipantConfiguration_Full.yaml
index e6abe1906..5a5f9f031 100644
--- a/SilKit/source/config/ParticipantConfiguration_Full.yaml
+++ b/SilKit/source/config/ParticipantConfiguration_Full.yaml
@@ -117,21 +117,37 @@ FlexrayControllers:
 DataPublishers:
 - Name: Publisher1
   Topic: Temperature
+  Labels:
+    - Key: A
+      Value: B
+      Kind: Optional
   UseTraceSinks:
   - Sink1
 DataSubscribers:
 - Name: Subscriber1
   Topic: Temperature
+  Labels:
+    - Key: C
+      Value: D
+      Kind: Mandatory
   UseTraceSinks:
   - Sink1
 RpcServers:
 - Name: Server1
   FunctionName: Function1
+  Labels:
+    - Key: E
+      Value: F
+      Kind: Optional
   UseTraceSinks:
   - Sink1
 RpcClients:
 - Name: Client1
   FunctionName: Function1
+  Labels:
+    - Key: G
+      Value: H
+      Kind: Mandatory
   UseTraceSinks:
   - Sink1
 Logging:
diff --git a/SilKit/source/config/SilKitYamlHelper.hpp b/SilKit/source/config/SilKitYamlHelper.hpp
index fddd094f4..97a03aa9d 100644
--- a/SilKit/source/config/SilKitYamlHelper.hpp
+++ b/SilKit/source/config/SilKitYamlHelper.hpp
@@ -158,6 +158,18 @@ void optional_encode(const SilKit::Util::Optional<ConfigT>& value, YAML::Node& n
     }
 }
 
+template <typename ConfigT,
+          typename std::enable_if<!(std::is_fundamental<ConfigT>::value || std::is_same<ConfigT, std::string>::value),
+                                  bool>::type = true>
+void optional_encode(const SilKit::Util::Optional<std::vector<ConfigT>>& value, YAML::Node& node,
+                     const std::string& fieldName)
+{
+    if (value.has_value())
+    {
+        node[fieldName] = value.value();
+    }
+}
+
 template <typename ConfigT>
 void optional_encode(const std::vector<ConfigT>& value, YAML::Node& node, const std::string& fieldName)
 {
diff --git a/SilKit/source/config/YamlConversion.cpp b/SilKit/source/config/YamlConversion.cpp
index 64dc0193e..7ff1503e4 100644
--- a/SilKit/source/config/YamlConversion.cpp
+++ b/SilKit/source/config/YamlConversion.cpp
@@ -711,6 +711,57 @@ bool Converter::decode(const Node& node, FlexrayController& obj)
     return true;
 }
 
+template <>
+Node Converter::encode(const Label::Kind& obj)
+{
+    Node node;
+    node = static_cast<std::underlying_type_t<Label::Kind>>(obj);
+    switch (obj)
+    {
+    case Label::Kind::Mandatory:
+        node = "Mandatory";
+        break;
+    case Label::Kind::Optional:
+        node = "Optional";
+        break;
+    default:
+        throw ConfigurationError{"Unknown MatchingLabel::Kind"};
+    }
+    return node;
+}
+template <>
+bool Converter::decode(const Node& node, Label::Kind& obj)
+{
+    auto&& str = parse_as<std::string>(node);
+    if (str == "Mandatory")
+        obj = Label::Kind::Mandatory;
+    else if (str == "Optional")
+        obj = Label::Kind::Optional;
+    else
+    {
+        throw ConversionError(node, "Unknown MatchingLabel::Kind: " + str + ".");
+    }
+    return true;
+}
+
+template <>
+Node Converter::encode(const Label& obj)
+{
+    Node node;
+    node["Key"] = obj.key;
+    node["Value"] = obj.value;
+    node["Kind"] = encode(obj.kind);
+    return node;
+}
+template <>
+bool Converter::decode(const Node& node, Label& obj)
+{
+    optional_decode(obj.key, node, "Key");
+    optional_decode(obj.value, node, "Value");
+    optional_decode(obj.kind, node, "Kind");
+    return true;
+}
+
 template <>
 Node Converter::encode(const DataPublisher& obj)
 {
@@ -718,6 +769,7 @@ Node Converter::encode(const DataPublisher& obj)
     Node node;
     node["Name"] = obj.name;
     optional_encode(obj.topic, node, "Topic");
+    optional_encode(obj.labels, node, "Labels");
     //optional_encode(obj.history, node, "History");
     optional_encode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_encode(obj.replay, node, "Replay");
@@ -728,6 +780,7 @@ bool Converter::decode(const Node& node, DataPublisher& obj)
 {
     obj.name = parse_as<std::string>(node["Name"]);
     optional_decode(obj.topic, node, "Topic");
+    optional_decode(obj.labels, node, "Labels");
     //optional_decode(obj.history, node, "Replay");
     optional_decode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_decode(obj.replay, node, "Replay");
@@ -741,6 +794,7 @@ Node Converter::encode(const DataSubscriber& obj)
     Node node;
     node["Name"] = obj.name;
     optional_encode(obj.topic, node, "Topic");
+    optional_encode(obj.labels, node, "Labels");
     optional_encode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_encode(obj.replay, node, "Replay");
     return node;
@@ -750,6 +804,7 @@ bool Converter::decode(const Node& node, DataSubscriber& obj)
 {
     obj.name = parse_as<std::string>(node["Name"]);
     optional_decode(obj.topic, node, "Topic");
+    optional_decode(obj.labels, node, "Labels");
     optional_decode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_decode(obj.replay, node, "Replay");
     return true;
@@ -762,6 +817,7 @@ Node Converter::encode(const RpcServer& obj)
     Node node;
     node["Name"] = obj.name;
     optional_encode(obj.functionName, node, "FunctionName");
+    optional_encode(obj.labels, node, "Labels");
     optional_encode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_encode(obj.replay, node, "Replay");
     return node;
@@ -771,6 +827,7 @@ bool Converter::decode(const Node& node, RpcServer& obj)
 {
     obj.name = parse_as<std::string>(node["Name"]);
     optional_decode_deprecated_alternative(obj.functionName, node, "FunctionName", {"Channel", "RpcChannel"});
+    optional_decode(obj.labels, node, "Labels");
     optional_decode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_decode(obj.replay, node, "Replay");
     return true;
@@ -783,6 +840,7 @@ Node Converter::encode(const RpcClient& obj)
     Node node;
     node["Name"] = obj.name;
     optional_encode(obj.functionName, node, "Channel");
+    optional_encode(obj.labels, node, "Labels");
     optional_encode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_encode(obj.replay, node, "Replay");
     return node;
@@ -792,6 +850,7 @@ bool Converter::decode(const Node& node, RpcClient& obj)
 {
     obj.name = parse_as<std::string>(node["Name"]);
     optional_decode_deprecated_alternative(obj.functionName, node, "FunctionName", {"Channel", "RpcChannel"});
+    optional_decode(obj.labels, node, "Labels");
     optional_decode(obj.useTraceSinks, node, "UseTraceSinks");
     optional_decode(obj.replay, node, "Replay");
     return true;
@@ -1236,6 +1295,8 @@ bool Converter::decode(const Node& node, ParticipantConfiguration& obj)
     return true;
 }
 
+// Conversions for ServiceDiscovery Supplemental Data
+
 template <>
 Node Converter::encode(const SilKit::Services::MatchingLabel::Kind& obj)
 {
diff --git a/SilKit/source/config/YamlConversion.hpp b/SilKit/source/config/YamlConversion.hpp
index cba36bcae..f13ca87d9 100644
--- a/SilKit/source/config/YamlConversion.hpp
+++ b/SilKit/source/config/YamlConversion.hpp
@@ -62,8 +62,12 @@ DEFINE_SILKIT_CONVERT(SilKit::Services::Flexray::FlexrayClockPeriod);
 DEFINE_SILKIT_CONVERT(SilKit::Services::Flexray::FlexrayTransmissionMode);
 DEFINE_SILKIT_CONVERT(FlexrayController);
 
+// Conversions for ServiceDiscovery Supplemental Data
 DEFINE_SILKIT_CONVERT(SilKit::Services::MatchingLabel::Kind);
 DEFINE_SILKIT_CONVERT(SilKit::Services::MatchingLabel);
+
+DEFINE_SILKIT_CONVERT(Label::Kind);
+DEFINE_SILKIT_CONVERT(Label);
 DEFINE_SILKIT_CONVERT(DataPublisher);
 DEFINE_SILKIT_CONVERT(DataSubscriber);
 DEFINE_SILKIT_CONVERT(RpcServer);
diff --git a/SilKit/source/config/YamlSchema.cpp b/SilKit/source/config/YamlSchema.cpp
index f1897bc93..33b34b2f6 100644
--- a/SilKit/source/config/YamlSchema.cpp
+++ b/SilKit/source/config/YamlSchema.cpp
@@ -157,6 +157,7 @@ auto MakeYamlSchema() -> YamlSchemaElem
          {
              {"Name"},
              {"Topic"},
+             {"Labels"},
              {"UseTraceSinks"},
              replay,
          }},
@@ -164,6 +165,7 @@ auto MakeYamlSchema() -> YamlSchemaElem
          {
              {"Name"},
              {"Topic"},
+             {"Labels"},
              {"UseTraceSinks"},
              replay,
          }},
@@ -171,6 +173,7 @@ auto MakeYamlSchema() -> YamlSchemaElem
          {
              {"Name"},
              {"FunctionName"},
+             {"Labels"},
              {"UseTraceSinks"},
              replay,
          }},
@@ -178,6 +181,7 @@ auto MakeYamlSchema() -> YamlSchemaElem
          {
              {"Name"},
              {"FunctionName"},
+             {"Labels"},
              {"UseTraceSinks"},
              replay,
          }},
diff --git a/SilKit/source/core/participant/Participant.hpp b/SilKit/source/core/participant/Participant.hpp
index 3e0cc1755..47955a87e 100644
--- a/SilKit/source/core/participant/Participant.hpp
+++ b/SilKit/source/core/participant/Participant.hpp
@@ -406,6 +406,10 @@ class Participant : public IParticipantInternal
     void LogMismatchBetweenConfigAndPassedValue(const std::string& controllerName, const ValueT& passedValue,
                                                 const ValueT& configuredValue);
 
+    template <typename ValueT>
+    void LogMismatchBetweenConfigAndPassedValue(const std::string& controllerName, const std::vector<ValueT>& passedValue,
+                                                const std::vector<ValueT>& configuredValue);
+
     void OnSilKitSimulationJoined();
 
     void SetupRemoteLogging();
diff --git a/SilKit/source/core/participant/Participant_impl.hpp b/SilKit/source/core/participant/Participant_impl.hpp
index 066624837..b4062808b 100644
--- a/SilKit/source/core/participant/Participant_impl.hpp
+++ b/SilKit/source/core/participant/Participant_impl.hpp
@@ -529,13 +529,17 @@ auto Participant<SilKitConnectionT>::CreateDataPublisher(const std::string& cano
     SilKit::Config::DataPublisher controllerConfig =
         GetConfigByControllerName(_participantConfig.dataPublishers, canonicalName);
     UpdateOptionalConfigValue(canonicalName, controllerConfig.topic, dataSpec.Topic());
+    UpdateOptionalConfigValue(canonicalName, controllerConfig.labels,
+                              SilKit::Config::v1::Label::VectorFromPublicApi(dataSpec.Labels()));
+
+    auto sortedConfigLabels = controllerConfig.labels.value();
+    std::sort(sortedConfigLabels.begin(), sortedConfigLabels.end(),
+              [](const auto& v1, const auto& v2) { return v1.key < v2.key; });
+
     SilKit::Services::PubSub::PubSubSpec configuredDataNodeSpec{controllerConfig.topic.value(), dataSpec.MediaType()};
-    auto labels = dataSpec.Labels();
-    std::sort(labels.begin(), labels.end(),
-              [](const MatchingLabel& v1, const MatchingLabel& v2) { return v1.key < v2.key; });
-    for (auto label : labels)
+    for (const auto& label : sortedConfigLabels)
     {
-        configuredDataNodeSpec.AddLabel(label);
+        configuredDataNodeSpec.AddLabel(label.ToPublicApi());
     }
 
     SilKit::Core::SupplementalData supplementalData;
@@ -543,8 +547,8 @@ auto Participant<SilKitConnectionT>::CreateDataPublisher(const std::string& cano
     supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherTopic] = configuredDataNodeSpec.Topic();
     supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherPubUUID] = network;
     supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherMediaType] = configuredDataNodeSpec.MediaType();
-    auto labelStr = SilKit::Config::Serialize<std::decay_t<decltype(labels)>>(labels);
-    supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherPubLabels] = labelStr;
+    supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherPubLabels] =
+        SilKit::Config::Serialize(configuredDataNodeSpec.Labels());
 
     auto controller = CreateController<Services::PubSub::DataPublisher>(
         controllerConfig, network, std::move(supplementalData), true, true, &_timeProvider, configuredDataNodeSpec,
@@ -559,7 +563,7 @@ auto Participant<SilKitConnectionT>::CreateDataPublisher(const std::string& cano
             "Created DataPublisher '{}' with topic '{}' and media type '{}' for network '{}' with service name "
             "'{}' and labels: {}",
             controllerConfig.name, controllerConfig.topic.value(), dataSpec.MediaType(), network,
-            controller->GetServiceDescriptor().to_string(), FormatLabelsForLogging(dataSpec.Labels()));
+            controller->GetServiceDescriptor().to_string(), FormatLabelsForLogging(configuredDataNodeSpec.Labels()));
     }
 
     auto* traceSource = dynamic_cast<ITraceMessageSource*>(controller);
@@ -591,22 +595,25 @@ auto Participant<SilKitConnectionT>::CreateDataSubscriber(
     SilKit::Config::DataSubscriber controllerConfig =
         GetConfigByControllerName(_participantConfig.dataSubscribers, canonicalName);
     UpdateOptionalConfigValue(canonicalName, controllerConfig.topic, dataSpec.Topic());
+    UpdateOptionalConfigValue(canonicalName, controllerConfig.labels,
+                              SilKit::Config::v1::Label::VectorFromPublicApi(dataSpec.Labels()));
+
+    auto sortedConfigLabels = controllerConfig.labels.value();
+    std::sort(sortedConfigLabels.begin(), sortedConfigLabels.end(),
+              [](const auto& v1, const auto& v2) { return v1.key < v2.key; });
 
     SilKit::Services::PubSub::PubSubSpec configuredDataNodeSpec{controllerConfig.topic.value(), dataSpec.MediaType()};
-    auto labels = dataSpec.Labels();
-    std::sort(labels.begin(), labels.end(),
-              [](const MatchingLabel& v1, const MatchingLabel& v2) { return v1.key < v2.key; });
-    for (auto label : labels)
+    for (const auto& label : sortedConfigLabels)
     {
-        configuredDataNodeSpec.AddLabel(label);
+        configuredDataNodeSpec.AddLabel(label.ToPublicApi());
     }
 
     Core::SupplementalData supplementalData;
     supplementalData[SilKit::Core::Discovery::controllerType] = SilKit::Core::Discovery::controllerTypeDataSubscriber;
     supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberTopic] = configuredDataNodeSpec.Topic();
     supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberMediaType] = configuredDataNodeSpec.MediaType();
-    auto labelStr = SilKit::Config::Serialize<std::decay_t<decltype(labels)>>(labels);
-    supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberSubLabels] = labelStr;
+    supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberSubLabels] =
+        SilKit::Config::Serialize(configuredDataNodeSpec.Labels());
 
     auto controller = CreateController<Services::PubSub::DataSubscriber>(
         controllerConfig, network, std::move(supplementalData), true, true, controllerConfig, &_timeProvider,
@@ -621,7 +628,7 @@ auto Participant<SilKitConnectionT>::CreateDataSubscriber(
             "Created DataSubscriber '{}' with topic '{}' and media type '{}' for network '{}' with service name "
             "'{}' and labels: {}",
             controllerConfig.name, controllerConfig.topic.value(), dataSpec.MediaType(), network,
-            controller->GetServiceDescriptor().to_string(), FormatLabelsForLogging(dataSpec.Labels()));
+            controller->GetServiceDescriptor().to_string(), FormatLabelsForLogging(configuredDataNodeSpec.Labels()));
     }
 
     auto* traceSource = dynamic_cast<ITraceMessageSource*>(controller);
@@ -674,26 +681,31 @@ auto Participant<SilKitConnectionT>::CreateRpcClient(
     SilKit::Config::RpcClient controllerConfig =
         GetConfigByControllerName(_participantConfig.rpcClients, canonicalName);
     UpdateOptionalConfigValue(canonicalName, controllerConfig.functionName, dataSpec.FunctionName());
+    UpdateOptionalConfigValue(canonicalName, controllerConfig.labels,
+                              SilKit::Config::v1::Label::VectorFromPublicApi(dataSpec.Labels()));
+
+    auto sortedConfigLabels = controllerConfig.labels.value();
+    std::sort(sortedConfigLabels.begin(), sortedConfigLabels.end(),
+              [](const auto& v1, const auto& v2) { return v1.key < v2.key; });
+
+    SilKit::Services::Rpc::RpcSpec configuredRpcSpec{controllerConfig.functionName.value(), dataSpec.MediaType()};
+    for (const auto& label : sortedConfigLabels)
+    {
+        configuredRpcSpec.AddLabel(label.ToPublicApi());
+    }
 
     // RpcClient gets discovered by RpcServer which creates RpcServerInternal on a matching connection
     Core::SupplementalData supplementalData;
     supplementalData[SilKit::Core::Discovery::controllerType] = SilKit::Core::Discovery::controllerTypeRpcClient;
     supplementalData[SilKit::Core::Discovery::supplKeyRpcClientFunctionName] = controllerConfig.functionName.value();
     supplementalData[SilKit::Core::Discovery::supplKeyRpcClientMediaType] = dataSpec.MediaType();
-    const auto& labels = dataSpec.Labels();
-    auto labelStr = SilKit::Config::Serialize<std::decay_t<decltype(labels)>>(labels);
-    supplementalData[SilKit::Core::Discovery::supplKeyRpcClientLabels] = labelStr;
+    supplementalData[SilKit::Core::Discovery::supplKeyRpcClientLabels] =
+        SilKit::Config::Serialize(configuredRpcSpec.Labels());
     supplementalData[SilKit::Core::Discovery::supplKeyRpcClientUUID] = network;
 
-    SilKit::Services::Rpc::RpcSpec configuredDataSpec{controllerConfig.functionName.value(), dataSpec.MediaType()};
-    for (auto label : dataSpec.Labels())
-    {
-        configuredDataSpec.AddLabel(label);
-    }
-
     auto controller =
         CreateController<Services::Rpc::RpcClient>(controllerConfig, network, std::move(supplementalData), true, true,
-                                                   &_timeProvider, configuredDataSpec, network, handler);
+                                                   &_timeProvider, configuredRpcSpec, network, handler);
 
     // RpcClient discovers RpcServerInternal and is ready to dispatch calls
     controller->RegisterServiceDiscovery();
@@ -723,24 +735,29 @@ auto Participant<SilKitConnectionT>::CreateRpcServer(
     SilKit::Config::RpcServer controllerConfig =
         GetConfigByControllerName(_participantConfig.rpcServers, canonicalName);
     UpdateOptionalConfigValue(canonicalName, controllerConfig.functionName, dataSpec.FunctionName());
+    UpdateOptionalConfigValue(canonicalName, controllerConfig.labels,
+                              SilKit::Config::v1::Label::VectorFromPublicApi(dataSpec.Labels()));
+
+    auto sortedConfigLabels = controllerConfig.labels.value();
+    std::sort(sortedConfigLabels.begin(), sortedConfigLabels.end(),
+              [](const auto& v1, const auto& v2) { return v1.key < v2.key; });
+
+    SilKit::Services::Rpc::RpcSpec configuredRpcSpec{controllerConfig.functionName.value(), dataSpec.MediaType()};
+    for (const auto& label : sortedConfigLabels)
+    {
+        configuredRpcSpec.AddLabel(label.ToPublicApi());
+    }
 
     Core::SupplementalData supplementalData;
     supplementalData[SilKit::Core::Discovery::controllerType] = SilKit::Core::Discovery::controllerTypeRpcServer;
     // Needed for RpcServer discovery in tests
     supplementalData[SilKit::Core::Discovery::supplKeyRpcServerFunctionName] = controllerConfig.functionName.value();
     supplementalData[SilKit::Core::Discovery::supplKeyRpcServerMediaType] = dataSpec.MediaType();
-    const auto& labels = dataSpec.Labels();
-    auto labelStr = SilKit::Config::Serialize<std::decay_t<decltype(labels)>>(labels);
-    supplementalData[SilKit::Core::Discovery::supplKeyRpcServerLabels] = labelStr;
-
-    SilKit::Services::Rpc::RpcSpec configuredDataSpec{controllerConfig.functionName.value(), dataSpec.MediaType()};
-    for (auto label : dataSpec.Labels())
-    {
-        configuredDataSpec.AddLabel(label);
-    }
+    supplementalData[SilKit::Core::Discovery::supplKeyRpcServerLabels] =
+        SilKit::Config::Serialize(configuredRpcSpec.Labels());
 
     auto controller = CreateController<Services::Rpc::RpcServer>(controllerConfig, network, supplementalData, true,
-                                                                 true, &_timeProvider, configuredDataSpec, handler);
+                                                                 true, &_timeProvider, configuredRpcSpec, handler);
 
     // RpcServer discovers RpcClient and creates RpcServerInternal on a matching connection
     controller->RegisterServiceDiscovery();
@@ -1822,6 +1839,22 @@ void Participant<SilKitConnectionT>::LogMismatchBetweenConfigAndPassedValue(cons
     _logger->Info(ss.str());
 }
 
+template <class SilKitConnectionT>
+template <typename ValueT>
+void Participant<SilKitConnectionT>::LogMismatchBetweenConfigAndPassedValue(const std::string& canonicalName,
+                                                                            const std::vector<ValueT>& passedValue,
+                                                                            const std::vector<ValueT>& configuredValue)
+{
+    std::stringstream ss;
+    ss << "Mismatch between a configured and programmatically passed value. The configured value will be used."
+       << std::endl
+       << "Controller name: " << canonicalName << std::endl
+       << "Passed value: " << fmt::format("{}", fmt::join(passedValue, ", ")) << std::endl
+       << "Configured value: " << fmt::format("{}", fmt::join(configuredValue, ", ")) << std::endl;
+
+    _logger->Info(ss.str());
+}
+
 template <class SilKitConnectionT>
 size_t Participant<SilKitConnectionT>::GetNumberOfConnectedParticipants()
 {
diff --git a/SilKit/source/services/logging/SilKitFmtFormatters.hpp b/SilKit/source/services/logging/SilKitFmtFormatters.hpp
index 6b8621aff..c7127ae36 100644
--- a/SilKit/source/services/logging/SilKitFmtFormatters.hpp
+++ b/SilKit/source/services/logging/SilKitFmtFormatters.hpp
@@ -49,6 +49,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "WireRpcMessages.hpp"
 #include "WireDataMessages.hpp"
 
+#include "ParticipantConfiguration.hpp"
+
 #include "TestDataTypes.hpp" // for operator<<
 #include "IServiceEndpoint.hpp" // for operator<<(... ServiceDescriptor)
 
@@ -112,6 +114,11 @@ MAKE_FORMATTER(SilKit::Services::PubSub::WireDataMessageEvent);
 MAKE_FORMATTER(SilKit::Services::Rpc::FunctionCall);
 MAKE_FORMATTER(SilKit::Services::Rpc::FunctionCallResponse);
 
+MAKE_FORMATTER(SilKit::Services::MatchingLabel::Kind);
+MAKE_FORMATTER(SilKit::Services::MatchingLabel);
+
+MAKE_FORMATTER(SilKit::Config::v1::Label::Kind);
+MAKE_FORMATTER(SilKit::Config::v1::Label);
 
 MAKE_FORMATTER(SilKit::Core::ServiceDescriptor);
 MAKE_FORMATTER(SilKit::Core::ProtocolVersion);
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 9e7071041..dcc63a83e 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -9,6 +9,11 @@ The format is based on `Keep a Changelog (http://keepachangelog.com/en/1.0.0/) <
 [4.0.54] - Unreleased
 ---------------------
 
+Added
+~~~~~
+
+- Override the labels of ``DataPublisher``, ``DataSubscriber``, ``RpcClient``, and ``RpcServer`` instances through the participant configuration, extending the already possible override of the topic / function name.
+
 Changed
 ~~~~~~~
 
diff --git a/docs/configuration/services-configuration.rst b/docs/configuration/services-configuration.rst
index 4f0063790..48d69e170 100644
--- a/docs/configuration/services-configuration.rst
+++ b/docs/configuration/services-configuration.rst
@@ -135,6 +135,13 @@ DataPublishers
   DataPublishers: 
   - Name: DataPublisher1
     Topic: SomeTopic1
+    Labels:
+      - Key: SomeKey
+        Value: SomeValue
+        Kind: Mandatory
+      - Key: AnotherKey
+        Value: AnotherValue
+        Kind: Optional
 
 
 .. list-table:: DataPublisher Configuration
@@ -147,6 +154,9 @@ DataPublishers
      - The name of the data publisher.
    * - Topic
      - The topic on which the data publisher publishes its information. (optional)
+   * - Labels
+     - The labels determining matching subscribers with the same topic and media type. (optional)
+        Note that these labels will replace all programmatically provided labels.
 
 
 .. _sec:cfg-participant-data-subscribers:
@@ -159,6 +169,13 @@ DataSubscribers
   DataSubscribers: 
   - Name: DataSubscriber1
     Topic: SomeTopic1
+    Labels:
+      - Key: SomeKey
+        Value: SomeValue
+        Kind: Mandatory
+      - Key: AnotherKey
+        Value: AnotherValue
+        Kind: Optional
 
 
 .. list-table:: DataSubscriber Configuration
@@ -171,6 +188,8 @@ DataSubscribers
      - The name of the data subscriber.
    * - Topic
      - The topic on which the data subscriber publishes its information. (optional)
+   * - Labels
+     - The labels determining matching publishers with the same topic and media type. (optional)
 
 
 .. _sec:cfg-participant-rpc-servers:
@@ -184,6 +203,13 @@ RpcServers
   RpcServers:
   - Name: RpcServer1
     FunctionName: SomeFunction1
+    Labels:
+      - Key: SomeKey
+        Value: SomeValue
+        Kind: Mandatory
+      - Key: AnotherKey
+        Value: AnotherValue
+        Kind: Optional
 
 
 .. list-table:: RPC Server Configuration
@@ -196,6 +222,8 @@ RpcServers
      - The name of the RPC server.
    * - FunctionName
      - The function name on which the RPC server offers its service. (optional)
+   * - Labels
+     - The labels determining matching clients with the same function name and media type. (optional)
 
 
 .. _sec:cfg-participant-rpc-clients:
@@ -208,6 +236,13 @@ RpcClients
   RpcClients: 
   - Name: RpcClient1
     FunctionName: SomeFunction1
+    Labels:
+      - Key: SomeKey
+        Value: SomeValue
+        Kind: Mandatory
+      - Key: AnotherKey
+        Value: AnotherValue
+        Kind: Optional
 
 
 .. list-table:: RPC Clients Configuration
@@ -220,3 +255,5 @@ RpcClients
      - The name of the RPC client.
    * - FunctionName
      - The function name to which the RPC client wants to connect to. (optional)
+   * - Labels
+     - The labels determining matching servers with the same function name and media type. (optional)