Skip to content

Small improvements #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickytd merged 5 commits into from
Feb 10, 2026
Merged

Small improvements #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b80c4b3
fix: standardize log key naming conventions in Shoot and Seed config …
nickytd Feb 10, 2026
335c9e8
:seedling: Bump golang from 1.25.6 to 1.25.7
nickytd Feb 10, 2026
001f0fb
fix: enhance logging in DQueBatchProcessor with path details and remo…
nickytd Feb 10, 2026
a6f1e9d
fix: update nolint directive for InsecureSkipVerify in tlsConfig
nickytd Feb 10, 2026
599115b
:seedling: update go-version to 1.25.7 in build.yaml
nickytd Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gardener/logging/v1

go 1.25.6
go 1.25.7

tool (
github.com/daixiang0/gci
Expand Down
7 changes: 2 additions & 5 deletions pkg/client/dque_batch_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"errors"
"fmt"
"os"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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()

Expand Down
32 changes: 16 additions & 16 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down Expand Up @@ -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
Expand Down
Loading