Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSDK-8819: Finish FTDC #4579

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions ftdc/ftdc.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,33 @@ type FTDC struct {
logger logging.Logger
}

// New creates a new *FTDC.
func New(logger logging.Logger) *FTDC {
return NewWithWriter(nil, logger)
// New creates a new *FTDC. This FTDC object will write FTDC formatted files into the input
// `ftdcDirectory`.
func New(ftdcDirectory string, logger logging.Logger) *FTDC {
ret := newFTDC(logger)
ret.maxFileSizeBytes = 1_000_000
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made the settings a more formal division. One either passes in a directory and all these variables about managing files are initialized. Or one passes in a writer and none of those variables matter.

ret.maxNumFiles = 10
ret.ftdcDir = ftdcDirectory
return ret
}

// NewWithWriter creates a new *FTDC that outputs bytes to the specified writer.
func NewWithWriter(writer io.Writer, logger logging.Logger) *FTDC {
ret := newFTDC(logger)
ret.outputWriter = writer
return ret
}

func DefaultDirectory(viamHome string, partId string) string {
return filepath.Join(viamHome, "diagnostics.data", partId)
}

func newFTDC(logger logging.Logger) *FTDC {
return &FTDC{
// Allow for some wiggle before blocking producers.
datumCh: make(chan datum, 20),
outputWorkerDone: make(chan struct{}),
logger: logger,
outputWriter: writer,
maxFileSizeBytes: 1_000_000,
maxNumFiles: 10,
}
}

Expand Down Expand Up @@ -415,6 +427,11 @@ func (ftdc *FTDC) getWriter() (io.Writer, error) {
// It's unclear in what circumstance we'd expect creating a new file to fail. Try 5 times for no
// good reason before giving up entirely and shutting down FTDC.
for numTries := 0; numTries < 5; numTries++ {
if err = os.MkdirAll(ftdc.ftdcDir, 0o755); err != nil {
ftdc.logger.Warnw("Failed to create FTDC directory", "dir", ftdc.ftdcDir, "err", err)
return nil, err
}

now := time.Now().UTC()
// lint wants 0o600 file permissions. We don't expect the unix user someone is ssh'ed in as
// to be on the same unix user as is running the viam-server process. Thus the file needs to
Expand Down Expand Up @@ -536,7 +553,7 @@ func (ftdc *FTDC) checkAndDeleteOldFiles() error {
// deletion testing. Filename generation uses padding such that we can rely on there before 2/4
// digits for every numeric value.
//
//nolint
// nolint
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It joys me that our linter lints our linter

// Example filename: countingBytesTest1228324349/viam-server-2024-11-18T20-37-01Z.ftdc
var filenameTimeRe = regexp.MustCompile(`viam-server-(\d{4})-(\d{2})-(\d{2})T(\d{2})-(\d{2})-(\d{2})Z.ftdc`)

Expand Down
25 changes: 11 additions & 14 deletions ftdc/ftdc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,18 +294,16 @@ func TestStatsWriterContinuesOnSchemaError(t *testing.T) {
func TestCountingBytes(t *testing.T) {
logger := logging.NewTestLogger(t)

// We must not use `NewWithWriter`. Forcing a writer for FTDC data is not compatible with FTDC
// file rotation.
ftdc := New(logger.Sublogger("ftdc"))
// Expect a log rotation after 1,000 bytes. For a changing `foo` object, this is ~60 datums.
ftdc.maxFileSizeBytes = 1000

// Isolate all of the files we're going to create to a single, fresh directory.
ftdcFileDir, err := os.MkdirTemp("./", "countingBytesTest")
test.That(t, err, test.ShouldBeNil)
defer os.RemoveAll(ftdcFileDir)

// Isolate all of the files we're going to create to a single, fresh directory.
ftdc.ftdcDir = ftdcFileDir
// We must not use `NewWithWriter`. Forcing a writer for FTDC data is not compatible with FTDC
// file rotation.
ftdc := New(ftdcFileDir, logger.Sublogger("ftdc"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "refactor" of New vs NewWithWriter resulted in changing the order here. First create the directory, then pass it to the constructor.

// Expect a log rotation after 1,000 bytes. For a changing `foo` object, this is ~60 datums.
ftdc.maxFileSizeBytes = 1000

timesRolledOver := 0
foo := &foo{}
Expand Down Expand Up @@ -419,16 +417,15 @@ func TestFileDeletion(t *testing.T) {
// a second before being able to create the next file.
logger := logging.NewTestLogger(t)

// We must not use `NewWithWriter`. Forcing a writer for FTDC data is not compatible with FTDC
// file rotation.
ftdc := New(logger.Sublogger("ftdc"))

// Isolate all of the files we're going to create to a single, fresh directory.
ftdcFileDir, err := os.MkdirTemp("./", "fileDeletionTest")
test.That(t, err, test.ShouldBeNil)
defer os.RemoveAll(ftdcFileDir)

// Isolate all of the files we're going to create to a single, fresh directory.
ftdc.ftdcDir = ftdcFileDir
// We must not use `NewWithWriter`. Forcing a writer for FTDC data is not compatible with FTDC
// file rotation.
ftdc := New(ftdcFileDir, logger.Sublogger("ftdc"))

// Expect a log rotation after 1,000 bytes. For a changing `foo` object, this is ~60 datums.
ftdc.maxFileSizeBytes = 1000
ftdc.maxNumFiles = 3
Expand Down
3 changes: 2 additions & 1 deletion robot/impl/local_robot.go
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ func newWithResources(

var ftdcWorker *ftdc.FTDC
if rOpts.enableFTDC {
ftdcWorker = ftdc.New(logger.Sublogger("ftdc"))
// CloudID is also known as the robot part id.
ftdcWorker = ftdc.New(ftdc.DefaultDirectory(config.ViamDotDir, cfg.Cloud.ID), logger.Sublogger("ftdc"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically has a bug -- cfg.Cloud.ID is nil for local configs. Fixed in last commit.

ftdcWorker.Start()
}

Expand Down