OCPBUGS-66971: Ntpfailover backport 419

Dockerfile

@@ -8,6 +8,8 @@ FROM quay.io/centos/centos:stream9
 RUN yum -y update && yum -y update glibc && yum --setopt=skip_missing_names_on_install=False -y install linuxptp ethtool hwdata synce4l && yum clean all
 
 
+RUN yum install -y procps-ng
+RUN yum install -y chrony
 RUN yum install -y gpsd-minimal
 RUN yum install -y gpsd-minimal-clients
 

addons/generic/ntpfailover.go

@@ -0,0 +1,231 @@
+package generic
+
+import (
+	"encoding/json"
+	"regexp"
+	"sync"
+	"time"
+
+	"github.com/golang/glog"
+
+	"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/plugin"
+	ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
+)
+
+type ntpFailoverPluginData struct {
+	gnssFailover    bool
+	cmdSetEnabled   map[string]func(bool)
+	pcfsmState      int
+	pcfsmMutex      sync.Mutex
+	pcfsmLocked     bool
+	ts2phcTolerance time.Duration
+	startupDelay    time.Duration
+	expiryTime      time.Time
+}
+
+type ntpFailoverOpts struct {
+	StartupDelay    string `json:"startupDelay"`
+	Ts2phcTolerance string `json:"ts2phcTolerance"` //nolint:stylecheck
+	GnssFailover    bool   `json:"gnssFailover"`
+}
+
+const ( // phc2sys/chronyd Finite State Machine States
+	pcsmsStartupDefault int = iota // Just started, both are unknown
+	pcsmsStartupPhc2sys            // phc2sys setting time
+	pcsmsStartupChronyd            // phc2sys setting time
+	pcsmsStartupBoth               // phc2sys setting time
+	pcsmsActive                    // phc2sys setting time
+	pcsmsOutOfSpec                 // switch to chronyd setting time
+	pcsmsFailover                  // chronyd setting time
+)
+
+const (
+	ts2phcPname  = "ts2phc"
+	chronydPname = "chronyd"
+	phc2sysPname = "phc2sys"
+)
+
+var (
+	ts2phcOffsetRegex  = regexp.MustCompile("offset .*s[23] freq")
+	chronydOnlineRegex = regexp.MustCompile("chronyd .* starting")
+)
+
+func onPTPConfigChangeNtpFailover(data *interface{}, nodeProfile *ptpv1.PtpProfile) error {
+	var _ntpFailoverOpts ntpFailoverOpts
+	_ntpFailoverOpts.StartupDelay = "90s"
+	_ntpFailoverOpts.Ts2phcTolerance = "5s"
+	_ntpFailoverOpts.GnssFailover = false
+	var err error
+	if data != nil {
+		_data := *data
+		var pluginData = _data.(*ntpFailoverPluginData)
+		if pluginData.cmdSetEnabled == nil {
+			pluginData.cmdSetEnabled = make(map[string]func(bool))
+		}
+		for name, opts := range (*nodeProfile).Plugins {
+			if name == "ntpfailover" {
+				optsByteArray, _ := json.Marshal(opts)
+				err = json.Unmarshal(optsByteArray, &_ntpFailoverOpts)
+				if err != nil {
+					glog.Error("ntpfailover failed to unmarshal opts: " + err.Error())
+				}
+			}
+		}
+
+		pluginData.gnssFailover = _ntpFailoverOpts.GnssFailover
+
+		pluginData.startupDelay, err = time.ParseDuration(_ntpFailoverOpts.StartupDelay)
+		if err != nil {
+			glog.Infof("Failed parsing startupDelay %s: %d.  Defaulting to 90 seconds.", _ntpFailoverOpts.StartupDelay, err)
+			pluginData.startupDelay, _ = time.ParseDuration("90s")
+		}
+		pluginData.expiryTime = time.Now().Add(pluginData.startupDelay)
+
+		pluginData.ts2phcTolerance, err = time.ParseDuration(_ntpFailoverOpts.Ts2phcTolerance)
+		if err != nil {
+			glog.Infof("Failed parsing ts2phcTolerance %s: %d.  Defaulting to 5 seconds.", _ntpFailoverOpts.Ts2phcTolerance, err)
+			pluginData.ts2phcTolerance, _ = time.ParseDuration("5s")
+		}
+	}
+	return nil
+}
+
+func registerProcessNtpFailover(data *interface{}, pname string, cmdSetEnabled func(bool)) {
+	if data != nil {
+		_data := *data
+
+		var pluginData = _data.(*ntpFailoverPluginData)
+		if pluginData.gnssFailover {
+			if pluginData.cmdSetEnabled == nil {
+				pluginData.cmdSetEnabled = make(map[string]func(bool))
+			}
+			pluginData.cmdSetEnabled[pname] = cmdSetEnabled
+		}
+	}
+}
+
+func processLogNtpFailover(data *interface{}, pname string, log string) string {
+	ret := log
+	if data != nil {
+		_data := *data
+
+		var pluginData = _data.(*ntpFailoverPluginData)
+		if pluginData.gnssFailover {
+			currentTime := time.Now()
+
+			if pname == ts2phcPname && ts2phcOffsetRegex.MatchString(log) {
+				pluginData.expiryTime = currentTime.Add(pluginData.ts2phcTolerance)
+			}
+
+			pluginData.pcfsmMutex.Lock()
+			ownLock := !pluginData.pcfsmLocked //If locked, then skip, otherwise take lock
+			pluginData.pcfsmMutex.Unlock()
+			if ownLock {
+			done:
+				for {
+					switch pluginData.pcfsmState {
+					case pcsmsStartupDefault:
+						_, foundChronyd := pluginData.cmdSetEnabled[chronydPname]
+						_, foundPhc2Sys := pluginData.cmdSetEnabled[phc2sysPname]
+						if foundChronyd && foundPhc2Sys {
+							pluginData.pcfsmState = pcsmsStartupBoth
+						} else if foundChronyd {
+							pluginData.pcfsmState = pcsmsStartupChronyd
+						} else if foundPhc2Sys {
+							pluginData.pcfsmState = pcsmsStartupPhc2sys
+						} else {
+							break done
+						}
+					case pcsmsStartupPhc2sys:
+						_, foundChronyd := pluginData.cmdSetEnabled[chronydPname]
+						if foundChronyd {
+							pluginData.pcfsmState = pcsmsStartupBoth
+						} else {
+							break done
+						}
+					case pcsmsStartupChronyd:
+						_, foundPhc2Sys := pluginData.cmdSetEnabled[phc2sysPname]
+						if foundPhc2Sys {
+							pluginData.pcfsmState = pcsmsStartupBoth
+						} else {
+							break done
+						}
+					case pcsmsStartupBoth:
+						chronydSetEnabled, ok := pluginData.cmdSetEnabled[chronydPname]
+						if ok {
+							chronydSetEnabled(false)
+						}
+						phc2sysSetEnabled, ok := pluginData.cmdSetEnabled[phc2sysPname]
+						if ok {
+							phc2sysSetEnabled(true)
+						}
+						pluginData.pcfsmState = pcsmsActive
+						continue
+					case pcsmsActive:
+						if pname == ts2phcPname {
+							if currentTime.After(pluginData.expiryTime) {
+								pluginData.pcfsmState = pcsmsOutOfSpec
+								continue
+							}
+						}
+						if pname == chronydPname && chronydOnlineRegex.MatchString(log) {
+							chronydSetEnabled, ok := pluginData.cmdSetEnabled[chronydPname]
+							if ok {
+								chronydSetEnabled(false)
+							}
+						}
+						break done
+					case pcsmsOutOfSpec:
+						if pname == ts2phcPname {
+							if currentTime.After(pluginData.expiryTime) {
+								pluginData.pcfsmState = pcsmsFailover
+								chronydSetEnabled, ok := pluginData.cmdSetEnabled[chronydPname]
+								if ok {
+									chronydSetEnabled(true)
+								}
+								phc2sysSetEnabled, ok := pluginData.cmdSetEnabled[phc2sysPname]
+								if ok {
+									phc2sysSetEnabled(false)
+								}
+								continue
+							}
+						}
+						break done
+					case pcsmsFailover:
+						if pname == ts2phcPname {
+							if currentTime.Before(pluginData.expiryTime) {
+								pluginData.pcfsmState = pcsmsStartupDefault
+								continue
+							}
+						}
+						break done
+					}
+				}
+				pluginData.pcfsmMutex.Lock()
+				pluginData.pcfsmLocked = false //If took lock, then return it
+				pluginData.pcfsmMutex.Unlock()
+			}
+		}
+	}
+
+	return ret
+}
+
+// NtpFailover initializes NtpFailover plugin
+func NtpFailover(name string) (*plugin.Plugin, *interface{}) {
+	if name != "ntpfailover" {
+		glog.Errorf("Plugin must be initialized as 'ntpfailover'")
+		return nil, nil
+	}
+	glog.Infof("registering ntpfailover plugin")
+	_plugin := plugin.Plugin{Name: "ntpfailover",
+		OnPTPConfigChange:      onPTPConfigChangeNtpFailover,
+		RegisterEnableCallback: registerProcessNtpFailover,
+		ProcessLog:             processLogNtpFailover,
+	}
+	pluginData := ntpFailoverPluginData{pcfsmState: pcsmsStartupDefault,
+		pcfsmMutex: sync.Mutex{}}
+	pluginData.cmdSetEnabled = make(map[string]func(bool))
+	var iface interface{} = &pluginData
+	return &_plugin, &iface
+}

addons/mapping.go

@@ -7,6 +7,7 @@ import (
 )
 
 var PluginMapping = map[string]plugin.New{
-	"reference": generic.Reference,
-	"e810":      intel.E810,
+	"reference":   generic.Reference,
+	"ntpfailover": generic.NtpFailover,
+	"e810":        intel.E810,
 }

addons/redhat/Dockerfile.ocp

@@ -1,6 +1,5 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 WORKDIR /go/src/github.com/openshift/linuxptp-daemon
-WORKDIR /go/src/github.com/josephdrichard/linuxptp-daemon
 WORKDIR /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon
 COPY . .
 RUN make clean && make
@@ -12,6 +11,8 @@ RUN yum -y update && \
     yum --setopt=skip_missing_names_on_install=False -y install linuxptp ethtool hwdata synce4l && \
     yum clean all
 
+RUN yum install -y procps-ng
+RUN yum install -y chrony
 RUN yum install -y gpsd-minimal
 RUN yum install -y gpsd-minimal-clients
 

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/golang/glog v1.2.4
 	github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
 	github.com/jaypipes/ghw v0.12.0
-	github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20250211183822-9567e174177b
+	github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20251105200506-7495c02a5a34
 	github.com/mdlayher/genetlink v1.3.2
 	github.com/mdlayher/netlink v1.7.2
 	github.com/prometheus/client_golang v1.16.0
@@ -45,7 +45,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -70,15 +70,15 @@ require (
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
 	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -48,7 +48,8 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+
 github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
 github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -67,17 +68,17 @@ github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYu
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f h1:7MmqygqdeJtziBUpm4Z9ThROFZUaVGaePMfcDnluf1E=
 github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f/go.mod h1:n1ej5+FqyEytMt/mugVDZLIiqTMO+vsrgY+kM6ohzN0=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f h1:5CjVwnuUcp5adK4gmY6i72gpVFVnZDP2h5TmPScB6u4=
 github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
@@ -93,8 +94,8 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20250211183822-9567e174177b h1:F1FbJPVpl1maQCeUqn7OQGQUVTkhkf+BMc0Eo1r89is=
-github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20250211183822-9567e174177b/go.mod h1:4XC6tDWOLGqAhLMkBSDuZ2Dfz+yWa0p5LWaEywz1b48=
+github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20251105200506-7495c02a5a34 h1:wgQR7ZC6EcPjUNGkmAwoT89Hff1PbitpPe8KDjl+lVM=
+github.com/k8snetworkplumbingwg/ptp-operator v0.0.0-20251105200506-7495c02a5a34/go.mod h1:sZdvVrCIjLF8TF7D1Jd1C+Awv+qZ8oY1W9/lliM1p78=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -123,10 +124,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
-github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
-github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
-github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
+github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
+github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
+github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -193,8 +194,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
 golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -228,8 +229,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -248,8 +249,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
 google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=