[chore] update contrib to make compatible with core

open-telemetry · Apr 21, 2024 · dde09d4 · dde09d4
1 parent 6f844ed
commit dde09d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/stanza/operator/input/tcp/config.go b/pkg/stanza/operator/input/tcp/config.go
@@ -140,7 +140,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
 	}
 
 	if c.TLS != nil {
-		tcpInput.tls, err = c.TLS.LoadTLSConfig(context.Background())
+		tcpInput.tls, err = c.TLS.LoadTLSConfigContext(context.Background())
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/stanza/operator/parser/time/config.go b/pkg/stanza/operator/parser/time/config.go
@@ -4,6 +4,7 @@
 package time // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/time"
 
 import (
+	"go.opentelemetry.io/collector/confmap"
 	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
@@ -35,6 +36,10 @@ type Config struct {
 	helper.TimeParser        `mapstructure:",omitempty,squash"`
 }
 
+func (c *Config) Unmarshal(component *confmap.Conf) error {
+	return component.Unmarshal(c, confmap.WithIgnoreUnused())
+}
+
 // Build will build a time parser operator.
 func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
 	transformerOperator, err := c.TransformerConfig.Build(logger)