diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99f703608..b537a365d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -85,7 +85,7 @@ jobs: steps: - uses: actions/setup-go@v6 with: - go-version: '1.25' + go-version: '1.25.7' - uses: gardener/cc-utils/.github/actions/trusted-checkout@master - name: verify run: | diff --git a/go.mod b/go.mod index 6c615bada..3fe77a493 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gardener/logging/v1 -go 1.25.6 +go 1.25.7 tool ( github.com/daixiang0/gci diff --git a/pkg/client/dque_batch_processor.go b/pkg/client/dque_batch_processor.go index b6bea1c49..f7dbeca7f 100644 --- a/pkg/client/dque_batch_processor.go +++ b/pkg/client/dque_batch_processor.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" "os" + "strings" "sync" "time" @@ -252,7 +253,7 @@ func NewDQueBatchProcessor( processorCtx, cancel := context.WithCancel(ctx) processor := &DQueBatchProcessor{ - logger: logger.WithValues("component", "dque_batch_processor", "endpoint", config.endpoint), + logger: logger.WithValues("path", strings.Join([]string{config.dqueueDir, config.dqueueName}, "/"), "endpoint", config.endpoint), config: config, exporter: exporter, queue: queue, @@ -746,8 +747,6 @@ func (p *DQueBatchProcessor) exportBatch(batch []sdklog.Record) { ctx, cancel := context.WithTimeout(p.ctx, p.config.exportTimeout) defer cancel() - p.logger.V(3).Info("exporting batch", "size", len(batch)) - // Blocking export call (gRPC or HTTP) if err := p.exporter.Export(ctx, batch); err != nil { p.logger.Error(err, "failed to export batch", "size", len(batch)) @@ -846,8 +845,6 @@ func (p *DQueBatchProcessor) Shutdown(ctx context.Context) error { p.closed = true p.mu.Unlock() - p.logger.V(2).Info("shutting down batch processor") - // Signal process loop to stop p.cancel() diff --git a/pkg/config/config.go b/pkg/config/config.go index 96c9d4037..9204f0678 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -188,34 +188,34 @@ func processControllerConfigBoolFields(configMap map[string]any, config *Config) shootConfigMapping := map[string]*bool{ "sendlogstoshootwhenisincreationstate": &config.ControllerConfig.ShootControllerClientConfig. SendLogsWhenIsInCreationState, - "sendlogstoshootwhenisinnreadystate": &config.ControllerConfig.ShootControllerClientConfig. + "sendlogstoshootwhenisinreadystate": &config.ControllerConfig.ShootControllerClientConfig. SendLogsWhenIsInReadyState, - "sendlogstoshootwhenisinhhibernatingstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInHibernatingState, - "sendlogstoshootwhenisinhhibernatedstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInHibernatedState, - "sendlogstoshootwheninwakingstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInWakingState, - "sendlogstoshootwhenisdeletionstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInDeletionState, - "sendlogstoshootwhenisdeletedstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInDeletedState, - "sendlogstoshootwhenisrestorestate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInRestoreState, - "sendlogstoshootwhenismigrationstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInMigrationState, + "sendlogstoshootwhenisinhibernatingstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInHibernatingState, + "sendlogstoshootwhenisinhibernatedstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInHibernatedState, + "sendlogstoshootwhenisinwakingstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInWakingState, + "sendlogstoshootwhenisindeletionstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInDeletionState, + "sendlogstoshootwhenisindeletedstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInDeletedState, + "sendlogstoshootwhenisinrestorestate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInRestoreState, + "sendlogstoshootwhenisinmigrationstate": &config.ControllerConfig.ShootControllerClientConfig.SendLogsWhenIsInMigrationState, } // Map of lowercase ConfigMap keys to their corresponding SeedControllerClientConfig fields seedConfigMapping := map[string]*bool{ "sendlogstoseedwhenshootisincreationstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInCreationState, - "sendlogstoseedwhenshootisinnreadystate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinreadystate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInReadyState, - "sendlogstoseedwhenshootisinhhibernatingstate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinhibernatingstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInHibernatingState, - "sendlogstoseedwhenshootisinhhibernatedstate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinhibernatedstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInHibernatedState, - "sendlogstoseedwhenshootinwakingstate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinwakingstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInWakingState, - "sendlogstoseedwhenshootisdeletionstate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisindeletionstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInDeletionState, - "sendlogstoseedwhenshootisrestorestate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinrestorestate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInRestoreState, - "sendlogstoseedwhenshootismigrationstate": &config.ControllerConfig.SeedControllerClientConfig. + "sendlogstoseedwhenshootisinmigrationstate": &config.ControllerConfig.SeedControllerClientConfig. SendLogsWhenIsInMigrationState, } @@ -583,7 +583,7 @@ func buildTLSConfig(config *Config) error { tlsConfig := &tls.Config{ ServerName: otlp.TLSServerName, - InsecureSkipVerify: otlp.TLSInsecureSkipVerify, //nolint:gosec // This is configured by the user + InsecureSkipVerify: otlp.TLSInsecureSkipVerify, // #nosec G402 //nolint:gosec // This is configured by the user } // Load client certificate if both cert and key files are specified