Skip to content

Commit

Permalink
[chore][pkg/stanza] Cleanup keyvalue parser operator files (open-tele…
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed Apr 4, 2024
1 parent 5385fb0 commit 5c7e342
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@
package keyvalue // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/keyvalue"

import (
"context"
"errors"
"fmt"

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/parseutils"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper"
)
Expand Down Expand Up @@ -69,38 +65,3 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
pairDelimiter: pairDelimiter,
}, nil
}

// Parser is an operator that parses key value pairs.
type Parser struct {
helper.ParserOperator
delimiter string
pairDelimiter string
}

// Process will parse an entry for key value pairs.
func (kv *Parser) Process(ctx context.Context, entry *entry.Entry) error {
return kv.ParserOperator.ProcessWith(ctx, entry, kv.parse)
}

// parse will parse a value as key values.
func (kv *Parser) parse(value any) (any, error) {
switch m := value.(type) {
case string:
return kv.parser(m, kv.delimiter, kv.pairDelimiter)
default:
return nil, fmt.Errorf("type %T cannot be parsed as key value pairs", value)
}
}

func (kv *Parser) parser(input string, delimiter string, pairDelimiter string) (map[string]any, error) {
if input == "" {
return nil, fmt.Errorf("parse from field %s is empty", kv.ParseFrom.String())
}

pairs, err := parseutils.SplitString(input, pairDelimiter)
if err != nil {
return nil, fmt.Errorf("failed to parse pairs from input: %w", err)
}

return parseutils.ParseKeyValuePairs(pairs, delimiter)
}
48 changes: 48 additions & 0 deletions pkg/stanza/operator/parser/keyvalue/parser.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package keyvalue // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/keyvalue"

import (
"context"
"fmt"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/parseutils"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper"
)

// Parser is an operator that parses key value pairs.
type Parser struct {
helper.ParserOperator
delimiter string
pairDelimiter string
}

// Process will parse an entry for key value pairs.
func (p *Parser) Process(ctx context.Context, entry *entry.Entry) error {
return p.ParserOperator.ProcessWith(ctx, entry, p.parse)
}

// parse will parse a value as key values.
func (p *Parser) parse(value any) (any, error) {
switch m := value.(type) {
case string:
return p.parser(m, p.delimiter, p.pairDelimiter)
default:
return nil, fmt.Errorf("type %T cannot be parsed as key value pairs", value)
}
}

func (p *Parser) parser(input string, delimiter string, pairDelimiter string) (map[string]any, error) {
if input == "" {
return nil, fmt.Errorf("parse from field %s is empty", p.ParseFrom.String())
}

pairs, err := parseutils.SplitString(input, pairDelimiter)
if err != nil {
return nil, fmt.Errorf("failed to parse pairs from input: %w", err)
}

return parseutils.ParseKeyValuePairs(pairs, delimiter)
}

0 comments on commit 5c7e342

Please sign in to comment.