Merge branch 'main' into dependabot/go_modules/github.com/elastic/ela…

…stic-agent-client/v7-7.10.0
elastic · Jun 3, 2024 · 0c8a82d · 0c8a82d
2 parents 93ce008 + 6573c38
commit 0c8a82d
Show file tree

Hide file tree

Showing 3 changed files with 381 additions and 398 deletions.
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"`