Merge branch 'main' into dependabot/go_modules/github.com/elastic/elastic-agent-client/v7-7.10.0

michel-laterman · web-flow · commit 0c8a82de4cba · 2024-06-03T07:54:08.000-07:00
diff --git a/internal/pkg/otel/run_test.go b/internal/pkg/otel/run_test.go
@@ -49,7 +49,7 @@ func TestStartCollector(t *testing.T) {
 			if tc.expectedErrorMessage == "" {
 				assert.Eventually(t, func() bool {
 					return otelcol.StateRunning == collector.GetState()
-				}, 2*time.Second, 200*time.Millisecond)
+				}, 10*time.Second, 200*time.Millisecond)
 			}
 			collector.Shutdown()
 			wg.Wait()
diff --git a/internal/pkg/remote/config.go b/internal/pkg/remote/config.go
@@ -13,7 +13,7 @@ import (
 
 // Config is the configuration for the client.
 type Config struct {
-	Protocol Protocol `config:"protocol" yaml:"protocol"`
+	Protocol Protocol `config:"protocol" yaml:"protocol,omitempty"`
 	SpaceID  string   `config:"space.id" yaml:"space.id,omitempty"`
 	Path     string   `config:"path" yaml:"path,omitempty"`
 	Host     string   `config:"host" yaml:"host,omitempty"`
diff --git a/testing/integration/proxy_url_test.go b/testing/integration/proxy_url_test.go

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func TestStartCollector(t *testing.T) {`
`49`	`49`	`if tc.expectedErrorMessage == "" {`
`50`	`50`	`assert.Eventually(t, func() bool {`
`51`	`51`	`return otelcol.StateRunning == collector.GetState()`
`52`		`- }, 2time.Second, 200time.Millisecond)`
	`52`	`+ }, 10time.Second, 200time.Millisecond)`
`53`	`53`	`}`
`54`	`54`	`collector.Shutdown()`
`55`	`55`	`wg.Wait()`