Bump up github.com/go-viper/mapstructure/v2 dependency (#8764)

* Bump up github.com/go-viper/mapstructure/v2 dependency

* Update unit tests

* Update unit tests

(cherry picked from commit 676e18d)

# Conflicts:
#	NOTICE-fips.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/run_nofips_test.go

Author: ycombinator

NOTICE-fips.txt

@@ -3862,11 +3862,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/go-viper/mapstructure/v2
-Version: v2.2.1
+Version: v2.3.0
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.2.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.3.0/LICENSE:
 
 The MIT License (MIT)
 

NOTICE.txt

@@ -31,8 +31,13 @@ require (
 	github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0
 	github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.3.0
 	github.com/fatih/color v1.18.0
+<<<<<<< HEAD
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-viper/mapstructure/v2 v2.2.1
+=======
+	github.com/fsnotify/fsnotify v1.9.0
+	github.com/go-viper/mapstructure/v2 v2.3.0
+>>>>>>> 676e18de4 (Bump up github.com/go-viper/mapstructure/v2 dependency (#8764))
 	github.com/gofrs/flock v0.12.1
 	github.com/gofrs/uuid/v5 v5.2.0
 	github.com/google/go-cmp v0.7.0

go.mod

@@ -616,10 +616,17 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+<<<<<<< HEAD
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
+=======
+github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-zookeeper/zk v1.0.4 h1:DPzxraQx7OrPyXq2phlGlNSIyWEsAox0RJmjTseMV6I=
+github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
+>>>>>>> 676e18de4 (Bump up github.com/go-viper/mapstructure/v2 dependency (#8764))
 github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU=
 github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs=
 github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0=

go.sum

@@ -0,0 +1,55 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License 2.0;
+// you may not use this file except in compliance with the Elastic License 2.0.
+
+//go:build !requirefips
+
+package otel
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/otelcol"
+)
+
+func TestStartCollector(t *testing.T) {
+	testCases := []struct {
+		configFile           string
+		expectedErrorMessage string
+	}{
+		{
+			configFile:           "all-components.yml",
+			expectedErrorMessage: "", // empty string means no error is expected
+		},
+		{
+			configFile:           "nonexistent-component.yml",
+			expectedErrorMessage: `'extensions' unknown type: "zpages"`,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.configFile, func(t *testing.T) {
+			configFiles := getConfigFiles(tc.configFile)
+			settings := NewSettings("test", configFiles)
+
+			collector, err := otelcol.NewCollector(*settings)
+			require.NoError(t, err)
+			require.NotNil(t, collector)
+
+			wg := startCollector(context.Background(), t, collector, tc.expectedErrorMessage)
+
+			if tc.expectedErrorMessage == "" {
+				assert.Eventually(t, func() bool {
+					return otelcol.StateRunning == collector.GetState()
+				}, 10*time.Second, 200*time.Millisecond)
+			}
+			collector.Shutdown()
+			wg.Wait()
+			assert.Equal(t, otelcol.StateClosed, collector.GetState())
+		})
+	}
+}

internal/pkg/otel/run_nofips_test.go

@@ -5,7 +5,7 @@
 package component
 
 import (
-	"errors"
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -16,15 +16,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/elastic/go-ucfg"
-
 	"github.com/elastic/elastic-agent-client/v7/pkg/client"
 	"github.com/elastic/elastic-agent-client/v7/pkg/proto"
 	"github.com/elastic/elastic-agent-libs/logp"
-
 	"github.com/elastic/elastic-agent/internal/pkg/agent/transpiler"
 	"github.com/elastic/elastic-agent/internal/pkg/eql"
+	"github.com/elastic/go-ucfg"
 
+	"github.com/go-viper/mapstructure/v2"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -659,7 +658,7 @@ func TestToComponents(t *testing.T) {
 							ID:       "filestream-default-filestream-1",
 							Type:     client.UnitTypeInput,
 							LogLevel: defaultUnitLogLevel,
-							Err:      fmt.Errorf("decoding error: %w", fmt.Errorf("decoding failed due to the following error(s):\n\n%w", errors.Join(errors.New("'meta' expected a map, got 'slice'")))),
+							Err:      fmt.Errorf("decoding error: %w", makeMapStructureErr(t)),
 						},
 					},
 				},
@@ -747,7 +746,7 @@ func TestToComponents(t *testing.T) {
 							ID:       "cloudbeat-default-cloudbeat-1-unit",
 							Type:     client.UnitTypeInput,
 							LogLevel: defaultUnitLogLevel,
-							Err:      fmt.Errorf("decoding error: %w", fmt.Errorf("decoding failed due to the following error(s):\n\n%w", errors.Join(errors.New("'meta' expected a map, got 'slice'")))),
+							Err:      fmt.Errorf("decoding error: %w", makeMapStructureErr(t)),
 						},
 					},
 				},
@@ -2945,3 +2944,18 @@ func TestFlattenedDataStreamIsolatedUnits(t *testing.T) {
 		}
 	}
 }
+
+func makeMapStructureErr(t *testing.T) error {
+	t.Helper()
+
+	jsonStr := `{ "meta": [] }`
+
+	var data map[string]interface{}
+	err := json.Unmarshal([]byte(jsonStr), &data)
+	require.NoError(t, err)
+
+	var output struct {
+		Meta struct{} `mapstructure:"meta"`
+	}
+	return mapstructure.Decode(data, &output)
+}

pkg/component/component_test.go

@@ -183,7 +183,7 @@ func TestExpectedConfig(t *testing.T) {
 					},
 				},
 			},
-			Err: errors.New("decoding error: decoding failed due to the following error(s):\n\n'meta' expected a map, got 'slice'"),
+			Err: errors.New("decoding error: decoding failed due to the following error(s):\n\n'meta' expected a map or struct, got \"slice\""),
 		},
 	}