From 535ed97d23bc025d2e792041eaa1bda96256fa41 Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 20 May 2026 13:42:48 +0200 Subject: [PATCH 1/9] add types for batching and sizer --- internal/otelcollector/config/common/types.go | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/internal/otelcollector/config/common/types.go b/internal/otelcollector/config/common/types.go index 1d1cea4d35..c092b1840d 100644 --- a/internal/otelcollector/config/common/types.go +++ b/internal/otelcollector/config/common/types.go @@ -2,6 +2,14 @@ package common import telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" +type Sizer string + +const ( + SizerBytes Sizer = "bytes" + SizerItems Sizer = "items" + SizerRequests Sizer = "requests" +) + // ============================================================================= // BASE CONFIGURATION TYPES // ============================================================================= @@ -148,8 +156,17 @@ type TLS struct { } type SendingQueue struct { - Enabled bool `yaml:"enabled"` - QueueSize int `yaml:"queue_size"` + Enabled bool `yaml:"enabled"` + QueueSize int `yaml:"queue_size"` + Sizer Sizer `yaml:"sizer,omitempty"` + Batch Batch `yaml:"batch,omitempty"` +} + +type Batch struct { + MinSize int `yaml:"min_size,omitempty"` + MaxSize int `yaml:"max_size,omitempty"` + FlushTimeout time.Duration `yaml:"flush_timeout,omitempty"` + Sizer Sizer `yaml:"sizer,omitempty"` } type RetryOnFailure struct { From dcb3ed9ff22c2fcf79195d48aef361cd68d5f48b Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 20 May 2026 14:19:29 +0200 Subject: [PATCH 2/9] pass in sending queue to config builder --- .../common/otlpexporter_config_builder.go | 30 +++++++------------ .../otlpexporter_config_builder_test.go | 20 ++++++------- internal/otelcollector/config/common/types.go | 30 +++++++++++++++++++ .../config/metricagent/config_builder.go | 2 +- .../config/otlpgateway/config_builder_logs.go | 2 +- .../otlpgateway/config_builder_metrics.go | 2 +- .../otlpgateway/config_builder_traces.go | 2 +- 7 files changed, 55 insertions(+), 33 deletions(-) diff --git a/internal/otelcollector/config/common/otlpexporter_config_builder.go b/internal/otelcollector/config/common/otlpexporter_config_builder.go index 76aa6a182f..47120ca1bc 100644 --- a/internal/otelcollector/config/common/otlpexporter_config_builder.go +++ b/internal/otelcollector/config/common/otlpexporter_config_builder.go @@ -17,20 +17,20 @@ import ( // ============================================================================= type OTLPExporterConfigBuilder struct { - reader client.Reader - otlpOutput *telemetryv1beta1.OTLPOutput - pipelineRef pipelines.PipelineRef - queueSize int + reader client.Reader + otlpOutput *telemetryv1beta1.OTLPOutput + pipelineRef pipelines.PipelineRef + sendingQueue SendingQueue } type EnvVars map[string][]byte -func NewOTLPExporterConfigBuilder(reader client.Reader, otlpOutput *telemetryv1beta1.OTLPOutput, pipelineRef pipelines.PipelineRef, queueSize int) *OTLPExporterConfigBuilder { +func NewOTLPExporterConfigBuilder(reader client.Reader, otlpOutput *telemetryv1beta1.OTLPOutput, pipelineRef pipelines.PipelineRef, sendingQueue SendingQueue) *OTLPExporterConfigBuilder { return &OTLPExporterConfigBuilder{ - reader: reader, - otlpOutput: otlpOutput, - pipelineRef: pipelineRef, - queueSize: queueSize, + reader: reader, + otlpOutput: otlpOutput, + pipelineRef: pipelineRef, + sendingQueue: sendingQueue, } } @@ -40,23 +40,15 @@ func (cb *OTLPExporterConfigBuilder) OTLPExporter(ctx context.Context) (*OTLPExp return nil, nil, fmt.Errorf("failed to make env vars: %w", err) } - exporter := otlpExporter(cb.otlpOutput, cb.pipelineRef, envVars, cb.queueSize) + exporter := otlpExporter(cb.otlpOutput, cb.pipelineRef, envVars, cb.sendingQueue) return exporter, envVars, nil } -func otlpExporter(otlpOutput *telemetryv1beta1.OTLPOutput, pipelineRef pipelines.PipelineRef, envVars map[string][]byte, queueSize int) *OTLPExporterConfig { +func otlpExporter(otlpOutput *telemetryv1beta1.OTLPOutput, pipelineRef pipelines.PipelineRef, envVars map[string][]byte, sendingQueue SendingQueue) *OTLPExporterConfig { otlpEndpointVariable := formatEnvVarKey(otlpEndpointVariablePrefix, pipelineRef) otlpEndpointValue := string(envVars[otlpEndpointVariable]) - sendingQueue := SendingQueue{ - Enabled: false, - } - if queueSize != 0 { - sendingQueue.QueueSize = queueSize - sendingQueue.Enabled = true - } - compression := string(otlpOutput.Compression) if compression == "" { compression = string(telemetryv1beta1.OTLPCompressionGzip) diff --git a/internal/otelcollector/config/common/otlpexporter_config_builder_test.go b/internal/otelcollector/config/common/otlpexporter_config_builder_test.go index b5e445d253..9e670e18e3 100644 --- a/internal/otelcollector/config/common/otlpexporter_config_builder_test.go +++ b/internal/otelcollector/config/common/otlpexporter_config_builder_test.go @@ -37,7 +37,7 @@ func TestMakeExporterConfig(t *testing.T) { Endpoint: telemetryv1beta1.ValueType{Value: "otlp-endpoint"}, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -62,7 +62,7 @@ func TestMakeExporterConfigTraceWithPath(t *testing.T) { Protocol: "http", } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -81,7 +81,7 @@ func TestMakeExporterConfigMetricWithPath(t *testing.T) { Protocol: "http", } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, metricRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, metricRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -104,7 +104,7 @@ func TestMakeExporterConfigWithBasicAuth(t *testing.T) { }, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -130,7 +130,7 @@ func TestMakeExporterConfigWithOAuth2(t *testing.T) { }, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -153,7 +153,7 @@ func TestMakeExporterConfigWithCustomHeaders(t *testing.T) { Headers: headers, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -171,7 +171,7 @@ func TestMakeExporterConfigWithTLSInsecure(t *testing.T) { TLS: tls, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -189,7 +189,7 @@ func TestMakeExporterConfigWithTLSInsecureSkipVerify(t *testing.T) { TLS: tls, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -218,7 +218,7 @@ func TestMakeExporterConfigWithmTLS(t *testing.T) { TLS: tls, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) @@ -262,7 +262,7 @@ func TestMakeExporterConfigCompression(t *testing.T) { Compression: tt.compression, } - cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), 512) + cb := NewOTLPExporterConfigBuilder(fake.NewClientBuilder().Build(), output, traceRefTest(), NewSendingQueue(512)) otlpExporterConfig, envVars, err := cb.OTLPExporter(t.Context()) require.NoError(t, err) require.NotNil(t, envVars) diff --git a/internal/otelcollector/config/common/types.go b/internal/otelcollector/config/common/types.go index c092b1840d..32c30b5e4b 100644 --- a/internal/otelcollector/config/common/types.go +++ b/internal/otelcollector/config/common/types.go @@ -162,6 +162,36 @@ type SendingQueue struct { Batch Batch `yaml:"batch,omitempty"` } +type SendingQueueOption func(*SendingQueue) + +func WithSizer(sizer Sizer) SendingQueueOption { + return func(sq *SendingQueue) { + sq.Sizer = sizer + } +} + +func WithBatch(batch Batch) SendingQueueOption { + return func(sq *SendingQueue) { + sq.Batch = batch + } +} + +func NewSendingQueue(queueSize int, opts ...SendingQueueOption) SendingQueue { + sq := SendingQueue{ + Enabled: true, + QueueSize: queueSize, + } + for _, opt := range opts { + opt(&sq) + } + + return sq +} + +func DisabledSendingQueue() SendingQueue { + return SendingQueue{Enabled: false} +} + type Batch struct { MinSize int `yaml:"min_size,omitempty"` MaxSize int `yaml:"max_size,omitempty"` diff --git a/internal/otelcollector/config/metricagent/config_builder.go b/internal/otelcollector/config/metricagent/config_builder.go index dacff01e43..3fb67c751d 100644 --- a/internal/otelcollector/config/metricagent/config_builder.go +++ b/internal/otelcollector/config/metricagent/config_builder.go @@ -850,7 +850,7 @@ func (b *Builder) addOTLPExporter(queueSize int) buildComponentFunc { b.Reader, mp.Spec.Output.OTLP, pipelines.MetricPipelineRef(mp), - queueSize, + common.NewSendingQueue(queueSize), ) return otlpExporterBuilder.OTLPExporter(ctx) diff --git a/internal/otelcollector/config/otlpgateway/config_builder_logs.go b/internal/otelcollector/config/otlpgateway/config_builder_logs.go index c8917bcd32..99ffc9dd87 100644 --- a/internal/otelcollector/config/otlpgateway/config_builder_logs.go +++ b/internal/otelcollector/config/otlpgateway/config_builder_logs.go @@ -249,7 +249,7 @@ func (b *Builder) addLogOTLPExporter(builder *common.ComponentBuilder[*telemetry b.Reader, lp.Spec.Output.OTLP, pipelines.LogPipelineRef(lp), - queueSize, + common.NewSendingQueue(queueSize), ) return otlpExporterBuilder.OTLPExporter(ctx) diff --git a/internal/otelcollector/config/otlpgateway/config_builder_metrics.go b/internal/otelcollector/config/otlpgateway/config_builder_metrics.go index 2befc0f211..277f5c6602 100644 --- a/internal/otelcollector/config/otlpgateway/config_builder_metrics.go +++ b/internal/otelcollector/config/otlpgateway/config_builder_metrics.go @@ -342,7 +342,7 @@ func (b *Builder) addMetricOTLPExporter(builder *common.ComponentBuilder[*teleme b.Reader, mp.Spec.Output.OTLP, pipelines.MetricPipelineRef(mp), - queueSize, + common.NewSendingQueue(queueSize), ) return otlpExporterBuilder.OTLPExporter(ctx) diff --git a/internal/otelcollector/config/otlpgateway/config_builder_traces.go b/internal/otelcollector/config/otlpgateway/config_builder_traces.go index dc4861ca21..c1b8f0dd4c 100644 --- a/internal/otelcollector/config/otlpgateway/config_builder_traces.go +++ b/internal/otelcollector/config/otlpgateway/config_builder_traces.go @@ -212,7 +212,7 @@ func (b *Builder) addTraceOTLPExporter(builder *common.ComponentBuilder[*telemet b.Reader, tp.Spec.Output.OTLP, pipelines.TracePipelineRef(tp), - queueSize, + common.NewSendingQueue(queueSize), ) return otlpExporterBuilder.OTLPExporter(ctx) From 868eeef6952400f89d6cc29523283a3696ba591c Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 20 May 2026 14:22:55 +0200 Subject: [PATCH 3/9] set configuration for log agent --- .../config/logagent/config_builder.go | 23 ++++++++++++++++++- .../http-protocol-with-custom-path.yaml | 8 +++++++ .../http-protocol-without-custom-path.yaml | 8 +++++++ .../testdata/oauth2-authentication.yaml | 8 +++++++ .../testdata/service-enrichment-otel.yaml | 8 +++++++ .../single-pipeline-namespace-excluded.yaml | 8 +++++++ .../single-pipeline-namespace-included.yaml | 8 +++++++ .../logagent/testdata/single-pipeline.yaml | 8 +++++++ .../testdata/user-defined-filters.yaml | 16 +++++++++++++ .../user-defined-transform-filter.yaml | 8 +++++++ .../testdata/user-defined-transforms.yaml | 16 +++++++++++++ .../config/logagent/testdata/vpa-active.yaml | 8 +++++++ 12 files changed, 126 insertions(+), 1 deletion(-) diff --git a/internal/otelcollector/config/logagent/config_builder.go b/internal/otelcollector/config/logagent/config_builder.go index dd1024d1d0..942e53f51b 100644 --- a/internal/otelcollector/config/logagent/config_builder.go +++ b/internal/otelcollector/config/logagent/config_builder.go @@ -6,6 +6,7 @@ import ( "path/filepath" "slices" "strings" + "time" "sigs.k8s.io/controller-runtime/pkg/client" @@ -19,6 +20,19 @@ import ( const checkpointVolumePathSubdir = "telemetry-log-agent/file-log-receiver" +// Exporter sending queue configuration constants, see +// https://github.com/kyma-project/telemetry-manager/blob/main/docs/contributor/pocs/consistent-batching-across-components/02-log-agent-batching.md. +const ( + // maximum queue size in bytes (200 MB) + exporterQueueSize = 200_000_000 + // minimum batch size in bytes (2 MB) + exporterBatchMinSize = 2_000_000 + // maximum batch size in bytes (4 MB) + exporterBatchMaxSize = 4_000_000 + // maximum time before flusing a batch + exporterBatchFlushTimeout = 10 * time.Second +) + type buildComponentFunc = common.BuildComponentFunc[*telemetryv1beta1.LogPipeline] type Builder struct { @@ -227,7 +241,14 @@ func (b *Builder) addOTLPExporter() buildComponentFunc { b.Reader, lp.Spec.Output.OTLP, pipelines.LogPipelineRef(lp), - 0, // queue size is set to 0 for now, as the queue is disabled + common.NewSendingQueue(exporterQueueSize, + common.WithSizer(common.SizerBytes), + common.WithBatch(common.Batch{ + MinSize: exporterBatchMinSize, + MaxSize: exporterBatchMaxSize, + FlushTimeout: exporterBatchFlushTimeout, + }), + ), ) return otlpExporterBuilder.OTLPExporter(ctx) diff --git a/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml b/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml index 0b5b6f2fe4..c1f39c828a 100644 --- a/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml +++ b/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml @@ -239,6 +239,14 @@ exporters: otlp_http/logpipeline-test: logs_endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml b/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml index f7c2c6bedc..f4e2c21535 100644 --- a/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml +++ b/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml @@ -239,6 +239,14 @@ exporters: otlp_http/logpipeline-test: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml b/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml index e5b597cf96..e573d42fe9 100644 --- a/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml +++ b/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml @@ -246,6 +246,14 @@ exporters: otlp_http/logpipeline-test: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml b/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml index 48e36d0221..993c51f0fc 100644 --- a/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml +++ b/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml @@ -259,6 +259,14 @@ exporters: tls: insecure: true compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml index 1271c73af7..12fa84f5aa 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml @@ -238,6 +238,14 @@ exporters: otlp_grpc/logpipeline-test: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml index 28de641d24..a1b327089d 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml @@ -237,6 +237,14 @@ exporters: otlp_grpc/logpipeline-test: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml index f1b07f4f4a..2f92477996 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml @@ -242,6 +242,14 @@ exporters: tls: insecure: true compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml index fffe6271d5..bbbefcce30 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml @@ -381,6 +381,14 @@ exporters: otlp_grpc/logpipeline-test1: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST1} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s @@ -389,6 +397,14 @@ exporters: otlp_grpc/logpipeline-test2: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST2} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml index e5f30f6a59..3703c426d3 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml @@ -254,6 +254,14 @@ exporters: otlp_grpc/logpipeline-test1: endpoint: ${OTLP_ENDPOINT_LOGPIPELINE_TEST1} compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml index ebd3b2b347..6ca97295ef 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml @@ -389,6 +389,14 @@ exporters: tls: insecure: true compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s @@ -399,6 +407,14 @@ exporters: tls: insecure: true compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s diff --git a/internal/otelcollector/config/logagent/testdata/vpa-active.yaml b/internal/otelcollector/config/logagent/testdata/vpa-active.yaml index 0cdd949ea7..4eb199579e 100644 --- a/internal/otelcollector/config/logagent/testdata/vpa-active.yaml +++ b/internal/otelcollector/config/logagent/testdata/vpa-active.yaml @@ -241,6 +241,14 @@ exporters: tls: insecure: true compression: gzip + sending_queue: + enabled: true + queue_size: 200000000 + sizer: bytes + batch: + min_size: 2000000 + max_size: 4000000 + flush_timeout: 10s retry_on_failure: enabled: true initial_interval: 5s From 3ff7f8140d1a6442c77ba731f98ac0cb214d3f85 Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 20 May 2026 15:16:10 +0200 Subject: [PATCH 4/9] fix imports --- internal/otelcollector/config/common/types.go | 6 +++++- internal/otelcollector/config/logagent/config_builder.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/otelcollector/config/common/types.go b/internal/otelcollector/config/common/types.go index 32c30b5e4b..e776805bc9 100644 --- a/internal/otelcollector/config/common/types.go +++ b/internal/otelcollector/config/common/types.go @@ -1,6 +1,10 @@ package common -import telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" +import ( + "time" + + telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" +) type Sizer string diff --git a/internal/otelcollector/config/logagent/config_builder.go b/internal/otelcollector/config/logagent/config_builder.go index 942e53f51b..dd29bfc7bc 100644 --- a/internal/otelcollector/config/logagent/config_builder.go +++ b/internal/otelcollector/config/logagent/config_builder.go @@ -20,7 +20,7 @@ import ( const checkpointVolumePathSubdir = "telemetry-log-agent/file-log-receiver" -// Exporter sending queue configuration constants, see +// Exporter sending queue configuration constants, see // https://github.com/kyma-project/telemetry-manager/blob/main/docs/contributor/pocs/consistent-batching-across-components/02-log-agent-batching.md. const ( // maximum queue size in bytes (200 MB) From aabc30e3b0f52dee737fdad07655195e69c12001 Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 20 May 2026 15:47:22 +0200 Subject: [PATCH 5/9] move ctor funcs to config builder, retain old logic --- .../common/otlpexporter_config_builder.go | 32 +++++++++++++++++++ internal/otelcollector/config/common/types.go | 30 ----------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/internal/otelcollector/config/common/otlpexporter_config_builder.go b/internal/otelcollector/config/common/otlpexporter_config_builder.go index 47120ca1bc..08da0d24e9 100644 --- a/internal/otelcollector/config/common/otlpexporter_config_builder.go +++ b/internal/otelcollector/config/common/otlpexporter_config_builder.go @@ -16,6 +16,38 @@ import ( // OTLP EXPORTER CONFIG BUILDER // ============================================================================= +// SendingQueue constructors and options + +type SendingQueueOption func(*SendingQueue) + +func WithSizer(sizer Sizer) SendingQueueOption { + return func(sq *SendingQueue) { + sq.Sizer = sizer + } +} + +func WithBatch(batch Batch) SendingQueueOption { + return func(sq *SendingQueue) { + sq.Batch = batch + } +} + +func NewSendingQueue(queueSize int, opts ...SendingQueueOption) SendingQueue { + if queueSize == 0 { + return SendingQueue{Enabled: false} + } + + sq := SendingQueue{ + Enabled: true, + QueueSize: queueSize, + } + for _, opt := range opts { + opt(&sq) + } + + return sq +} + type OTLPExporterConfigBuilder struct { reader client.Reader otlpOutput *telemetryv1beta1.OTLPOutput diff --git a/internal/otelcollector/config/common/types.go b/internal/otelcollector/config/common/types.go index e776805bc9..59eab68b3c 100644 --- a/internal/otelcollector/config/common/types.go +++ b/internal/otelcollector/config/common/types.go @@ -166,36 +166,6 @@ type SendingQueue struct { Batch Batch `yaml:"batch,omitempty"` } -type SendingQueueOption func(*SendingQueue) - -func WithSizer(sizer Sizer) SendingQueueOption { - return func(sq *SendingQueue) { - sq.Sizer = sizer - } -} - -func WithBatch(batch Batch) SendingQueueOption { - return func(sq *SendingQueue) { - sq.Batch = batch - } -} - -func NewSendingQueue(queueSize int, opts ...SendingQueueOption) SendingQueue { - sq := SendingQueue{ - Enabled: true, - QueueSize: queueSize, - } - for _, opt := range opts { - opt(&sq) - } - - return sq -} - -func DisabledSendingQueue() SendingQueue { - return SendingQueue{Enabled: false} -} - type Batch struct { MinSize int `yaml:"min_size,omitempty"` MaxSize int `yaml:"max_size,omitempty"` From 2f24e762163c4dfb31038e030813797745b917b5 Mon Sep 17 00:00:00 2001 From: Jeffrey Limnardy Date: Tue, 26 May 2026 09:23:55 +0200 Subject: [PATCH 6/9] Apply suggestion from @hyperspace-insights[bot] Co-authored-by: hyperspace-insights[bot] <209611008+hyperspace-insights[bot]@users.noreply.github.com> --- internal/otelcollector/config/logagent/config_builder.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/otelcollector/config/logagent/config_builder.go b/internal/otelcollector/config/logagent/config_builder.go index dd29bfc7bc..3b95ee3784 100644 --- a/internal/otelcollector/config/logagent/config_builder.go +++ b/internal/otelcollector/config/logagent/config_builder.go @@ -30,7 +30,9 @@ const ( // maximum batch size in bytes (4 MB) exporterBatchMaxSize = 4_000_000 // maximum time before flusing a batch + // maximum time before flushing a batch exporterBatchFlushTimeout = 10 * time.Second + ) type buildComponentFunc = common.BuildComponentFunc[*telemetryv1beta1.LogPipeline] From 151c81faad30f3136ac52e977ec397dd3657437e Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Wed, 27 May 2026 14:54:25 +0200 Subject: [PATCH 7/9] metric level detailed --- internal/otelcollector/config/common/config_builder.go | 1 + internal/otelcollector/config/common/types.go | 1 + .../config/logagent/testdata/http-protocol-with-custom-path.yaml | 1 + .../logagent/testdata/http-protocol-without-custom-path.yaml | 1 + .../config/logagent/testdata/oauth2-authentication.yaml | 1 + .../config/logagent/testdata/service-enrichment-otel.yaml | 1 + .../logagent/testdata/single-pipeline-namespace-excluded.yaml | 1 + .../logagent/testdata/single-pipeline-namespace-included.yaml | 1 + .../otelcollector/config/logagent/testdata/single-pipeline.yaml | 1 + .../config/logagent/testdata/user-defined-filters.yaml | 1 + .../config/logagent/testdata/user-defined-transform-filter.yaml | 1 + .../config/logagent/testdata/user-defined-transforms.yaml | 1 + internal/otelcollector/config/logagent/testdata/vpa-active.yaml | 1 + .../config/metricagent/testdata/http-with-custom-path.yaml | 1 + .../config/metricagent/testdata/http-without-custom-path.yaml | 1 + .../config/metricagent/testdata/istio-diagnostic.yaml | 1 + .../otelcollector/config/metricagent/testdata/istio-envoy.yaml | 1 + .../metricagent/testdata/istio-installed-and-disabled.yaml | 1 + .../config/metricagent/testdata/istio-installed-and-enabled.yaml | 1 + .../config/metricagent/testdata/istio-namespace-filters.yaml | 1 + .../config/metricagent/testdata/istio-namespace-no-filters.yaml | 1 + .../metricagent/testdata/istio-not-installed-and-disabled.yaml | 1 + .../metricagent/testdata/istio-not-installed-and-enabled.yaml | 1 + .../otelcollector/config/metricagent/testdata/istio-only.yaml | 1 + .../config/metricagent/testdata/multiple-inputs-mixed.yaml | 1 + .../config/metricagent/testdata/oauth2-authentication.yaml | 1 + .../config/metricagent/testdata/prometheus-diagnostic.yaml | 1 + .../metricagent/testdata/prometheus-namespace-filters.yaml | 1 + .../config/metricagent/testdata/prometheus-only.yaml | 1 + .../config/metricagent/testdata/runtime-additional-metrics.yaml | 1 + .../config/metricagent/testdata/runtime-namespace-filters.yaml | 1 + .../otelcollector/config/metricagent/testdata/runtime-only.yaml | 1 + .../metricagent/testdata/runtime-resources-all-disabled.yaml | 1 + .../metricagent/testdata/runtime-resources-all-enabled.yaml | 1 + .../metricagent/testdata/runtime-resources-some-disabled.yaml | 1 + .../config/metricagent/testdata/service-enrichment-otel.yaml | 1 + .../config/metricagent/testdata/setup-comprehensive.yaml | 1 + .../config/metricagent/testdata/user-defined-filters.yaml | 1 + .../metricagent/testdata/user-defined-transform-filter.yaml | 1 + .../config/metricagent/testdata/user-defined-transforms.yaml | 1 + .../otelcollector/config/metricagent/testdata/vpa-active.yaml | 1 + .../config/otlpgateway/testdata/all-signals-multi-backend.yaml | 1 + .../otelcollector/config/otlpgateway/testdata/compression.yaml | 1 + .../otlpgateway/testdata/http-protocol-with-custom-path.yaml | 1 + .../otlpgateway/testdata/http-protocol-without-custom-path.yaml | 1 + .../config/otlpgateway/testdata/log-namespace-excluded.yaml | 1 + .../config/otlpgateway/testdata/log-namespace-included.yaml | 1 + .../config/otlpgateway/testdata/log-otlp-input-disabled.yaml | 1 + .../config/otlpgateway/testdata/log-single-pipeline.yaml | 1 + .../config/otlpgateway/testdata/metric-comprehensive.yaml | 1 + .../config/otlpgateway/testdata/metric-namespace-filters.yaml | 1 + .../config/otlpgateway/testdata/metric-otlp-disabled.yaml | 1 + .../config/otlpgateway/testdata/metric-otlp-only.yaml | 1 + .../config/otlpgateway/testdata/metric-single-pipeline.yaml | 1 + .../config/otlpgateway/testdata/mixed-pipelines.yaml | 1 + .../config/otlpgateway/testdata/oauth2-authentication.yaml | 1 + .../config/otlpgateway/testdata/service-enrichment-otel.yaml | 1 + .../config/otlpgateway/testdata/single-pipeline.yaml | 1 + .../config/otlpgateway/testdata/trace-single-pipeline.yaml | 1 + .../config/otlpgateway/testdata/user-defined-filters.yaml | 1 + .../otlpgateway/testdata/user-defined-transform-filter.yaml | 1 + .../config/otlpgateway/testdata/user-defined-transforms.yaml | 1 + .../config/otlpgateway/testdata/vpa-active-all-signals.yaml | 1 + 63 files changed, 63 insertions(+) diff --git a/internal/otelcollector/config/common/config_builder.go b/internal/otelcollector/config/common/config_builder.go index 67e7e6e6ff..123d571815 100644 --- a/internal/otelcollector/config/common/config_builder.go +++ b/internal/otelcollector/config/common/config_builder.go @@ -37,6 +37,7 @@ func defaultService() ServiceConfig { }, }, }, + Level: "detailed", }, Logs: Logs{ Level: "info", diff --git a/internal/otelcollector/config/common/types.go b/internal/otelcollector/config/common/types.go index 23c9968e2a..29af4b5e67 100644 --- a/internal/otelcollector/config/common/types.go +++ b/internal/otelcollector/config/common/types.go @@ -84,6 +84,7 @@ type Telemetry struct { type TelemetryMetrics struct { Readers []TelemetryMetricReader `yaml:"readers"` + Level string `yaml:"level,omitempty"` } type TelemetryMetricReader struct { diff --git a/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml b/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml index c1f39c828a..26745a0760 100644 --- a/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml +++ b/internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml b/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml index f4e2c21535..41e17126d1 100644 --- a/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml +++ b/internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml b/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml index e573d42fe9..aef5a605b2 100644 --- a/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml +++ b/internal/otelcollector/config/logagent/testdata/oauth2-authentication.yaml @@ -44,6 +44,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml b/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml index 993c51f0fc..640ac879f0 100644 --- a/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml +++ b/internal/otelcollector/config/logagent/testdata/service-enrichment-otel.yaml @@ -39,6 +39,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml index 12fa84f5aa..77f1f08573 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-excluded.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml index a1b327089d..410f4a261d 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline-namespace-included.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml b/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml index 2f92477996..5ac16addb5 100644 --- a/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml +++ b/internal/otelcollector/config/logagent/testdata/single-pipeline.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml index bbbefcce30..10e51f0581 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml @@ -52,6 +52,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml index 3703c426d3..5d7bcc7f90 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml @@ -40,6 +40,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml b/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml index 6ca97295ef..5d7643715f 100644 --- a/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml +++ b/internal/otelcollector/config/logagent/testdata/user-defined-transforms.yaml @@ -52,6 +52,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/logagent/testdata/vpa-active.yaml b/internal/otelcollector/config/logagent/testdata/vpa-active.yaml index 4eb199579e..2414b42420 100644 --- a/internal/otelcollector/config/logagent/testdata/vpa-active.yaml +++ b/internal/otelcollector/config/logagent/testdata/vpa-active.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/http-with-custom-path.yaml b/internal/otelcollector/config/metricagent/testdata/http-with-custom-path.yaml index df70352662..3357b45b00 100644 --- a/internal/otelcollector/config/metricagent/testdata/http-with-custom-path.yaml +++ b/internal/otelcollector/config/metricagent/testdata/http-with-custom-path.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/http-without-custom-path.yaml b/internal/otelcollector/config/metricagent/testdata/http-without-custom-path.yaml index f4c85b6886..81895e580b 100644 --- a/internal/otelcollector/config/metricagent/testdata/http-without-custom-path.yaml +++ b/internal/otelcollector/config/metricagent/testdata/http-without-custom-path.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-diagnostic.yaml b/internal/otelcollector/config/metricagent/testdata/istio-diagnostic.yaml index 3e969d6cd9..88f32b3855 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-diagnostic.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-diagnostic.yaml @@ -57,6 +57,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-envoy.yaml b/internal/otelcollector/config/metricagent/testdata/istio-envoy.yaml index 7eec4d8395..f91c41c3f0 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-envoy.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-envoy.yaml @@ -57,6 +57,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-installed-and-disabled.yaml b/internal/otelcollector/config/metricagent/testdata/istio-installed-and-disabled.yaml index 22cfc47a7d..1685ee9b72 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-installed-and-disabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-installed-and-disabled.yaml @@ -74,6 +74,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-installed-and-enabled.yaml b/internal/otelcollector/config/metricagent/testdata/istio-installed-and-enabled.yaml index 10366213ca..7bf1f996a8 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-installed-and-enabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-installed-and-enabled.yaml @@ -87,6 +87,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-namespace-filters.yaml b/internal/otelcollector/config/metricagent/testdata/istio-namespace-filters.yaml index 7a58654261..9b6fb6303a 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-namespace-filters.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-namespace-filters.yaml @@ -59,6 +59,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-namespace-no-filters.yaml b/internal/otelcollector/config/metricagent/testdata/istio-namespace-no-filters.yaml index 5176304d6d..b897d0dcee 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-namespace-no-filters.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-namespace-no-filters.yaml @@ -58,6 +58,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-disabled.yaml b/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-disabled.yaml index 2de099363a..618b041e1d 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-disabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-disabled.yaml @@ -74,6 +74,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-enabled.yaml b/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-enabled.yaml index 1bbb03e729..1111be1223 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-enabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-not-installed-and-enabled.yaml @@ -87,6 +87,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/istio-only.yaml b/internal/otelcollector/config/metricagent/testdata/istio-only.yaml index 6d0f1f388b..865374d459 100644 --- a/internal/otelcollector/config/metricagent/testdata/istio-only.yaml +++ b/internal/otelcollector/config/metricagent/testdata/istio-only.yaml @@ -58,6 +58,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/multiple-inputs-mixed.yaml b/internal/otelcollector/config/metricagent/testdata/multiple-inputs-mixed.yaml index 148bfbd72b..7cb9ff130f 100644 --- a/internal/otelcollector/config/metricagent/testdata/multiple-inputs-mixed.yaml +++ b/internal/otelcollector/config/metricagent/testdata/multiple-inputs-mixed.yaml @@ -113,6 +113,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/oauth2-authentication.yaml b/internal/otelcollector/config/metricagent/testdata/oauth2-authentication.yaml index 850f160fc0..755ac0f672 100644 --- a/internal/otelcollector/config/metricagent/testdata/oauth2-authentication.yaml +++ b/internal/otelcollector/config/metricagent/testdata/oauth2-authentication.yaml @@ -49,6 +49,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/prometheus-diagnostic.yaml b/internal/otelcollector/config/metricagent/testdata/prometheus-diagnostic.yaml index f3b356b487..bed6ed94c0 100644 --- a/internal/otelcollector/config/metricagent/testdata/prometheus-diagnostic.yaml +++ b/internal/otelcollector/config/metricagent/testdata/prometheus-diagnostic.yaml @@ -57,6 +57,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/prometheus-namespace-filters.yaml b/internal/otelcollector/config/metricagent/testdata/prometheus-namespace-filters.yaml index 2f12d376a1..cd6ae47638 100644 --- a/internal/otelcollector/config/metricagent/testdata/prometheus-namespace-filters.yaml +++ b/internal/otelcollector/config/metricagent/testdata/prometheus-namespace-filters.yaml @@ -59,6 +59,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/prometheus-only.yaml b/internal/otelcollector/config/metricagent/testdata/prometheus-only.yaml index f7681548f1..940dc66c53 100644 --- a/internal/otelcollector/config/metricagent/testdata/prometheus-only.yaml +++ b/internal/otelcollector/config/metricagent/testdata/prometheus-only.yaml @@ -58,6 +58,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-additional-metrics.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-additional-metrics.yaml index bda18e2935..defeee1e48 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-additional-metrics.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-additional-metrics.yaml @@ -82,6 +82,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-namespace-filters.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-namespace-filters.yaml index 7f5c39c548..7d6cb7587c 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-namespace-filters.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-namespace-filters.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-only.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-only.yaml index f851b1d8c3..838392c60d 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-only.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-only.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-disabled.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-disabled.yaml index a8f9f5e59e..2c59236ddf 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-disabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-disabled.yaml @@ -67,6 +67,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-enabled.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-enabled.yaml index f851b1d8c3..838392c60d 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-enabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-resources-all-enabled.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/runtime-resources-some-disabled.yaml b/internal/otelcollector/config/metricagent/testdata/runtime-resources-some-disabled.yaml index 36790247a0..899656d0a8 100644 --- a/internal/otelcollector/config/metricagent/testdata/runtime-resources-some-disabled.yaml +++ b/internal/otelcollector/config/metricagent/testdata/runtime-resources-some-disabled.yaml @@ -63,6 +63,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/service-enrichment-otel.yaml b/internal/otelcollector/config/metricagent/testdata/service-enrichment-otel.yaml index 1cce8ab4fa..14e0673022 100644 --- a/internal/otelcollector/config/metricagent/testdata/service-enrichment-otel.yaml +++ b/internal/otelcollector/config/metricagent/testdata/service-enrichment-otel.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/setup-comprehensive.yaml b/internal/otelcollector/config/metricagent/testdata/setup-comprehensive.yaml index 2d9fa13c84..7f40f6fa98 100644 --- a/internal/otelcollector/config/metricagent/testdata/setup-comprehensive.yaml +++ b/internal/otelcollector/config/metricagent/testdata/setup-comprehensive.yaml @@ -89,6 +89,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/user-defined-filters.yaml b/internal/otelcollector/config/metricagent/testdata/user-defined-filters.yaml index 9bd327b1ac..463579e2aa 100644 --- a/internal/otelcollector/config/metricagent/testdata/user-defined-filters.yaml +++ b/internal/otelcollector/config/metricagent/testdata/user-defined-filters.yaml @@ -74,6 +74,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/user-defined-transform-filter.yaml b/internal/otelcollector/config/metricagent/testdata/user-defined-transform-filter.yaml index 2fcf935538..297b38fb79 100644 --- a/internal/otelcollector/config/metricagent/testdata/user-defined-transform-filter.yaml +++ b/internal/otelcollector/config/metricagent/testdata/user-defined-transform-filter.yaml @@ -62,6 +62,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/user-defined-transforms.yaml b/internal/otelcollector/config/metricagent/testdata/user-defined-transforms.yaml index c47c58fc2e..47c9a3b067 100644 --- a/internal/otelcollector/config/metricagent/testdata/user-defined-transforms.yaml +++ b/internal/otelcollector/config/metricagent/testdata/user-defined-transforms.yaml @@ -74,6 +74,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/vpa-active.yaml b/internal/otelcollector/config/metricagent/testdata/vpa-active.yaml index f851b1d8c3..838392c60d 100644 --- a/internal/otelcollector/config/metricagent/testdata/vpa-active.yaml +++ b/internal/otelcollector/config/metricagent/testdata/vpa-active.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/all-signals-multi-backend.yaml b/internal/otelcollector/config/otlpgateway/testdata/all-signals-multi-backend.yaml index e5a0a69f80..a0a6d7ca6b 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/all-signals-multi-backend.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/all-signals-multi-backend.yaml @@ -124,6 +124,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/compression.yaml b/internal/otelcollector/config/otlpgateway/testdata/compression.yaml index a193338990..70c67e5c8b 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/compression.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/compression.yaml @@ -88,6 +88,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/http-protocol-with-custom-path.yaml b/internal/otelcollector/config/otlpgateway/testdata/http-protocol-with-custom-path.yaml index 8d295ba7ba..df3895caf7 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/http-protocol-with-custom-path.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/http-protocol-with-custom-path.yaml @@ -88,6 +88,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/http-protocol-without-custom-path.yaml b/internal/otelcollector/config/otlpgateway/testdata/http-protocol-without-custom-path.yaml index 2e17fd8a10..6d3a00c21f 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/http-protocol-without-custom-path.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/http-protocol-without-custom-path.yaml @@ -88,6 +88,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/log-namespace-excluded.yaml b/internal/otelcollector/config/otlpgateway/testdata/log-namespace-excluded.yaml index 23be8806e0..9d7aff98fe 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/log-namespace-excluded.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/log-namespace-excluded.yaml @@ -39,6 +39,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/log-namespace-included.yaml b/internal/otelcollector/config/otlpgateway/testdata/log-namespace-included.yaml index 6a1eef7157..5bf5df6c71 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/log-namespace-included.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/log-namespace-included.yaml @@ -39,6 +39,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/log-otlp-input-disabled.yaml b/internal/otelcollector/config/otlpgateway/testdata/log-otlp-input-disabled.yaml index 68223bc717..fe511337be 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/log-otlp-input-disabled.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/log-otlp-input-disabled.yaml @@ -39,6 +39,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/log-single-pipeline.yaml b/internal/otelcollector/config/otlpgateway/testdata/log-single-pipeline.yaml index ec7391f60a..6a88614ab8 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/log-single-pipeline.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/log-single-pipeline.yaml @@ -38,6 +38,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-comprehensive.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-comprehensive.yaml index 3b929df438..98baa6ad3a 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-comprehensive.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-comprehensive.yaml @@ -74,6 +74,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-namespace-filters.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-namespace-filters.yaml index 20d27931ff..02dad774c9 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-namespace-filters.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-namespace-filters.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-disabled.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-disabled.yaml index 5e208903ea..3c5ebbc27a 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-disabled.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-disabled.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-only.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-only.yaml index 80d771367d..219cf0f2c8 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-only.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-otlp-only.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-single-pipeline.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-single-pipeline.yaml index 80d771367d..219cf0f2c8 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-single-pipeline.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-single-pipeline.yaml @@ -60,6 +60,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/mixed-pipelines.yaml b/internal/otelcollector/config/otlpgateway/testdata/mixed-pipelines.yaml index d7b9f3ace7..4cdbc097b6 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/mixed-pipelines.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/mixed-pipelines.yaml @@ -66,6 +66,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/oauth2-authentication.yaml b/internal/otelcollector/config/otlpgateway/testdata/oauth2-authentication.yaml index e395ac7671..5c0385680d 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/oauth2-authentication.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/oauth2-authentication.yaml @@ -106,6 +106,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/service-enrichment-otel.yaml b/internal/otelcollector/config/otlpgateway/testdata/service-enrichment-otel.yaml index 4f588996bd..83f014e042 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/service-enrichment-otel.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/service-enrichment-otel.yaml @@ -92,6 +92,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/single-pipeline.yaml b/internal/otelcollector/config/otlpgateway/testdata/single-pipeline.yaml index 97428432a2..044dd40602 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/single-pipeline.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/single-pipeline.yaml @@ -88,6 +88,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/trace-single-pipeline.yaml b/internal/otelcollector/config/otlpgateway/testdata/trace-single-pipeline.yaml index 43adf095e2..3cd2b6663f 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/trace-single-pipeline.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/trace-single-pipeline.yaml @@ -36,6 +36,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/user-defined-filters.yaml b/internal/otelcollector/config/otlpgateway/testdata/user-defined-filters.yaml index 30cfe03eb2..1d57d5f0a4 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/user-defined-filters.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/user-defined-filters.yaml @@ -130,6 +130,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/user-defined-transform-filter.yaml b/internal/otelcollector/config/otlpgateway/testdata/user-defined-transform-filter.yaml index 4aa8d1e6ce..3ac6026c9f 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/user-defined-transform-filter.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/user-defined-transform-filter.yaml @@ -94,6 +94,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/user-defined-transforms.yaml b/internal/otelcollector/config/otlpgateway/testdata/user-defined-transforms.yaml index a99a2bc2a9..41bc1ab08c 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/user-defined-transforms.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/user-defined-transforms.yaml @@ -130,6 +130,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/vpa-active-all-signals.yaml b/internal/otelcollector/config/otlpgateway/testdata/vpa-active-all-signals.yaml index 97428432a2..044dd40602 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/vpa-active-all-signals.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/vpa-active-all-signals.yaml @@ -88,6 +88,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json From aba84026df9e62f1ac7d44ed57dfa74e41b4dd9e Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Mon, 1 Jun 2026 11:34:08 +0200 Subject: [PATCH 8/9] lint --- internal/otelcollector/config/logagent/config_builder.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/otelcollector/config/logagent/config_builder.go b/internal/otelcollector/config/logagent/config_builder.go index 3b95ee3784..06dc1ca528 100644 --- a/internal/otelcollector/config/logagent/config_builder.go +++ b/internal/otelcollector/config/logagent/config_builder.go @@ -32,7 +32,6 @@ const ( // maximum time before flusing a batch // maximum time before flushing a batch exporterBatchFlushTimeout = 10 * time.Second - ) type buildComponentFunc = common.BuildComponentFunc[*telemetryv1beta1.LogPipeline] From 63fe0fa811efb2899b2d7807cdec18eb0b79762b Mon Sep 17 00:00:00 2001 From: jeffreylimnardy Date: Mon, 1 Jun 2026 11:35:22 +0200 Subject: [PATCH 9/9] update golden files --- .../testdata/delta-temporality-multiple-pipelines.yaml | 1 + .../config/metricagent/testdata/delta-temporality.yaml | 1 + .../config/metricagent/testdata/mixed-temporality.yaml | 1 + .../config/otlpgateway/testdata/metric-delta-temporality.yaml | 1 + .../config/otlpgateway/testdata/metric-mixed-temporality.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/internal/otelcollector/config/metricagent/testdata/delta-temporality-multiple-pipelines.yaml b/internal/otelcollector/config/metricagent/testdata/delta-temporality-multiple-pipelines.yaml index 57c68b2d11..283d130e8c 100644 --- a/internal/otelcollector/config/metricagent/testdata/delta-temporality-multiple-pipelines.yaml +++ b/internal/otelcollector/config/metricagent/testdata/delta-temporality-multiple-pipelines.yaml @@ -87,6 +87,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/delta-temporality.yaml b/internal/otelcollector/config/metricagent/testdata/delta-temporality.yaml index 6815f76150..4a5e275a19 100644 --- a/internal/otelcollector/config/metricagent/testdata/delta-temporality.yaml +++ b/internal/otelcollector/config/metricagent/testdata/delta-temporality.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/metricagent/testdata/mixed-temporality.yaml b/internal/otelcollector/config/metricagent/testdata/mixed-temporality.yaml index 6a0ff32c3b..1c8d1884a3 100644 --- a/internal/otelcollector/config/metricagent/testdata/mixed-temporality.yaml +++ b/internal/otelcollector/config/metricagent/testdata/mixed-temporality.yaml @@ -73,6 +73,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-delta-temporality.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-delta-temporality.yaml index 509691c3ba..40edf9fff4 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-delta-temporality.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-delta-temporality.yaml @@ -61,6 +61,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json diff --git a/internal/otelcollector/config/otlpgateway/testdata/metric-mixed-temporality.yaml b/internal/otelcollector/config/otlpgateway/testdata/metric-mixed-temporality.yaml index 3544b26c9d..884deb098f 100644 --- a/internal/otelcollector/config/otlpgateway/testdata/metric-mixed-temporality.yaml +++ b/internal/otelcollector/config/otlpgateway/testdata/metric-mixed-temporality.yaml @@ -69,6 +69,7 @@ service: without_scope_info: false without_type_suffix: false without_units: false + level: detailed logs: level: info encoding: json