Skip to content

Commit

Permalink
Change sourcemap logging (elastic#4132)
Browse files Browse the repository at this point in the history
Remove unnecessary log line and change other from warning to debug level.

fixes elastic#4119
  • Loading branch information
simitt committed Sep 3, 2020
1 parent 5151e44 commit df78386
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions model/stacktrace.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ import (
"github.com/elastic/apm-server/transform"
)

var (
msgServiceInvalidForSourcemapping = "Cannot apply sourcemap without a service name or service version"
)

type Stacktrace []*StacktraceFrame

func (st *Stacktrace) transform(ctx context.Context, cfg *transform.Config, rum bool, service *Service) []common.MapStr {
Expand Down Expand Up @@ -59,7 +55,6 @@ func (st *Stacktrace) transform(ctx context.Context, cfg *transform.Config, rum
return st.transformFrames(cfg, rum, noSourcemapping)
}
if service == nil || service.Name == "" || service.Version == "" {
logp.NewLogger(logs.Stacktrace).Warn(msgServiceInvalidForSourcemapping)
return st.transformFrames(cfg, rum, noSourcemapping)
}

Expand All @@ -69,11 +64,12 @@ func (st *Stacktrace) transform(ctx context.Context, cfg *transform.Config, rum
fct := "<anonymous>"
return st.transformFrames(cfg, rum, func(frame *StacktraceFrame) {
fct, errMsg = frame.applySourcemap(ctx, cfg.RUM.SourcemapStore, service, fct)
if errMsg != "" {
if _, ok := sourcemapErrorSet[errMsg]; !ok {
logger.Warn(errMsg)
sourcemapErrorSet[errMsg] = nil
}
if errMsg == "" || !logger.IsDebug() {
return
}
if _, ok := sourcemapErrorSet[errMsg]; !ok {
logger.Debug(errMsg)
sourcemapErrorSet[errMsg] = nil
}
})
}
Expand Down

0 comments on commit df78386

Please sign in to comment.