Merge branch 'main' into revert-816-force

.buildkite/integration.pipeline.yml

@@ -106,7 +106,7 @@ steps:
     key: "k8s-integration-tests"
     env:
       K8S_VERSION: "v1.31.0"
-      KIND_VERSION: "v0.20.0"
+      KIND_VERSION: "v0.24.0"
     command: ".buildkite/scripts/steps/k8s-extended-tests.sh"
     artifact_paths:
       - "build/k8s-logs*/*"

.buildkite/pipeline.yml

@@ -184,7 +184,7 @@ steps:
       - label: "K8s tests: {{matrix.k8s_version}}"
         env:
           K8S_VERSION: "v{{matrix.k8s_version}}"
-          KIND_VERSION: "v0.20.0"
+          KIND_VERSION: "v0.24.0"
         command: ".buildkite/scripts/steps/k8s-tests.sh"
         agents:
           provider: "gcp"

internal/pkg/agent/application/monitoring/handler.go

@@ -48,7 +48,7 @@ func (h *apiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		}
 
-		writeResponse(w, unexpectedErrorWithReason(err.Error()))
+		writeResponse(w, unexpectedErrorWithReason("%s", err.Error()))
 	}
 }
 

internal/pkg/agent/vault/aesgcm/aesgcm_test.go

@@ -173,12 +173,12 @@ func TestEncryptDecryptHex(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			enc, err := EncryptHex(tc.key, tc.data)
 			if !errors.Is(tc.err, err) {
-				t.Fatalf(cmp.Diff(tc.err, err))
+				t.Fatal(cmp.Diff(tc.err, err))
 			}
 
 			dec, err := DecryptHex(tc.key, enc)
 			if !errors.Is(tc.err, err) {
-				t.Fatalf(cmp.Diff(tc.err, err))
+				t.Fatal(cmp.Diff(tc.err, err))
 			}
 
 			if len(tc.data) == 0 {

internal/pkg/cli/confirm.go

@@ -22,14 +22,14 @@ func Confirm(prompt string, def bool) (bool, error) {
 }
 
 func confirm(r io.Reader, out io.Writer, prompt string, def bool) (bool, error) {
-	options := " [Y/n]"
+	options := "[Y/n]"
 	if !def {
-		options = " [y/N]"
+		options = "[y/N]"
 	}
 
 	reader := bufio.NewScanner(r)
 	for {
-		fmt.Fprintf(out, prompt+options+":")
+		fmt.Fprintf(out, "%s %s:", prompt, options)
 
 		if !reader.Scan() {
 			break

internal/pkg/cli/input.go

@@ -20,7 +20,7 @@ func ReadInput(prompt string) (string, error) {
 
 func input(r io.Reader, out io.Writer, prompt string) (string, error) {
 	reader := bufio.NewScanner(r)
-	fmt.Fprintf(out, prompt+" ")
+	fmt.Fprintf(out, "%s ", prompt)
 
 	if !reader.Scan() {
 		return "", errors.New("error reading user input")

internal/pkg/otel/README.md

@@ -29,12 +29,12 @@ This section provides a summary of components included in the Elastic Distributi
 
 | Component | Version |
 |---|---|
-| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/jaegerreceiver/v0.109.0/receiver/jaegerreceiver/README.md) | v0.109.0 |
+| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/jaegerreceiver/v0.110.0/receiver/jaegerreceiver/README.md) | v0.110.0 |
 | [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.109.0/receiver/prometheusreceiver/README.md) | v0.109.0 |
-| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.109.0/receiver/zipkinreceiver/README.md) | v0.109.0 |
-| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.109.0/receiver/filelogreceiver/README.md) | v0.109.0 |
+| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.110.0/receiver/zipkinreceiver/README.md) | v0.110.0 |
+| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.110.0/receiver/filelogreceiver/README.md) | v0.110.0 |
 | [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/hostmetricsreceiver/v0.109.0/receiver/hostmetricsreceiver/README.md) | v0.109.0 |
-| [httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/httpcheckreceiver/v0.109.0/receiver/httpcheckreceiver/README.md) | v0.109.0 |
+| [httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/httpcheckreceiver/v0.110.0/receiver/httpcheckreceiver/README.md) | v0.110.0 |
 | [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sclusterreceiver/v0.109.0/receiver/k8sclusterreceiver/README.md) | v0.109.0 |
 | [k8sobjectsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sobjectsreceiver/v0.109.0/receiver/k8sobjectsreceiver/README.md) | v0.109.0 |
 | [kubeletstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/kubeletstatsreceiver/v0.109.0/receiver/kubeletstatsreceiver/README.md) | v0.109.0 |
@@ -44,33 +44,33 @@ This section provides a summary of components included in the Elastic Distributi
 
 | Component | Version |
 |---|---|
-| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.109.0/exporter/elasticsearchexporter/README.md) | v0.109.0 |
-| [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.109.0/exporter/fileexporter/README.md) | v0.109.0 |
-| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.109.0/exporter/debugexporter/README.md) | v0.109.0 |
+| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.110.0/exporter/elasticsearchexporter/README.md) | v0.110.0 |
+| [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.110.0/exporter/fileexporter/README.md) | v0.110.0 |
+| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.110.0/exporter/debugexporter/README.md) | v0.110.0 |
 | [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlpexporter/v0.109.0/exporter/otlpexporter/README.md) | v0.109.0 |
 | [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlphttpexporter/v0.109.0/exporter/otlphttpexporter/README.md) | v0.109.0 |
 
 ### Processors
 
 | Component | Version |
 |---|---|
-| [elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elasticinframetricsprocessor/v0.11.0/processor/elasticinframetricsprocessor/README.md) | v0.11.0 |
+| [elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elasticinframetricsprocessor/v0.12.0/processor/elasticinframetricsprocessor/README.md) | v0.12.0 |
 | [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/memorylimiterprocessor/v0.109.0/processor/memorylimiterprocessor/README.md) | v0.109.0 |
-| [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/attributesprocessor/v0.109.0/processor/attributesprocessor/README.md) | v0.109.0 |
-| [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/filterprocessor/v0.109.0/processor/filterprocessor/README.md) | v0.109.0 |
+| [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/attributesprocessor/v0.110.0/processor/attributesprocessor/README.md) | v0.110.0 |
+| [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/filterprocessor/v0.110.0/processor/filterprocessor/README.md) | v0.110.0 |
 | [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/k8sattributesprocessor/v0.109.0/processor/k8sattributesprocessor/README.md) | v0.109.0 |
-| [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourcedetectionprocessor/v0.109.0/processor/resourcedetectionprocessor/README.md) | v0.109.0 |
-| [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourceprocessor/v0.109.0/processor/resourceprocessor/README.md) | v0.109.0 |
-| [transformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/transformprocessor/v0.109.0/processor/transformprocessor/README.md) | v0.109.0 |
-| [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/batchprocessor/v0.109.0/processor/batchprocessor/README.md) | v0.109.0 |
+| [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourcedetectionprocessor/v0.110.0/processor/resourcedetectionprocessor/README.md) | v0.110.0 |
+| [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourceprocessor/v0.110.0/processor/resourceprocessor/README.md) | v0.110.0 |
+| [transformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/transformprocessor/v0.110.0/processor/transformprocessor/README.md) | v0.110.0 |
+| [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/batchprocessor/v0.110.0/processor/batchprocessor/README.md) | v0.110.0 |
 
 ### Extensions
 
 | Component | Version |
 |---|---|
-| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.109.0/extension/healthcheckextension/README.md) | v0.109.0 |
-| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.109.0/extension/pprofextension/README.md) | v0.109.0 |
-| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.109.0/extension/storage/filestorage/README.md) | v0.109.0 |
+| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.110.0/extension/healthcheckextension/README.md) | v0.110.0 |
+| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.110.0/extension/pprofextension/README.md) | v0.110.0 |
+| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.110.0/extension/storage/filestorage/README.md) | v0.110.0 |
 | [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.109.0/extension/memorylimiterextension/README.md) | v0.109.0 |
 
 ### Connectors

pkg/control/v1/client/client.go

@@ -7,7 +7,7 @@ package client
 import (
 	"context"
 	"encoding/json"
-	"fmt"
+	"errors"
 	"sync"
 	"time"
 
@@ -165,7 +165,7 @@ func (c *client) Restart(ctx context.Context) error {
 		return err
 	}
 	if res.Status == proto.ActionStatus_V1_FAILURE {
-		return fmt.Errorf(res.Error)
+		return errors.New(res.Error)
 	}
 	return nil
 }
@@ -180,7 +180,7 @@ func (c *client) Upgrade(ctx context.Context, version string, sourceURI string)
 		return "", err
 	}
 	if res.Status == proto.ActionStatus_V1_FAILURE {
-		return "", fmt.Errorf(res.Error)
+		return "", errors.New(res.Error)
 	}
 	return res.Version, nil
 }

pkg/control/v2/client/client.go

@@ -295,7 +295,7 @@ func (c *client) Restart(ctx context.Context) error {
 		return err
 	}
 	if res.Status == cproto.ActionStatus_FAILURE {
-		return fmt.Errorf(res.Error)
+		return errors.New(res.Error)
 	}
 	return nil
 }
@@ -313,7 +313,7 @@ func (c *client) Upgrade(ctx context.Context, version string, sourceURI string,
 		return "", err
 	}
 	if res.Status == cproto.ActionStatus_FAILURE {
-		return "", fmt.Errorf(res.Error)
+		return "", errors.New(res.Error)
 	}
 	return res.Version, nil
 }

pkg/testing/multipass/provisioner.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -208,7 +209,7 @@ func (p *provisioner) ensureInstanceNotExist(ctx context.Context, batch common.O
 		p.logger.Logf(msg)
 		p.logger.Logf("output: %s", output.String())
 		p.logger.Logf("stderr: %s", stdErr.String())
-		return fmt.Errorf(msg)
+		return errors.New(msg)
 	}
 	list := struct {
 		List []struct {
@@ -248,7 +249,7 @@ func (p *provisioner) ensureInstanceNotExist(ctx context.Context, batch common.O
 				p.logger.Logf(msg)
 				p.logger.Logf("output: %s", output.String())
 				p.logger.Logf("stderr: %s", stdErr.String())
-				return fmt.Errorf(msg)
+				return errors.New(msg)
 			}
 
 			break