Skip to content

Commit

Permalink
Update feature tracking metric fields.
Browse files Browse the repository at this point in the history
  • Loading branch information
@franciscovalentecastro
franciscovalentecastro committed Jan 20, 2025
1 parent 597e6e8 commit 395a4e5
Show file tree
Hide file tree
Showing 698 changed files with 1,401 additions and 1,401 deletions.
2 changes: 1 addition & 1 deletion confgenerator/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ func (uc *UnifiedConfig) LoggingReceivers(ctx context.Context) (map[string]Compo
return out, nil
}

// LoggingProcessors returns a map of potential logging receivers.
// LoggingProcessors returns a map of potential logging processors.
// Each Component may or may not be usable in fluent-bit or otel.
func (uc *UnifiedConfig) LoggingProcessors(ctx context.Context) (map[string]Component, error) {
out := map[string]Component{}
Expand Down
8 changes: 4 additions & 4 deletions confgenerator/feature_tracking.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ type CustomFeatures interface {
func ExtractFeatures(uc *UnifiedConfig) ([]Feature, error) {
allFeatures := getOverriddenDefaultPipelines(uc)
allFeatures = append(allFeatures, getSelfLogCollection(uc))
allFeatures = append(allFeatures, getOTelLoggingSupport(uc))
allFeatures = append(allFeatures, getOTelLoggingCompatible(uc))

var err error
var tempTrackedFeatures []Feature
Expand Down Expand Up @@ -439,12 +439,12 @@ func getMetadata(field reflect.StructField) metadata {
}
}

func getOTelLoggingSupport(uc *UnifiedConfig) Feature {
func getOTelLoggingCompatible(uc *UnifiedConfig) Feature {
feature := Feature{
Module: "logging",
Kind: "service",
Kind: "compatibility",
Type: "otel_logging",
Key: []string{"otel_logging_support"},
Key: []string{"otel_logging_compatible_config"},
Value: "true",
}

Expand Down
12 changes: 6 additions & 6 deletions confgenerator/feature_tracking_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ var expectedFeatureBase = []confgenerator.Feature{
},
{
Module: "logging",
Kind: "service",
Kind: "compatibility",
Type: "otel_logging",
Key: []string{"otel_logging_support"},
Key: []string{"otel_logging_compatible_config"},
Value: "true",
},
}
Expand Down Expand Up @@ -94,9 +94,9 @@ var expectedMetricsPipelineOverriden = []confgenerator.Feature{
},
{
Module: "logging",
Kind: "service",
Kind: "compatibility",
Type: "otel_logging",
Key: []string{"otel_logging_support"},
Key: []string{"otel_logging_compatible_config"},
Value: "true",
},
}
Expand Down Expand Up @@ -125,9 +125,9 @@ var expectedTestFeatureBase = []confgenerator.Feature{
},
{
Module: "logging",
Kind: "service",
Kind: "compatibility",
Type: "otel_logging",
Key: []string{"otel_logging_support"},
Key: []string{"otel_logging_compatible_config"},
Value: "true",
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...ta/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: metrics
feature: receivers:hostmetrics
Expand Down
4 changes: 2 additions & 2 deletions ...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: metrics
feature: receivers:hostmetrics
Expand Down
4 changes: 2 additions & 2 deletions ...goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: metrics
feature: receivers:hostmetrics
Expand Down
4 changes: 2 additions & 2 deletions ...data/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: metrics
feature: receivers:hostmetrics
Expand Down
4 changes: 2 additions & 2 deletions ...nerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "false"
- module: logging
feature: receivers:systemd_journald
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "false"
- module: logging
feature: receivers:systemd_journald
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions ...generator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/linux-dataproc/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...tdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions .../testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...ta/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...estdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...ata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions .../goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...tdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...rator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...generator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
4 changes: 2 additions & 2 deletions ...or/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
key: default_self_log_file_collection
value: "true"
- module: logging
feature: service:otel_logging
key: otel_logging_support
feature: compatibility:otel_logging
key: otel_logging_compatible_config
value: "true"
- module: combined
feature: receivers:otlp
Expand Down
Loading

0 comments on commit 395a4e5

Please sign in to comment.