Merge remote-tracking branch 'upstream/main' into tests/ephemeral-ports-toctou

Resolve conflict in otel_filebeat_input_test.go: adopt upstream's refactor
that factors the shared `service:` block into the otelElasticsearchServiceYAML
constant, and drop the now-redundant `telemetry.metrics.level: none` block from
that constant. Metrics-off is applied centrally in oteltestcol.New (merged on
top of every test config), so the per-config block this branch removed in
6b02d5e must stay removed in the shared helper too.

Author: orestisfl

NOTICE.txt

@@ -10798,11 +10798,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.45.0
+Version: v0.46.1
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.45.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.46.1/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

changelog/fragments/1783957443-statestore-atomic-create-meta.json.yaml

@@ -0,0 +1,7 @@
+kind: bug-fix
+
+summary: Prevent statestore startup failure when meta.json is left empty after an unclean shutdown
+
+component: libbeat
+
+pr: https://github.com/elastic/beats/pull/51897

changelog/fragments/1784030419-update-elastic-agent-libs-to-v0.46.1.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: update elastic-agent-libs to v0.46.1
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+description: Fixed an issue where malformed TLS keys could be printed in the error logs during loading failures.
+
+# Affected component; a word indicating the component this changeset affects.
+component: all
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/beats/pull/51921
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234

filebeat/beater/filebeat.go

@@ -312,6 +312,7 @@ func (fb *Filebeat) Run(b *beat.Beat) error {
 	// Start the check-in loop, so Filebeat can respond to Elastic Agent,
 	// but it won't start any inputs/output
 	if err := b.Manager.PreInit(); err != nil {
+		fb.runReady.Close()
 		return err
 	}
 

filebeat/beater/stop_test.go

@@ -18,12 +18,61 @@
 package beater
 
 import (
+	"errors"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/beats/v7/filebeat/fileset"
+	"github.com/elastic/beats/v7/libbeat/beat"
+	"github.com/elastic/beats/v7/libbeat/beatmonitoring"
+	"github.com/elastic/beats/v7/libbeat/management"
 	"github.com/elastic/elastic-agent-libs/logp"
 )
 
+// TestRunClosesRunReadyOnPreInitFailure guards against the regression in
+// commit 00068f7 where the defer fb.runReady.Close() was placed after the
+// PreInit call, leaving runReady unclosed when PreInit fails.  An unclosed
+// runReady causes StopWithContext to wait the full five-second timeout.
+func TestRunClosesRunReadyOnPreInitFailure(t *testing.T) {
+	preInitErr := errors.New("preinit failed")
+	fb := &Filebeat{
+		done:           make(chan struct{}),
+		runReady:       &closeOnce{ch: make(chan struct{})},
+		logger:         logp.NewNopLogger(),
+		moduleRegistry: new(fileset.ModuleRegistry),
+	}
+	b := &beat.Beat{
+		Info:       beat.Info{Logger: logp.NewNopLogger()},
+		Manager:    &preinitFailManager{err: preInitErr},
+		Monitoring: beatmonitoring.NewMonitoring(),
+	}
+
+	err := fb.Run(b)
+	require.ErrorIs(t, err, preInitErr)
+
+	select {
+	case <-fb.runReady.ch:
+		// runReady was closed — StopWithContext will not block
+	default:
+		t.Fatal("runReady was not closed after PreInit failure; StopWithContext would wait five seconds")
+	}
+}
+
+// preinitFailManager is a management.Manager stub whose PreInit returns an
+// error.  Only the methods called by Run before PreInit are implemented; any
+// other call panics, catching unexpected code paths during the test.
+type preinitFailManager struct {
+	management.Manager // zero-valued; panics on any unimplemented method
+	err                error
+}
+
+func (m *preinitFailManager) Enabled() bool  { return true }
+func (m *preinitFailManager) PreInit() error { return m.err }
+func (m *preinitFailManager) RegisterDiagnosticHook(_, _, _, _ string, _ management.DiagnosticHook) {
+}
+
 // TestStopWaitsForRunReady proves that Stop does not close the done channel
 // until Run has closed runReady (i.e., reached waitFinished.Wait).
 // This guards against a race where the OTel collector calls Shutdown before

…at/input/file/identifier_test_windows.go …at/input/file/identifier_windows_test.gofilebeat/input/file/identifier_test_windows.go renamed to filebeat/input/file/identifier_windows_test.go filebeat/input/file/identifier_test_windows.go renamed to filebeat/input/file/identifier_windows_test.go

@@ -22,24 +22,26 @@ package filestream
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/elastic/elastic-agent-libs/logp/logptest"
 )
 
 // these tests are separated as one cannot delete/rename files
 // while another process is working with it on Windows
 func TestLogFileRenamed(t *testing.T) {
-	f := createTestLogFile()
+	f := createTestLogFile(t)
 	defer f.Close()
 
 	renamedFile := f.Name() + ".renamed"
 
 	reader, _, err := newFileReader(
-		logptest.NewTestingLogger(t, ""),
+		logptest.NewFileLogger(t, filepath.Join("..", "..", "build", "integration-tests")).Logger,
 		context.TODO(),
 		f,
 		readerConfig{},
@@ -57,7 +59,7 @@ func TestLogFileRenamed(t *testing.T) {
 
 	buf := make([]byte, 1024)
 	_, err = reader.Read(buf)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	err = os.Rename(f.Name(), renamedFile)
 	if err != nil {
@@ -71,11 +73,11 @@ func TestLogFileRenamed(t *testing.T) {
 }
 
 func TestLogFileRemoved(t *testing.T) {
-	f := createTestLogFile()
+	f := createTestLogFile(t)
 	defer f.Close()
 
 	reader, _, err := newFileReader(
-		logptest.NewTestingLogger(t, ""),
+		logptest.NewFileLogger(t, filepath.Join("..", "..", "build", "integration-tests")).Logger,
 		context.TODO(),
 		f,
 		readerConfig{},
@@ -93,7 +95,7 @@ func TestLogFileRemoved(t *testing.T) {
 
 	buf := make([]byte, 1024)
 	_, err = reader.Read(buf)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	err = os.Remove(f.Name())
 	if err != nil {
@@ -104,3 +106,16 @@ func TestLogFileRemoved(t *testing.T) {
 
 	assert.Equal(t, ErrClosed, err)
 }
+
+// createTestLogFile creates a temporary plain-text log file with a few lines of
+// content, wrapped as a filestream File ready to be passed to newFileReader.
+func createTestLogFile(t *testing.T) File {
+	t.Helper()
+	fs := filestream{
+		readerConfig: readerConfig{BufferSize: 512},
+		compression:  CompressionNone,
+	}
+	f, err := fs.newFile(createTestPlainLogFile(t))
+	require.NoError(t, err, "could not create test log file")
+	return f
+}