-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(odiglet): make ebpf instrumentation api for any language (#764)
- Loading branch information
Showing
6 changed files
with
168 additions
and
165 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,106 +1,17 @@ | ||
| package ebpf | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "os" | ||
| "sync" | ||
|
|
||
| "github.com/keyval-dev/odigos/odiglet/pkg/env" | ||
|
|
||
| "github.com/keyval-dev/odigos/common/consts" | ||
|
|
||
| "go.opentelemetry.io/auto" | ||
|
|
||
| "github.com/keyval-dev/odigos/odiglet/pkg/log" | ||
| "github.com/keyval-dev/odigos/common" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| var ErrProcInstrumented = errors.New("process already instrumented") | ||
| var ErrProcInstrumented = errors.New("process already instrumented") | ||
|
|
||
| type Director interface { | ||
| Language() common.ProgrammingLanguage | ||
| Instrument(pid int, podDetails types.NamespacedName, appName string) error | ||
| Cleanup(podDetails types.NamespacedName) | ||
| Shutdown() | ||
| } | ||
|
|
||
| type InstrumentationDirector struct { | ||
| mux sync.Mutex | ||
| pidsToInstrumentation map[int]*auto.Instrumentation | ||
| podDetailsToPids map[types.NamespacedName][]int | ||
| } | ||
|
|
||
| func NewInstrumentationDirector() (*InstrumentationDirector, error) { | ||
| err := os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", fmt.Sprintf("http://%s:%d", env.Current.NodeIP, consts.OTLPPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &InstrumentationDirector{ | ||
| pidsToInstrumentation: make(map[int]*auto.Instrumentation), | ||
| podDetailsToPids: make(map[types.NamespacedName][]int), | ||
| }, nil | ||
| } | ||
|
|
||
| func (i *InstrumentationDirector) Instrument(pid int, podDetails types.NamespacedName, appName string) error { | ||
| log.Logger.V(0).Info("Instrumenting process", "pid", pid) | ||
| i.mux.Lock() | ||
| defer i.mux.Unlock() | ||
| if _, exists := i.pidsToInstrumentation[pid]; exists { | ||
| log.Logger.V(5).Info("Process already instrumented", "pid", pid) | ||
| return ErrProcInstrumented | ||
| } | ||
|
|
||
| go func() { | ||
| inst, err := auto.NewInstrumentation(auto.WithPID(pid), auto.WithServiceName(appName)) | ||
| if err != nil { | ||
| log.Logger.Error(err, "instrumentation setup failed") | ||
| return | ||
| } | ||
|
|
||
| i.pidsToInstrumentation[pid] = inst | ||
| i.podDetailsToPids[podDetails] = append(i.podDetailsToPids[podDetails], pid) | ||
|
|
||
| if err := inst.Run(context.Background()); err != nil { | ||
| log.Logger.Error(err, "instrumentation crashed after running") | ||
| } | ||
| } () | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (i *InstrumentationDirector) Cleanup(podDetails types.NamespacedName) { | ||
| i.mux.Lock() | ||
| defer i.mux.Unlock() | ||
| pids, exists := i.podDetailsToPids[podDetails] | ||
| if !exists { | ||
| log.Logger.V(5).Info("No processes to cleanup for pod", "pod", podDetails) | ||
| return | ||
| } | ||
|
|
||
| log.Logger.V(0).Info("Cleaning up instrumentation for pod", "pod", podDetails) | ||
| delete(i.podDetailsToPids, podDetails) | ||
| for _, pid := range pids { | ||
| inst, exists := i.pidsToInstrumentation[pid] | ||
| if !exists { | ||
| log.Logger.V(5).Info("No objects to cleanup for process", "pid", pid) | ||
| continue | ||
| } | ||
|
|
||
| delete(i.pidsToInstrumentation, pid) | ||
| go func() { | ||
| err := inst.Close() | ||
| if err != nil { | ||
| log.Logger.Error(err, "error cleaning up objects for process", "pid", pid) | ||
| } | ||
| }() | ||
| } | ||
| } | ||
|
|
||
| func (i *InstrumentationDirector) Shutdown() { | ||
| log.Logger.V(0).Info("Shutting down instrumentation director") | ||
| for details := range i.podDetailsToPids { | ||
| i.Cleanup(details) | ||
| } | ||
| } |
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,99 @@ | ||
| package ebpf | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "sync" | ||
|
|
||
| "github.com/keyval-dev/odigos/common" | ||
| "github.com/keyval-dev/odigos/odiglet/pkg/env" | ||
| "github.com/keyval-dev/odigos/odiglet/pkg/instrumentation/consts" | ||
| "github.com/keyval-dev/odigos/odiglet/pkg/log" | ||
| "go.opentelemetry.io/auto" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| type InstrumentationDirectorGo struct { | ||
| mux sync.Mutex | ||
| pidsToInstrumentation map[int]*auto.Instrumentation | ||
| podDetailsToPids map[types.NamespacedName][]int | ||
| } | ||
|
|
||
| func NewInstrumentationDirectorGo() (Director, error) { | ||
| err := os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", fmt.Sprintf("http://%s:%d", env.Current.NodeIP, consts.OTLPPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &InstrumentationDirectorGo{ | ||
| pidsToInstrumentation: make(map[int]*auto.Instrumentation), | ||
| podDetailsToPids: make(map[types.NamespacedName][]int), | ||
| }, nil | ||
| } | ||
|
|
||
| func (i *InstrumentationDirectorGo) Language() common.ProgrammingLanguage { | ||
| return common.GoProgrammingLanguage | ||
| } | ||
|
|
||
| func (i *InstrumentationDirectorGo) Instrument(pid int, podDetails types.NamespacedName, appName string) error { | ||
| log.Logger.V(0).Info("Instrumenting process", "pid", pid) | ||
| i.mux.Lock() | ||
| defer i.mux.Unlock() | ||
| if _, exists := i.pidsToInstrumentation[pid]; exists { | ||
| log.Logger.V(5).Info("Process already instrumented", "pid", pid) | ||
| return ErrProcInstrumented | ||
| } | ||
|
|
||
| go func() { | ||
| inst, err := auto.NewInstrumentation(auto.WithPID(pid), auto.WithServiceName(appName)) | ||
| if err != nil { | ||
| log.Logger.Error(err, "instrumentation setup failed") | ||
| return | ||
| } | ||
|
|
||
| i.pidsToInstrumentation[pid] = inst | ||
| i.podDetailsToPids[podDetails] = append(i.podDetailsToPids[podDetails], pid) | ||
|
|
||
| if err := inst.Run(context.Background()); err != nil { | ||
| log.Logger.Error(err, "instrumentation crashed after running") | ||
| } | ||
| }() | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (i *InstrumentationDirectorGo) Cleanup(podDetails types.NamespacedName) { | ||
| i.mux.Lock() | ||
| defer i.mux.Unlock() | ||
| pids, exists := i.podDetailsToPids[podDetails] | ||
| if !exists { | ||
| log.Logger.V(5).Info("No processes to cleanup for pod", "pod", podDetails) | ||
| return | ||
| } | ||
|
|
||
| log.Logger.V(0).Info("Cleaning up instrumentation for pod", "pod", podDetails) | ||
| delete(i.podDetailsToPids, podDetails) | ||
| for _, pid := range pids { | ||
| inst, exists := i.pidsToInstrumentation[pid] | ||
| if !exists { | ||
| log.Logger.V(5).Info("No objects to cleanup for process", "pid", pid) | ||
| continue | ||
| } | ||
|
|
||
| delete(i.pidsToInstrumentation, pid) | ||
| go func() { | ||
| err := inst.Close() | ||
| if err != nil { | ||
| log.Logger.Error(err, "error cleaning up objects for process", "pid", pid) | ||
| } | ||
| }() | ||
| } | ||
| } | ||
|
|
||
| func (i *InstrumentationDirectorGo) Shutdown() { | ||
| log.Logger.V(0).Info("Shutting down instrumentation director") | ||
| for details := range i.podDetailsToPids { | ||
| i.Cleanup(details) | ||
| } | ||
| } |
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
Oops, something went wrong.