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.

Sign up for GitHub

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

Jump to bottom

bugfix: Add missing return #354

Merged
merged 2 commits into from
Oct 21, 2021
Merged

bugfix: Add missing return #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
598d58d
Add missing return
kakkoyun Oct 21, 2021
2ff114a
Clean up
kakkoyun Oct 21, 2021
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
34 changes: 11 additions & 23 deletions pkg/symbol/symbol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,33 +83,34 @@ func NewSymbolizer(logger log.Logger, opts ...Option) (*Symbolizer, error) {
return sym, nil
}

func (s *Symbolizer) NewLiner(m *profile.Mapping, path string) (lnr liner, err error) {
hash, err := hash(path)
func (s *Symbolizer) NewLiner(m *profile.Mapping, path string) (liner, error) {
h, err := hash(path)
if err != nil {
level.Warn(s.logger).Log("msg", "failed to generate cache key", "err", err)
hash = path
h = path
}

// Check if we already attempt to build a liner for this path.
if _, failedBefore := s.failed[hash]; failedBefore {
if _, failedBefore := s.failed[h]; failedBefore {
level.Debug(s.logger).Log("msg", "already failed to create liner for this debug info file, skipping")
return nil, ErrLinerFailedBefore
}

if val, ok := s.cache.GetIfPresent(hash); ok {
if val, ok := s.cache.GetIfPresent(h); ok {
level.Debug(s.logger).Log("msg", "using cached liner to resolve symbols", "file", path)
return val.(liner), nil
}

lnr, err = s.newLiner(m, path)
lnr, err := s.newLiner(m, path)
if err != nil {
s.failed[hash] = struct{}{}
s.failed[h] = struct{}{}
s.cache.Invalidate(hash)
return nil, err
}

level.Debug(s.logger).Log("msg", "liner cached", "file", path)
s.cache.Put(hash, lnr)
return
s.cache.Put(h, lnr)
return lnr, nil
}

func (s *Symbolizer) Close() error {
Expand Down Expand Up @@ -168,20 +169,7 @@ func (s *Symbolizer) newLiner(m *profile.Mapping, path string) (liner, error) {
)
}

// Just in case, underlying DWARF can symbolize addresses.
level.Debug(s.logger).Log("msg", "falling back to DWARF liner resolve symbols", "file", path)
lnr, err := addr2line.DWARF(s.logger, s.demangler, s.attemptThreshold, m, path)
if err != nil {
level.Error(s.logger).Log("msg", "failed to open object file",
"file", path,
"start", m.Start,
"limit", m.Limit,
"offset", m.Offset,
"err", err,
)
return nil, err
}
return lnr, nil
return nil, errors.New("cannot create a liner from given object file")
Copy link
Member Author

Choose a reason for hiding this comment

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

@paulfantom Some of the errors could be coming from this part as well. They could be gone now.

}

func hash(path string) (string, error) {
Expand Down