Merge branch 'main' into bug/single-callback-k8sresolver

.github/CODEOWNERS

@@ -71,8 +71,8 @@ exporter/lokiexporter/                            @open-telemetry/collector-cont
 exporter/mezmoexporter/                           @open-telemetry/collector-contrib-approvers @dashpole @billmeyer @gjanco
 exporter/opencensusexporter/                      @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
 exporter/otelarrowexporter/                       @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3 @lquerel
-exporter/prometheusexporter/                      @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
-exporter/prometheusremotewriteexporter/           @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil @dashpole
+exporter/prometheusexporter/                      @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole @ArthurSens
+exporter/prometheusremotewriteexporter/           @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil @dashpole @ArthurSens
 exporter/pulsarexporter/                          @open-telemetry/collector-contrib-approvers @dmitryax @dao-jun
 exporter/rabbitmqexporter/                        @open-telemetry/collector-contrib-approvers @swar8080 @atoulme
 exporter/sapmexporter/                            @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
@@ -161,7 +161,7 @@ pkg/translator/azurelogs/                         @open-telemetry/collector-cont
 pkg/translator/jaeger/                            @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @frzifus
 pkg/translator/loki/                              @open-telemetry/collector-contrib-approvers @gouthamve @jpkrohling @mar4uk
 pkg/translator/opencensus/                        @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-pkg/translator/prometheus/                        @open-telemetry/collector-contrib-approvers @dashpole @bertysentry
+pkg/translator/prometheus/                        @open-telemetry/collector-contrib-approvers @dashpole @bertysentry @ArthurSens
 pkg/translator/prometheusremotewrite/             @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
 pkg/translator/signalfx/                          @open-telemetry/collector-contrib-approvers @dmitryax
 pkg/translator/skywalking/                        @open-telemetry/collector-contrib-approvers @JaredTan95

.golangci.yml

@@ -150,7 +150,7 @@ linters:
     - exhaustive
     - gci
     - gocritic
-    - gofmt
+    - gofumpt
     - goimports
     - gosec
     - govet

Makefile.Common

@@ -72,6 +72,7 @@ CHECKFILE           := $(TOOLS_BIN_DIR)/checkfile
 CROSSLINK           := $(TOOLS_BIN_DIR)/crosslink
 GOJUNIT             := $(TOOLS_BIN_DIR)/go-junit-report
 BUILDER             := $(TOOLS_BIN_DIR)/builder
+GOFUMPT             := $(TOOLS_BIN_DIR)/gofumpt
 GOVULNCHECK         := $(TOOLS_BIN_DIR)/govulncheck
 GCI                 := $(TOOLS_BIN_DIR)/gci
 GOTESTSUM           := $(TOOLS_BIN_DIR)/gotestsum
@@ -207,8 +208,8 @@ checklinks:
 		$(MDLINKCHECK) -q -c $(SRC_ROOT)/.github/workflows/check_links_config.json || true
 
 .PHONY: fmt
-fmt: $(GOIMPORTS)
-	gofmt -w -s ./
+fmt: $(GOFUMPT) $(GOIMPORTS)
+	$(GOFUMPT) -l -w .
 	$(GOIMPORTS) -w -local github.com/open-telemetry/opentelemetry-collector-contrib ./
 
 .PHONY: lint

cmd/githubgen/codeowners.go

@@ -179,11 +179,11 @@ LOOP:
 		codeowners += fmt.Sprintf("reports/distributions/%s.yaml%s @open-telemetry/collector-contrib-approvers %s\n", dist.Name, strings.Repeat(" ", longestName-len(dist.Name)), strings.Join(maintainers, " "))
 	}
 
-	err = os.WriteFile(filepath.Join(".github", "CODEOWNERS"), []byte(codeowners+unmaintainedCodeowners), 0600)
+	err = os.WriteFile(filepath.Join(".github", "CODEOWNERS"), []byte(codeowners+unmaintainedCodeowners), 0o600)
 	if err != nil {
 		return err
 	}
-	err = os.WriteFile(filepath.Join(".github", "ALLOWLIST"), []byte(allowlistHeader+deprecatedList+unmaintainedList), 0600)
+	err = os.WriteFile(filepath.Join(".github", "ALLOWLIST"), []byte(allowlistHeader+deprecatedList+unmaintainedList), 0o600)
 	if err != nil {
 		return err
 	}

cmd/githubgen/distributions.go

@@ -12,8 +12,7 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-type distributionsGenerator struct {
-}
+type distributionsGenerator struct{}
 
 type distOutput struct {
 	Name        string              `yaml:"name"`
@@ -54,7 +53,7 @@ func (cg distributionsGenerator) generate(data *githubData) error {
 		if err != nil {
 			return nil
 		}
-		err = os.WriteFile(filepath.Join("reports", "distributions", fmt.Sprintf("%s.yaml", dist.Name)), b, 0600)
+		err = os.WriteFile(filepath.Join("reports", "distributions", fmt.Sprintf("%s.yaml", dist.Name)), b, 0o600)
 		if err != nil {
 			return nil
 		}

cmd/githubgen/issuetemplates.go

@@ -31,8 +31,7 @@ func folderToShortName(folder string) string {
 	return strings.Join(path, "/")
 }
 
-type issueTemplatesGenerator struct {
-}
+type issueTemplatesGenerator struct{}
 
 func (itg issueTemplatesGenerator) generate(data *githubData) error {
 	keys := map[string]struct{}{}
@@ -59,7 +58,7 @@ func (itg issueTemplatesGenerator) generate(data *githubData) error {
 		oldContent := matchOldContent.FindSubmatch(templateContents)
 		if len(oldContent) > 0 {
 			templateContents = bytes.ReplaceAll(templateContents, oldContent[0], replacement)
-			err = os.WriteFile(filepath.Join(issuesFolder, e.Name()), templateContents, 0600)
+			err = os.WriteFile(filepath.Join(issuesFolder, e.Name()), templateContents, 0o600)
 			if err != nil {
 				return err
 			}

cmd/opampsupervisor/e2e_test.go

@@ -284,7 +284,7 @@ func TestSupervisorStartsCollectorWithNoOpAMPServer(t *testing.T) {
 	marshalledRemoteConfig, err := proto.Marshal(remoteConfigProto)
 	require.NoError(t, err)
 
-	require.NoError(t, os.WriteFile(remoteConfigFilePath, marshalledRemoteConfig, 0600))
+	require.NoError(t, os.WriteFile(remoteConfigFilePath, marshalledRemoteConfig, 0o600))
 
 	connected := atomic.Bool{}
 	server := newUnstartedOpAMPServer(t, defaultConnectingHandler, server.ConnectionCallbacksStruct{
@@ -407,7 +407,6 @@ func TestSupervisorStartsWithNoOpAMPServer(t *testing.T) {
 
 		return n != 0
 	}, 10*time.Second, 500*time.Millisecond, "Log never appeared in output")
-
 }
 
 func TestSupervisorRestartsCollectorAfterBadConfig(t *testing.T) {
@@ -1077,7 +1076,6 @@ func TestSupervisorRestartsWithLastReceivedConfig(t *testing.T) {
 
 		return strings.Contains(loadedConfig, "filelog")
 	}, 10*time.Second, 500*time.Millisecond, "Collector was not started with the last received remote config")
-
 }
 
 func TestSupervisorPersistsInstanceID(t *testing.T) {
@@ -1091,7 +1089,6 @@ func TestSupervisorPersistsInstanceID(t *testing.T) {
 		defaultConnectingHandler,
 		server.ConnectionCallbacksStruct{
 			OnMessageFunc: func(_ context.Context, _ types.Connection, message *protobufs.AgentToServer) *protobufs.ServerToAgent {
-
 				select {
 				case agentIDChan <- message.InstanceUid:
 				default:
@@ -1168,7 +1165,6 @@ func TestSupervisorPersistsNewInstanceID(t *testing.T) {
 		defaultConnectingHandler,
 		server.ConnectionCallbacksStruct{
 			OnMessageFunc: func(_ context.Context, _ types.Connection, message *protobufs.AgentToServer) *protobufs.ServerToAgent {
-
 				select {
 				case agentIDChan <- message.InstanceUid:
 				default:
@@ -1359,7 +1355,6 @@ func TestSupervisorStopsAgentProcessWithEmptyConfigMap(t *testing.T) {
 	} else {
 		require.ErrorContains(t, err, "No connection could be made")
 	}
-
 }
 
 type LogEntry struct {
@@ -1387,7 +1382,7 @@ func TestSupervisorLogging(t *testing.T) {
 	}
 	marshalledRemoteCfg, err := proto.Marshal(remoteCfgProto)
 	require.NoError(t, err)
-	require.NoError(t, os.WriteFile(remoteCfgFilePath, marshalledRemoteCfg, 0600))
+	require.NoError(t, os.WriteFile(remoteCfgFilePath, marshalledRemoteCfg, 0o600))
 
 	connected := atomic.Bool{}
 	server := newUnstartedOpAMPServer(t, defaultConnectingHandler, server.ConnectionCallbacksStruct{
@@ -1635,15 +1630,13 @@ func TestSupervisorOpAmpServerPort(t *testing.T) {
 
 func findRandomPort() (int, error) {
 	l, err := net.Listen("tcp", "localhost:0")
-
 	if err != nil {
 		return 0, err
 	}
 
 	port := l.Addr().(*net.TCPAddr).Port
 
 	err = l.Close()
-
 	if err != nil {
 		return 0, err
 	}

cmd/opampsupervisor/supervisor/config/config_test.go

@@ -425,7 +425,7 @@ func TestValidate(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	filePath := filepath.Join(tmpDir, "file")
-	require.NoError(t, os.WriteFile(filePath, []byte{}, 0600))
+	require.NoError(t, os.WriteFile(filePath, []byte{}, 0o600))
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

cmd/opampsupervisor/supervisor/persistence.go

@@ -31,7 +31,7 @@ func (p *persistentState) writeState() error {
 		return err
 	}
 
-	return os.WriteFile(p.configPath, by, 0600)
+	return os.WriteFile(p.configPath, by, 0o600)
 }
 
 // loadOrCreatePersistentState attempts to load the persistent state from disk. If it doesn't

cmd/opampsupervisor/supervisor/persistence_test.go

@@ -26,7 +26,7 @@ func TestCreateOrLoadPersistentState(t *testing.T) {
 	t.Run("loads state from file if it exists", func(t *testing.T) {
 		f := filepath.Join(t.TempDir(), "state.yaml")
 
-		err := os.WriteFile(f, []byte(`instance_id: "018feed6-905b-7aa6-ba37-b0eec565de03"`), 0600)
+		err := os.WriteFile(f, []byte(`instance_id: "018feed6-905b-7aa6-ba37-b0eec565de03"`), 0o600)
 		require.NoError(t, err)
 
 		state, err := loadOrCreatePersistentState(f)

cmd/opampsupervisor/supervisor/supervisor.go

@@ -180,7 +180,7 @@ func NewSupervisor(logger *zap.Logger, cfg config.Supervisor) (*Supervisor, erro
 	}
 	s.config = cfg
 
-	if err := os.MkdirAll(s.config.Storage.Directory, 0700); err != nil {
+	if err := os.MkdirAll(s.config.Storage.Directory, 0o700); err != nil {
 		return nil, fmt.Errorf("error creating storage dir: %w", err)
 	}
 
@@ -203,7 +203,6 @@ func (s *Supervisor) Start() error {
 	healthCheckPort := s.config.Agent.HealthCheckPort
 	if healthCheckPort == 0 {
 		healthCheckPort, err = s.findRandomPort()
-
 		if err != nil {
 			return fmt.Errorf("could not find port for health check: %w", err)
 		}
@@ -285,7 +284,7 @@ func (s *Supervisor) getBootstrapInfo() (err error) {
 		return err
 	}
 
-	err = os.WriteFile(s.agentConfigFilePath(), bootstrapConfig, 0600)
+	err = os.WriteFile(s.agentConfigFilePath(), bootstrapConfig, 0o600)
 	if err != nil {
 		return fmt.Errorf("failed to write agent config: %w", err)
 	}
@@ -708,7 +707,7 @@ func (s *Supervisor) composeNoopPipeline() ([]byte, error) {
 }
 
 func (s *Supervisor) composeNoopConfig() ([]byte, error) {
-	var k = koanf.New("::")
+	k := koanf.New("::")
 
 	cfg, err := s.composeNoopPipeline()
 	if err != nil {
@@ -821,7 +820,7 @@ func (s *Supervisor) loadAndWriteInitialMergedConfig() error {
 
 	// write the initial merged config to disk
 	cfgState := s.cfgState.Load().(*configState)
-	if err := os.WriteFile(s.agentConfigFilePath(), []byte(cfgState.mergedConfig), 0600); err != nil {
+	if err := os.WriteFile(s.agentConfigFilePath(), []byte(cfgState.mergedConfig), 0o600); err != nil {
 		s.logger.Error("Failed to write agent config.", zap.Error(err))
 	}
 
@@ -861,7 +860,6 @@ func (s *Supervisor) setupOwnMetrics(_ context.Context, settings *protobufs.Tele
 		s.logger.Debug("Enabling own metrics pipeline in the config")
 
 		port, err := s.findRandomPort()
-
 		if err != nil {
 			s.logger.Error("Could not setup own metrics", zap.Error(err))
 			return
@@ -896,7 +894,7 @@ func (s *Supervisor) setupOwnMetrics(_ context.Context, settings *protobufs.Tele
 // 2) the own metrics config section
 // 3) the local override config that is hard-coded in the Supervisor.
 func (s *Supervisor) composeMergedConfig(config *protobufs.AgentRemoteConfig) (configChanged bool, err error) {
-	var k = koanf.New("::")
+	k := koanf.New("::")
 
 	configMapIsEmpty := len(config.GetConfig().GetConfigMap()) == 0
 
@@ -924,7 +922,7 @@ func (s *Supervisor) composeMergedConfig(config *protobufs.AgentRemoteConfig) (c
 			if item == nil {
 				continue
 			}
-			var k2 = koanf.New("::")
+			k2 := koanf.New("::")
 			err = k2.Load(rawbytes.Provider(item.Body), yaml.Parser())
 			if err != nil {
 				return false, fmt.Errorf("cannot parse config named %s: %w", name, err)
@@ -1010,7 +1008,6 @@ func (s *Supervisor) startAgent() {
 	if err != nil {
 		s.logger.Error("Cannot start the agent", zap.Error(err))
 		err = s.opampClient.SetHealth(&protobufs.ComponentHealth{Healthy: false, LastError: fmt.Sprintf("Cannot start the agent: %v", err)})
-
 		if err != nil {
 			s.logger.Error("Failed to report OpAMP client health", zap.Error(err))
 		}
@@ -1128,7 +1125,6 @@ func (s *Supervisor) runAgentProcess() {
 				s.commander.Pid(), s.commander.ExitCode(),
 			)
 			err := s.opampClient.SetHealth(&protobufs.ComponentHealth{Healthy: false, LastError: errMsg})
-
 			if err != nil {
 				s.logger.Error("Could not report health to OpAMP server", zap.Error(err))
 			}
@@ -1173,12 +1169,11 @@ func (s *Supervisor) stopAgentApplyConfig() {
 	s.logger.Debug("Stopping the agent to apply new config")
 	cfgState := s.cfgState.Load().(*configState)
 	err := s.commander.Stop(context.Background())
-
 	if err != nil {
 		s.logger.Error("Could not stop agent process", zap.Error(err))
 	}
 
-	if err := os.WriteFile(s.agentConfigFilePath(), []byte(cfgState.mergedConfig), 0600); err != nil {
+	if err := os.WriteFile(s.agentConfigFilePath(), []byte(cfgState.mergedConfig), 0o600); err != nil {
 		s.logger.Error("Failed to write agent config.", zap.Error(err))
 	}
 }
@@ -1210,13 +1205,11 @@ func (s *Supervisor) Shutdown() {
 				Healthy: false, LastError: "Supervisor is shutdown",
 			},
 		)
-
 		if err != nil {
 			s.logger.Error("Could not report health to OpAMP server", zap.Error(err))
 		}
 
 		err = s.stopOpAMPClient()
-
 		if err != nil {
 			s.logger.Error("Could not stop the OpAMP client", zap.Error(err))
 		}
@@ -1233,7 +1226,7 @@ func (s *Supervisor) saveLastReceivedConfig(config *protobufs.AgentRemoteConfig)
 		return err
 	}
 
-	return os.WriteFile(filepath.Join(s.config.Storage.Directory, lastRecvRemoteConfigFile), cfg, 0600)
+	return os.WriteFile(filepath.Join(s.config.Storage.Directory, lastRecvRemoteConfigFile), cfg, 0o600)
 }
 
 func (s *Supervisor) saveLastReceivedOwnTelemetrySettings(set *protobufs.TelemetryConnectionSettings, filePath string) error {
@@ -1242,7 +1235,7 @@ func (s *Supervisor) saveLastReceivedOwnTelemetrySettings(set *protobufs.Telemet
 		return err
 	}
 
-	return os.WriteFile(filepath.Join(s.config.Storage.Directory, filePath), cfg, 0600)
+	return os.WriteFile(filepath.Join(s.config.Storage.Directory, filePath), cfg, 0o600)
 }
 
 func (s *Supervisor) reportConfigStatus(status protobufs.RemoteConfigStatuses, errorMessage string) {
@@ -1392,15 +1385,13 @@ func (s *Supervisor) getSupervisorOpAMPServerPort() (int, error) {
 
 func (s *Supervisor) findRandomPort() (int, error) {
 	l, err := net.Listen("tcp", "localhost:0")
-
 	if err != nil {
 		return 0, err
 	}
 
 	port := l.Addr().(*net.TCPAddr).Port
 
 	err = l.Close()
-
 	if err != nil {
 		return 0, err
 	}

cmd/opampsupervisor/supervisor/supervisor_test.go

@@ -1042,12 +1042,14 @@ type mockConn struct {
 func (mockConn) Connection() net.Conn {
 	return nil
 }
+
 func (m mockConn) Send(ctx context.Context, message *protobufs.ServerToAgent) error {
 	if m.sendFunc != nil {
 		return m.sendFunc(ctx, message)
 	}
 	return nil
 }
+
 func (mockConn) Disconnect() error {
 	return nil
 }
@@ -1273,8 +1275,8 @@ service:
 		marshalledOwnMetricsCfg, err := proto.Marshal(ownMetricsCfg)
 		require.NoError(t, err)
 
-		require.NoError(t, os.WriteFile(filepath.Join(configDir, lastRecvRemoteConfigFile), marshalledRemoteCfg, 0600))
-		require.NoError(t, os.WriteFile(filepath.Join(configDir, lastRecvOwnMetricsConfigFile), marshalledOwnMetricsCfg, 0600))
+		require.NoError(t, os.WriteFile(filepath.Join(configDir, lastRecvRemoteConfigFile), marshalledRemoteCfg, 0o600))
+		require.NoError(t, os.WriteFile(filepath.Join(configDir, lastRecvOwnMetricsConfigFile), marshalledOwnMetricsCfg, 0o600))
 
 		s := Supervisor{
 			logger: zap.NewNop(),

cmd/telemetrygen/internal/traces/exporter_test.go

@@ -68,7 +68,7 @@ func TestHTTPExporterOptions_TLS(t *testing.T) {
 				err := os.WriteFile(caFile, pem.EncodeToMemory(&pem.Block{
 					Type:  "CERTIFICATE",
 					Bytes: srv.TLS.Certificates[0].Certificate[0],
-				}), 0600)
+				}), 0o600)
 				require.NoError(t, err)
 				cfg.CaFile = caFile
 			}

confmap/provider/secretsmanagerprovider/provider.go

@@ -57,7 +57,6 @@ func (provider *provider) Retrieve(ctx context.Context, uri string, _ confmap.Wa
 	// initialize the secrets manager client in the first call of Retrieve
 	if provider.client == nil {
 		cfg, err := config.LoadDefaultConfig(ctx)
-
 		if err != nil {
 			return nil, fmt.Errorf("failed to load configurations to initialize an AWS SDK client, error: %w", err)
 		}