Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions confgenerator/confgenerator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
},
},
}
Expand Down Expand Up @@ -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{} {
Expand All @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions confgenerator/logging_receivers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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,
}
Expand Down Expand Up @@ -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{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading