-
Notifications
You must be signed in to change notification settings - Fork 200
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use new runtime detector for logging process events (#1645)
- Loading branch information
Showing
9 changed files
with
163 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package detector | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "log/slog" | ||
| "sync" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| "github.com/odigos-io/odigos/common/envOverwrite" | ||
| "github.com/odigos-io/odigos/k8sutils/pkg/consts" | ||
| "github.com/odigos-io/odigos/procdiscovery/pkg/process" | ||
| "github.com/odigos-io/runtime-detector" | ||
| ) | ||
|
|
||
| type ProcessEvent = detector.ProcessEvent | ||
|
|
||
| type Detector struct { | ||
| detector *detector.Detector | ||
| wg sync.WaitGroup | ||
| runError error | ||
| } | ||
|
|
||
| func StartRuntimeDetector(ctx context.Context, logger logr.Logger, events chan ProcessEvent) (*Detector, error) { | ||
| detector, err := newDetector(ctx, logger, events) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create runtime detector: %w", err) | ||
| } | ||
|
|
||
| d := &Detector{detector: detector} | ||
|
|
||
| d.wg.Add(1) | ||
| go func() { | ||
| defer d.wg.Done() | ||
| readProcEventsLoop(logger, events) | ||
| }() | ||
|
|
||
| d.wg.Add(1) | ||
| go func() { | ||
| defer d.wg.Done() | ||
| d.runError = detector.Run(ctx) | ||
| }() | ||
|
|
||
| return d, nil | ||
| } | ||
|
|
||
| func (d *Detector) Stop() error { | ||
| err := d.detector.Stop() | ||
| d.wg.Wait() | ||
| return errors.Join(d.runError, err) | ||
| } | ||
|
|
||
| func newDetector(ctx context.Context, logger logr.Logger, events chan ProcessEvent) (*detector.Detector, error) { | ||
| sLogger := slog.New(logr.ToSlogHandler(logger)) | ||
|
|
||
| opts := []detector.DetectorOption{ | ||
| detector.WithLogger(sLogger), | ||
| detector.WithEnvironments(relevantEnvVars()...), | ||
| } | ||
| detector, err := detector.NewDetector(ctx, events, opts...) | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return detector, nil | ||
| } | ||
|
|
||
| func readProcEventsLoop(l logr.Logger, events chan ProcessEvent) { | ||
| l = l.WithName("process detector") | ||
| for e := range events { | ||
| switch e.EventType { | ||
| case detector.ProcessExecEvent: | ||
| l.Info("detected new process", | ||
| "pid", e.PID, | ||
| "cmd", e.ExecDetails.CmdLine, | ||
| "exeName", e.ExecDetails.ExeName, | ||
| "exeLink", e.ExecDetails.ExeLink, | ||
| "envs", e.ExecDetails.Environments, | ||
| "container PID", e.ExecDetails.ContainerProcessID, | ||
| ) | ||
| case detector.ProcessExitEvent: | ||
| l.Info("detected process exit", | ||
| "pid", e.PID, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func relevantEnvVars() []string { | ||
| // env vars related to language versions | ||
| versionEnvs := process.LangsVersionEnvs | ||
|
|
||
| envs := make([]string, 0, len(versionEnvs)) | ||
| for env := range versionEnvs { | ||
| envs = append(envs, env) | ||
| } | ||
|
|
||
| // env vars that Odigos is using for adding dependencies | ||
| envs = append(envs, envOverwrite.GetRelevantEnvVarsKeys()...) | ||
|
|
||
| // env vars that Odigos is injecting to the relevant containers | ||
| envs = append(envs, consts.OdigosInjectedEnvVars()...) | ||
|
|
||
| return envs | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters