TRA-3868 move tapped pod watch and tapper updating to shared (#416)

* WIP

* WIP

* WIP

* WIP

* WIP

* Update tapRunner.go and k8sTapManager.go

* Update cleanRunner.go, common.go, and 8 more files...

* Update common.go, tapConfig.go, and 2 more files...

* Update config.go, config.go, and 5 more files...

* Update tapRunner.go, config.go, and 7 more files...

* Update cleanRunner.go, logs.go, and 2 more files...

* Update k8sTapManager.go, provider.go, and watch.go

* Update go.sum, go.mod, and go.sum

* Update go.mod and go.sum

* Update go.mod, go.sum, and 2 more files...

* Revert "Update go.mod, go.sum, and 2 more files..."

This reverts commit 8140311349.

* Update funcWrappers.go, tapRunner.go, and 4 more files...

* Update main.go, tapRunner.go, and mizuTapperSyncer.go
This commit is contained in:
RamiBerm
2021-11-01 14:12:32 +02:00
committed by GitHub
parent 35dbd5fde2
commit 655626bc42
29 changed files with 1653 additions and 425 deletions

View File

@@ -19,6 +19,7 @@ import (
"path/filepath"
"plugin"
"sort"
"time"
"github.com/gin-contrib/static"
"github.com/gin-gonic/gin"
@@ -41,6 +42,11 @@ var harsDir = flag.String("hars-dir", "", "Directory to read hars from")
var extensions []*tapApi.Extension // global
var extensionsMap map[string]*tapApi.Extension // global
const (
socketConnectionRetries = 10
socketConnectionRetryDelay = time.Second * 2
)
func main() {
logLevel := determineLogLevel()
logger.InitLoggerStderrOnly(logLevel)
@@ -87,7 +93,7 @@ func main() {
hostMode := os.Getenv(shared.HostModeEnvVar) == "1"
tapOpts := &tap.TapOpts{HostMode: hostMode}
tap.StartPassiveTapper(tapOpts, filteredOutputItemsChannel, extensions, filteringOptions)
socketConnection, _, err := websocket.DefaultDialer.Dial(*apiServerAddress, nil)
socketConnection, err := dialSocketWithRetry(*apiServerAddress, socketConnectionRetries, socketConnectionRetryDelay)
if err != nil {
panic(fmt.Sprintf("Error connecting to socket server at %s %v", *apiServerAddress, err))
}
@@ -318,3 +324,19 @@ func determineLogLevel() (logLevel logging.Level) {
return
}
func dialSocketWithRetry(socketAddress string, retryAmount int, retryDelay time.Duration) (*websocket.Conn, error) {
var lastErr error
for i := 1; i < retryAmount; i++ {
socketConnection, _, err := websocket.DefaultDialer.Dial(socketAddress, nil)
if err != nil {
if i < retryAmount {
logger.Log.Debugf("socket connection to %s failed: %v, retrying %d out of %d in %d seconds...", socketAddress, err, i, retryAmount, retryDelay / time.Second)
time.Sleep(retryDelay)
}
} else {
logger.Log.Debugf("socket connection to %s successful", socketAddress)
return socketConnection, nil
}
}
return nil, lastErr
}