From 3d497703004b43e0102b6e2dc1691b2ed5c8c706 Mon Sep 17 00:00:00 2001 From: Lee E Hinman <57081003+leehinman@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:27:35 -0600 Subject: [PATCH 1/3] re-enable otel subcommand on Windows (#6068) * move processing windows events earlier in the boot process * add Windows to otel integration tests (cherry picked from commit 8e83ce0a06ec222f6b7e17886af3bd02308cdc1d) --- ...-re-enable-otel-subcommand-on-Windows.yaml | 32 +++++++++++++++++++ internal/pkg/agent/cmd/otel.go | 2 +- internal/pkg/agent/cmd/run.go | 24 +++++++------- internal/pkg/agent/cmd/validate_test.go | 2 -- testing/integration/otel_test.go | 8 ++--- 5 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 changelog/fragments/1731962301-re-enable-otel-subcommand-on-Windows.yaml diff --git a/changelog/fragments/1731962301-re-enable-otel-subcommand-on-Windows.yaml b/changelog/fragments/1731962301-re-enable-otel-subcommand-on-Windows.yaml new file mode 100644 index 00000000000..9fc7207dd3e --- /dev/null +++ b/changelog/fragments/1731962301-re-enable-otel-subcommand-on-Windows.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: enhancement + +# Change summary; a 80ish characters long description of the change. +summary: re-enable otel subcommand on Windows + +# 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: + +# Affected component; a word indicating the component this changeset affects. +component: elastic-agent + +# 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/elastic-agent/pull/6068 + +# 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/elastic/elastic-agent/issues/4976 diff --git a/internal/pkg/agent/cmd/otel.go b/internal/pkg/agent/cmd/otel.go index 8007f9512b8..761353e82dc 100644 --- a/internal/pkg/agent/cmd/otel.go +++ b/internal/pkg/agent/cmd/otel.go @@ -73,7 +73,7 @@ func runCollector(cmdCtx context.Context, configFiles []string) error { stop := make(chan bool) ctx, cancel := context.WithCancel(cmdCtx) - var stopCollector = func() { + stopCollector := func() { close(stop) } diff --git a/internal/pkg/agent/cmd/run.go b/internal/pkg/agent/cmd/run.go index 7cdf1e9db66..21e4c19a28e 100644 --- a/internal/pkg/agent/cmd/run.go +++ b/internal/pkg/agent/cmd/run.go @@ -129,18 +129,6 @@ func run(override cfgOverrider, testingMode bool, fleetInitTimeout time.Duration service.WaitExecutionDone() }() - if err := handleUpgrade(); err != nil { - return fmt.Errorf("error checking for and handling upgrade: %w", err) - } - - locker := filelock.NewAppLocker(paths.Data(), paths.AgentLockFileName) - if err := locker.TryLock(); err != nil { - return err - } - defer func() { - _ = locker.Unlock() - }() - service.BeforeRun() defer service.Cleanup() @@ -154,6 +142,18 @@ func run(override cfgOverrider, testingMode bool, fleetInitTimeout time.Duration defer cancel() go service.ProcessWindowsControlEvents(stopBeat) + if err := handleUpgrade(); err != nil { + return fmt.Errorf("error checking for and handling upgrade: %w", err) + } + + locker := filelock.NewAppLocker(paths.Data(), paths.AgentLockFileName) + if err := locker.TryLock(); err != nil { + return err + } + defer func() { + _ = locker.Unlock() + }() + return runElasticAgent(ctx, cancel, override, stop, testingMode, fleetInitTimeout, modifiers...) } diff --git a/internal/pkg/agent/cmd/validate_test.go b/internal/pkg/agent/cmd/validate_test.go index 2ca2a653dff..ee5066c3c18 100644 --- a/internal/pkg/agent/cmd/validate_test.go +++ b/internal/pkg/agent/cmd/validate_test.go @@ -2,8 +2,6 @@ // 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 !windows - package cmd import ( diff --git a/testing/integration/otel_test.go b/testing/integration/otel_test.go index 03edb8954be..2738d8719c6 100644 --- a/testing/integration/otel_test.go +++ b/testing/integration/otel_test.go @@ -81,7 +81,7 @@ func TestOtelFileProcessing(t *testing.T) { Group: Default, Local: true, OS: []define.OS{ - // input path missing on windows + {Type: define.Windows}, {Type: define.Linux}, {Type: define.Darwin}, }, @@ -301,7 +301,7 @@ func TestOtelLogsIngestion(t *testing.T) { Group: Default, Local: true, OS: []define.OS{ - // input path missing on windows + {Type: define.Windows}, {Type: define.Linux}, {Type: define.Darwin}, }, @@ -598,7 +598,7 @@ func TestFileBeatReceiver(t *testing.T) { Group: Default, Local: true, OS: []define.OS{ - // {Type: define.Windows}, we don't support otel on Windows yet + {Type: define.Windows}, {Type: define.Linux}, {Type: define.Darwin}, }, @@ -703,7 +703,7 @@ func TestOtelFBReceiverE2E(t *testing.T) { Group: Default, Local: true, OS: []define.OS{ - // {Type: define.Windows}, we don't support otel on Windows yet + {Type: define.Windows}, {Type: define.Linux}, {Type: define.Darwin}, }, From 1a2c40d684f1b2703167de35f509f443e624e796 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Thu, 30 Jan 2025 13:36:51 +0100 Subject: [PATCH 2/3] fix: remove some Go build Windows exclusions --- internal/pkg/agent/cmd/otel.go | 2 -- internal/pkg/agent/cmd/otel_flags.go | 2 -- internal/pkg/agent/cmd/otel_flags_test.go | 2 -- internal/pkg/agent/cmd/otel_windows.go | 17 ----------------- internal/pkg/agent/cmd/otel_windows_test.go | 17 ----------------- internal/pkg/agent/cmd/validate.go | 2 -- internal/pkg/otel/components.go | 2 -- internal/pkg/otel/run.go | 2 -- internal/pkg/otel/run_test.go | 2 -- internal/pkg/otel/validate.go | 2 -- 10 files changed, 50 deletions(-) delete mode 100644 internal/pkg/agent/cmd/otel_windows.go delete mode 100644 internal/pkg/agent/cmd/otel_windows_test.go diff --git a/internal/pkg/agent/cmd/otel.go b/internal/pkg/agent/cmd/otel.go index 761353e82dc..36788b265bf 100644 --- a/internal/pkg/agent/cmd/otel.go +++ b/internal/pkg/agent/cmd/otel.go @@ -2,8 +2,6 @@ // 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 !windows - package cmd import ( diff --git a/internal/pkg/agent/cmd/otel_flags.go b/internal/pkg/agent/cmd/otel_flags.go index 8cf66dd5e14..57cae05884e 100644 --- a/internal/pkg/agent/cmd/otel_flags.go +++ b/internal/pkg/agent/cmd/otel_flags.go @@ -2,8 +2,6 @@ // 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 !windows - package cmd import ( diff --git a/internal/pkg/agent/cmd/otel_flags_test.go b/internal/pkg/agent/cmd/otel_flags_test.go index e1fc06bb63d..24fe30e2afd 100644 --- a/internal/pkg/agent/cmd/otel_flags_test.go +++ b/internal/pkg/agent/cmd/otel_flags_test.go @@ -2,8 +2,6 @@ // 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 !windows - package cmd import ( diff --git a/internal/pkg/agent/cmd/otel_windows.go b/internal/pkg/agent/cmd/otel_windows.go deleted file mode 100644 index d914ab1c963..00000000000 --- a/internal/pkg/agent/cmd/otel_windows.go +++ /dev/null @@ -1,17 +0,0 @@ -// 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 windows - -package cmd - -import ( - "github.com/spf13/cobra" - - "github.com/elastic/elastic-agent/internal/pkg/cli" -) - -func newOtelCommandWithArgs(args []string, streams *cli.IOStreams) *cobra.Command { - return nil -} diff --git a/internal/pkg/agent/cmd/otel_windows_test.go b/internal/pkg/agent/cmd/otel_windows_test.go deleted file mode 100644 index 0c12c121576..00000000000 --- a/internal/pkg/agent/cmd/otel_windows_test.go +++ /dev/null @@ -1,17 +0,0 @@ -// 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 windows - -package cmd - -import ( - "testing" - - "github.com/stretchr/testify/require" -) - -func TestOtelCommandIsNil(t *testing.T) { - require.Nil(t, newOtelCommandWithArgs(nil, nil)) -} diff --git a/internal/pkg/agent/cmd/validate.go b/internal/pkg/agent/cmd/validate.go index e5f049be855..098c50dba17 100644 --- a/internal/pkg/agent/cmd/validate.go +++ b/internal/pkg/agent/cmd/validate.go @@ -2,8 +2,6 @@ // 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 !windows - package cmd import ( diff --git a/internal/pkg/otel/components.go b/internal/pkg/otel/components.go index 1b768cc2d8a..f637bd6bad9 100644 --- a/internal/pkg/otel/components.go +++ b/internal/pkg/otel/components.go @@ -2,8 +2,6 @@ // 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 !windows - package otel import ( diff --git a/internal/pkg/otel/run.go b/internal/pkg/otel/run.go index b25a2dd99b1..d53a3157a02 100644 --- a/internal/pkg/otel/run.go +++ b/internal/pkg/otel/run.go @@ -2,8 +2,6 @@ // 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 !windows - package otel import ( diff --git a/internal/pkg/otel/run_test.go b/internal/pkg/otel/run_test.go index 1ab5594e82a..2f703f00226 100644 --- a/internal/pkg/otel/run_test.go +++ b/internal/pkg/otel/run_test.go @@ -2,8 +2,6 @@ // 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 !windows - package otel import ( diff --git a/internal/pkg/otel/validate.go b/internal/pkg/otel/validate.go index 543d9aad9f6..ba7db995148 100644 --- a/internal/pkg/otel/validate.go +++ b/internal/pkg/otel/validate.go @@ -2,8 +2,6 @@ // 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 !windows - package otel import ( From ec4a81b67b84b12f528be7e261bcb8124d908090 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Thu, 30 Jan 2025 14:39:03 +0100 Subject: [PATCH 3/3] fix: bump golangci-lint to v1.61.0 to get support for Go v1.22 --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 8feed628a2a..57ab249ef5b 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -28,7 +28,7 @@ jobs: uses: golangci/golangci-lint-action@v6 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.55.2 + version: v1.61.0 # Give the job more time to execute. # Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,