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

[fbreceivier] inject log level #42798

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
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
6 changes: 6 additions & 0 deletions libbeat/otelbeat/beatconverter/beatconverter.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ func (c converter) Convert(_ context.Context, conf *confmap.Conf) error {
beatReceiverConfigKey + "::output::otelconsumer": nil,
}

// inject log level
level, _ := config.MustNewConfigFrom(receiverCfg.ToStringMap()).String("logging.level", -1)
Copy link
Member

Choose a reason for hiding this comment

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

[Blocker]
Please, don't panic.
use the right method and handle the error gracefully

Suggested change
level, _ := config.MustNewConfigFrom(receiverCfg.ToStringMap()).String("logging.level", -1)
cfg, err := config.NewConfigFrom(receiverCfg.ToStringMap())
if err!=nil{
return fmt.Errorf("proper error message: %w", err)
}
level, err:=cfg.String("logging.level", -1)
if err!=nil{
return fmt.Errorf("proper error message: %w", err)
}```

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we should be good now.

if level != "" {
out["service::telemetry::logs::level"] = getOTeLLogLevel(level)
}

err = conf.Merge(confmap.NewFromStringMap(out))
if err != nil {
return err
Expand Down
35 changes: 35 additions & 0 deletions libbeat/otelbeat/beatconverter/logging.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Licensed to Elasticsearch B.V. under one or more contributor
// license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright
// ownership. Elasticsearch B.V. licenses this file to you under
// the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package beatconverter

import "strings"

func getOTeLLogLevel(level string) string {
switch strings.ToLower(level) {
case "debug":
return "DEBUG"
case "info":
return "INFO"
case "warning":
return "WARN"
case "error", "critical":
return "ERROR"
default:
return ""
}
}
Loading