diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index b063638f31..a844451f9d 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -61,9 +61,8 @@ func googleCloudLoggingExporter() otel.Component { return otel.Component{ Type: "googlecloud", Config: map[string]interface{}{ - // Set to mirror the 60s max limit of default retry window in Google Cloud Logging apiv2 go client : - // https://github.com/googleapis/google-cloud-go/blob/logging/v1.4.2/logging/apiv2/logging_client.go#L78-L90 - "timeout": "60s", + // Keep trying to send log entries for 1 hour before we drop them. + "timeout": "3600s", "sending_queue": map[string]interface{}{ "enabled": true, // Set queue_size to "(num_consumers + 2)*1000" to always have a new batch ready. @@ -79,6 +78,8 @@ func googleCloudLoggingExporter() otel.Component { "max_size": 1000, "sizer": "items", }, + // Persist logs on disk to survive restarts during network outages. + "storage": fileStorageExtensionID, }, }, } @@ -164,10 +165,9 @@ func (uc *UnifiedConfig) getOTelLogLevel() string { return logLevel } -// fileStorageExtensionID returns the file_storage extension used by all receivers and exporters. -func fileStorageExtensionID() string { - return "file_storage" -} +const ( + fileStorageExtensionID = "file_storage" +) // fileStorageExtensionConfig returns a configured file_storage extension to be used by all receivers and exporters. func fileStorageExtensionConfig(stateDir string) map[string]interface{} { @@ -184,7 +184,7 @@ func (uc *UnifiedConfig) getEnabledExtensions(ctx context.Context, stateDir stri extensions["googleclientauth"] = map[string]interface{}{} } if uc.Logging.Service.OTelLogging { - extensions["file_storage"] = fileStorageExtensionConfig(stateDir) + extensions[fileStorageExtensionID] = fileStorageExtensionConfig(stateDir) } return extensions } diff --git a/confgenerator/logging_receivers.go b/confgenerator/logging_receivers.go index 0fe214472b..2fc160530c 100644 --- a/confgenerator/logging_receivers.go +++ b/confgenerator/logging_receivers.go @@ -209,7 +209,7 @@ func (r LoggingReceiverFilesMixin) Pipelines(ctx context.Context) ([]otel.Receiv "fingerprint_size": "5kb", } if !r.TransformationTest { - receiver_config["storage"] = fileStorageExtensionID() + receiver_config["storage"] = fileStorageExtensionID } if i := r.WildcardRefreshInterval; i != nil { receiver_config["poll_interval"] = i.String() @@ -650,7 +650,7 @@ func (r LoggingReceiverWindowsEventLog) Pipelines(ctx context.Context) ([]otel.R "start_at": "beginning", "poll_interval": "1s", "ignore_channel_errors": true, - "storage": fileStorageExtensionID(), + "storage": fileStorageExtensionID, // When "include_log_record_original = true", the event original XML string is set in `attributes."log.record.original"`. "include_log_record_original": true, } @@ -1036,7 +1036,7 @@ func (r LoggingReceiverSystemd) Pipelines(ctx context.Context) ([]otel.ReceiverP receiver_config := map[string]any{ "start_at": "beginning", "priority": "debug", - "storage": fileStorageExtensionID(), + "storage": fileStorageExtensionID, } modify_fields_processors, err := LoggingProcessorModifyFields{ diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml index 7ef884bdcb..7854678c1f 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s googlecloud/otel: metric: instrumentation_library_labels: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml index 13ba565b6b..7a92167f72 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s googlecloud/otel: metric: instrumentation_library_labels: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml index f5b9baf066..b0e692bfc9 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s googlecloud/otel: metric: instrumentation_library_labels: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml index f5b9baf066..b0e692bfc9 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s googlecloud/otel: metric: instrumentation_library_labels: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml index 6663e61a4e..932ba5781b 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml index a869e40222..a8ad59612d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml index 9624dddd82..0e1cb2bd6b 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml index 9624dddd82..0e1cb2bd6b 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml index b1f338bf1a..59790c9a3c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml index 4d2b03d9c0..7c8dcd0755 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml index 78a53b9733..0a5cc2f1e4 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml index 78a53b9733..0a5cc2f1e4 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml index a57fb4bf40..faaec89718 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml index 674ff4c37d..8422cf29e9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml index 2fe95c5896..c76061a07d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml index 2fe95c5896..c76061a07d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml index b96b9ab313..44804f9cb8 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml index 7ab163a966..4f4cc84281 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml index 5fc9e39d2c..2c9766c10d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml index 5fc9e39d2c..2c9766c10d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index 904babe6fe..284a71b218 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index 832d314501..8b711e6e1c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index a86b3aa5cd..03e361dd04 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index a86b3aa5cd..03e361dd04 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index b6ee56b4b8..23cbe448ac 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml index 14d0b74cf9..0a6ea46bce 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 21c1bacc4d..1949960485 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml index 21c1bacc4d..1949960485 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml index 32f447963b..9c3330e5e5 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml index bbef47812e..da7fce29ff 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml index cb3b1bd54f..6af2a26a7f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml index cb3b1bd54f..6af2a26a7f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml index 8949e4741a..ae07ee5cc8 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml index 6ed99d5eb8..0223d42dba 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml index 4f40dcb921..dbfa43ffdb 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml index 4f40dcb921..dbfa43ffdb 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml index 4642bd87ed..9ec1404415 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml index db431396d3..d610cf0bad 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml index 995a18b938..8ac15ee31e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml index 995a18b938..8ac15ee31e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml index 7dc323f8bf..9618b7cefa 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml index 636a70d334..970ac3c20b 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml index d54b6657e2..6ba8dd1170 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml index d54b6657e2..6ba8dd1170 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml index 628570260b..e3ad24b024 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml index 563f5d2ed2..f49c00bc1d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml index 7bed928cb5..7462760230 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml index 7bed928cb5..7462760230 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml index 7101a6e4a4..b00b530148 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml index 528f94418d..8c6f81ee96 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml index e9a16dfa13..e27f523a30 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml index e9a16dfa13..e27f523a30 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml index c687c01ffe..d6472ffc3a 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml index 40ed87dc5c..fb3f043c7f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml index a5d4a99803..78099fb304 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml index a5d4a99803..78099fb304 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml index 0094fb1693..f6fea70b34 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml index 0094fb1693..f6fea70b34 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml @@ -19,7 +19,8 @@ exporters: num_consumers: 10 queue_size: 12000 sizer: items - timeout: 60s + storage: file_storage + timeout: 3600s extensions: file_storage: create_directory: true