[receiver/podman] remove duplicate Timeout setting

.chloggen/codeboten_rm-dupe-podman.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: podmanreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Removes duplicate `Timeout` field. This change has no impact on end users of the component."
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [26083]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

receiver/podmanreceiver/config.go

@@ -5,7 +5,6 @@ package podmanreceiver // import "github.com/open-telemetry/opentelemetry-collec
 
 import (
 	"errors"
-	"time"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configopaque"
@@ -20,9 +19,6 @@ type Config struct {
 	// The URL of the podman server.  Default is "unix:///run/podman/podman.sock"
 	Endpoint string `mapstructure:"endpoint"`
 
-	// The maximum amount of time to wait for Podman API responses.  Default is 5s
-	Timeout time.Duration `mapstructure:"timeout"`
-
 	APIVersion    string              `mapstructure:"api_version"`
 	SSHKey        string              `mapstructure:"ssh_key"`
 	SSHPassphrase configopaque.String `mapstructure:"ssh_passphrase"`

receiver/podmanreceiver/config_test.go

@@ -38,7 +38,6 @@ func TestLoadConfig(t *testing.T) {
 				},
 				APIVersion: defaultAPIVersion,
 				Endpoint:   "unix:///run/podman/podman.sock",
-				Timeout:    5 * time.Second,
 			},
 		},
 		{
@@ -51,7 +50,6 @@ func TestLoadConfig(t *testing.T) {
 				},
 				APIVersion: defaultAPIVersion,
 				Endpoint:   "http://example.com/",
-				Timeout:    20 * time.Second,
 			},
 		},
 	}

receiver/podmanreceiver/factory.go

@@ -34,7 +34,6 @@ func createDefaultConfig() *Config {
 	return &Config{
 		ScraperControllerSettings: cfg,
 		Endpoint:                  "unix:///run/podman/podman.sock",
-		Timeout:                   5 * time.Second,
 		APIVersion:                defaultAPIVersion,
 	}
 }

receiver/podmanreceiver/libpod_client_test.go

@@ -62,8 +62,6 @@ func TestStats(t *testing.T) {
 
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		// default timeout
-		Timeout: 5 * time.Second,
 	}
 
 	cli, err := newLibpodClient(zap.NewNop(), config)
@@ -120,8 +118,6 @@ func TestStatsError(t *testing.T) {
 
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		// default timeout
-		Timeout: 5 * time.Second,
 	}
 
 	cli, err := newLibpodClient(zap.NewNop(), config)
@@ -156,8 +152,6 @@ func TestList(t *testing.T) {
 
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		// default timeout
-		Timeout: 5 * time.Second,
 	}
 
 	cli, err := newLibpodClient(zap.NewNop(), config)
@@ -229,8 +223,6 @@ func TestEvents(t *testing.T) {
 
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		// default timeout
-		Timeout: 5 * time.Second,
 	}
 
 	cli, err := newLibpodClient(zap.NewNop(), config)

receiver/podmanreceiver/podman_test.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
@@ -70,7 +71,9 @@ func TestWatchingTimeouts(t *testing.T) {
 
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		Timeout:  50 * time.Millisecond,
+		ScraperControllerSettings: scraperhelper.ScraperControllerSettings{
+			Timeout: 50 * time.Millisecond,
+		},
 	}
 
 	client, err := newLibpodClient(zap.NewNop(), config)
@@ -118,7 +121,9 @@ func TestEventLoopHandlesError(t *testing.T) {
 	observed, logs := observer.New(zapcore.WarnLevel)
 	config := &Config{
 		Endpoint: fmt.Sprintf("unix://%s", addr),
-		Timeout:  50 * time.Millisecond,
+		ScraperControllerSettings: scraperhelper.ScraperControllerSettings{
+			Timeout: 50 * time.Millisecond,
+		},
 	}
 
 	client, err := newLibpodClient(zap.NewNop(), config)