tracer support for mirror sample rate

Summary: As titled, tracer support for mirror sample rate Reviewed By: jasmeetbagga Differential Revision: D62995235 fbshipit-source-id: 580d0672f1388ccf7636d255b6c1b140108b8733
facebook · Sep 23, 2024 · b72889b · b72889b
1 parent f13ca45
commit b72889b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/fboss/agent/ApplyThriftConfig.cpp b/fboss/agent/ApplyThriftConfig.cpp
@@ -4966,15 +4966,17 @@ std::shared_ptr<Mirror> ThriftConfigApplier::createMirror(
 
   uint8_t dscpMark = mirrorConfig->get_dscp();
   bool truncate = mirrorConfig->get_truncate();
-  uint32_t samplingRate = mirrorConfig->samplingRate().has_value()
-      ? mirrorConfig->samplingRate().value()
-      : 0;
 
   std::optional<PortDescriptor> egressPortDesc;
   if (mirrorEgressPort.has_value()) {
     egressPortDesc = PortDescriptor(mirrorEgressPort.value());
   }
 
+  std::optional<uint32_t> samplingRate;
+  if (mirrorConfig->samplingRate().has_value()) {
+    samplingRate = mirrorConfig->samplingRate().value();
+  }
+
   auto mirror = make_shared<Mirror>(
       *mirrorConfig->name(),
       egressPortDesc,

diff --git a/fboss/agent/MirrorManagerImpl.cpp b/fboss/agent/MirrorManagerImpl.cpp
@@ -88,7 +88,8 @@ std::shared_ptr<Mirror> MirrorManagerImpl<AddrT>::updateMirror(
       mirror->getSrcIp(),
       mirror->getTunnelUdpPorts(),
       mirror->getDscp(),
-      mirror->getTruncate());
+      mirror->getTruncate(),
+      mirror->getSamplingRate());
   newMirror->setSwitchId(mirror->getSwitchId());
 
   for (const auto& nexthop : nexthops) {

diff --git a/fboss/agent/hw/sai/tracer/MirrorApiTracer.cpp b/fboss/agent/hw/sai/tracer/MirrorApiTracer.cpp
@@ -31,6 +31,7 @@ std::map<int32_t, std::pair<std::string, std::size_t>> _MirrorSessionMap{
     SAI_ATTR_MAP(EnhancedRemoteMirror, SrcMacAddress),
     SAI_ATTR_MAP(EnhancedRemoteMirror, DstMacAddress),
     SAI_ATTR_MAP(EnhancedRemoteMirror, IpHeaderVersion),
+    SAI_ATTR_MAP(EnhancedRemoteMirror, SampleRate),
     SAI_ATTR_MAP(SflowMirror, UdpSrcPort),
     SAI_ATTR_MAP(SflowMirror, UdpDstPort),
 };

diff --git a/fboss/agent/state/Mirror.cpp b/fboss/agent/state/Mirror.cpp
@@ -22,7 +22,7 @@ Mirror::Mirror(
     std::optional<TunnelUdpPorts> udpPorts,
     uint8_t dscp,
     bool truncate,
-    uint32_t samplingRate)
+    std::optional<uint32_t> samplingRate)
     : ThriftStructNode<Mirror, state::MirrorFields>() {
   // span mirror is resolved as soon as it is created
   // erspan and sflow are resolved when tunnel is set
@@ -31,7 +31,9 @@ Mirror::Mirror(
   set<switch_state_tags::truncate>(truncate);
   set<switch_state_tags::configHasEgressPort>(false);
   set<switch_state_tags::isResolved>(false);
-  set<switch_state_tags::samplingRate>(samplingRate);
+  if (samplingRate.has_value()) {
+    set<switch_state_tags::samplingRate>(samplingRate.value());
+  }
 
   if (egressPortDesc.has_value()) {
     set<switch_state_tags::egressPortDesc>(egressPortDesc.value().toThrift());

diff --git a/fboss/agent/state/Mirror.h b/fboss/agent/state/Mirror.h
@@ -146,7 +146,7 @@ class Mirror : public ThriftStructNode<Mirror, state::MirrorFields> {
       std::optional<TunnelUdpPorts> udpPorts = std::nullopt,
       uint8_t dscp = cfg::switch_config_constants::DEFAULT_MIRROR_DSCP_,
       bool truncate = false,
-      uint32_t samplingRate = 0);
+      std::optional<uint32_t> samplingRate = std::nullopt);
   enum Type { SPAN = 1, ERSPAN = 2, SFLOW = 3 };
   std::string getID() const;
   std::optional<folly::IPAddress> getDestinationIp() const;