Add feature tracking for service sections

confgenerator/config.go

@@ -62,6 +62,10 @@ func (uc *UnifiedConfig) HasMetrics() bool {
 	return uc.Metrics != nil
 }
 
+func (uc *UnifiedConfig) HasTraces() bool {
+	return uc.Traces != nil
+}
+
 func (uc *UnifiedConfig) HasCombined() bool {
 	return uc.Combined != nil
 }

confgenerator/feature_tracking.go

@@ -94,6 +94,16 @@ func ExtractFeatures(ctx context.Context, userUc, mergedUc *UnifiedConfig) ([]Fe
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
+
+		tempTrackedFeatures, err = trackingFeatures(reflect.ValueOf(userUc.Metrics.Service), metadata{}, Feature{
+			Module: "metrics",
+			Kind:   "service",
+			Type:   "service",
+		})
+		if err != nil {
+			return nil, err
+		}
+		allFeatures = append(allFeatures, tempTrackedFeatures...)
 	}
 
 	if userUc.HasLogging() {
@@ -108,6 +118,28 @@ func ExtractFeatures(ctx context.Context, userUc, mergedUc *UnifiedConfig) ([]Fe
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
+
+		tempTrackedFeatures, err = trackingFeatures(reflect.ValueOf(userUc.Logging.Service), metadata{}, Feature{
+			Module: "logging",
+			Kind:   "service",
+			Type:   "service",
+		})
+		if err != nil {
+			return nil, err
+		}
+		allFeatures = append(allFeatures, tempTrackedFeatures...)
+	}
+
+	if userUc.HasTraces() {
+		tempTrackedFeatures, err = trackingFeatures(reflect.ValueOf(userUc.Traces.Service), metadata{}, Feature{
+			Module: "traces",
+			Kind:   "service",
+			Type:   "service",
+		})
+		if err != nil {
+			return nil, err
+		}
+		allFeatures = append(allFeatures, tempTrackedFeatures...)
 	}
 
 	if userUc.HasCombined() {
@@ -417,17 +449,16 @@ func getMetadata(field reflect.StructField) metadata {
 	}
 	isExcluded := trackingTag == "-"
 
-	yamlTag, ok := field.Tag.Lookup("yaml")
-	if !ok {
-		panic("field must have a yaml tag")
-	}
-
+	yamlName := strings.ToLower(field.Name)
 	hasInline := false
-	yamlTags := strings.Split(yamlTag, ",")
-	for _, tag := range yamlTags {
-		if tag == "inline" {
-			hasInline = true
+	if yamlTag, ok := field.Tag.Lookup("yaml"); ok {
+		yamlTags := strings.Split(yamlTag, ",")
+		for _, tag := range yamlTags {
+			if tag == "inline" {
+				hasInline = true
+			}
 		}
+		yamlName = yamlTags[0]
 	}
 
 	return metadata{
@@ -439,7 +470,7 @@ func getMetadata(field reflect.StructField) metadata {
 		overrideValue: trackingTags[0],
 		// The first tag is the field identifier
 		// See this for more details: https://pkg.go.dev/gopkg.in/yaml.v2#Unmarshal
-		yamlTag: yamlTags[0],
+		yamlTag: yamlName,
 	}
 }
 

confgenerator/feature_tracking_test.go

@@ -132,6 +132,20 @@ var expectedMetricsPipelineOverriden = []confgenerator.Feature{
 		Key:    []string{"otlp_exporter"},
 		Value:  "false",
 	},
+	{
+		Module: "metrics",
+		Kind:   "service",
+		Type:   "service",
+		Key:    []string{"pipelines", "__length"},
+		Value:  "1",
+	},
+	{
+		Module: "metrics",
+		Kind:   "service",
+		Type:   "service",
+		Key:    []string{"pipelines", "[0]", "receivers", "__length"},
+		Value:  "3",
+	},
 }
 
 var expectedTestFeatureBase = []confgenerator.Feature{
@@ -229,7 +243,21 @@ var expectedOtelLoggingNotSupported = []confgenerator.Feature{
 		Key:    []string{"otlp_exporter"},
 		Value:  "false",
 	},
-}
+	{
+		Module: "logging",
+		Kind:   "service",
+		Type:   "service",
+		Key:    []string{"pipelines", "__length"},
+		Value:  "1",
+	},
+
+	{
+		Module: "logging",
+		Kind:   "service",
+		Type:   "service",
+		Key:    []string{"pipelines", "[0]", "processors", "__length"},
+		Value:  "1",
+	}}
 
 func testContext() context.Context {
 	pl := platform.Platform{
@@ -257,8 +285,8 @@ func TestEmptyConfig(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !cmp.Equal(features, expectedFeatureBase) {
-		t.Fatalf("expected: %v, actual: %v", expectedFeatureBase, features)
+	if d := cmp.Diff(features, expectedFeatureBase); d != "" {
+		t.Fatalf("got (-)/want (+):\n%s", d)
 	}
 }
 
@@ -756,8 +784,8 @@ func TestBed(t *testing.T) {
 				}
 			} else {
 				expected := test.Expected
-				if !cmp.Equal(actual, expected) {
-					t.Fatalf("expected: %v, actual: %v, \ndiff: %v", expected, actual, cmp.Diff(expected, actual))
+				if d := cmp.Diff(actual, expected); d != "" {
+					t.Fatalf("got (-)/want (+):\n%s", d)
 				}
 			}
 		})
@@ -823,8 +851,8 @@ func TestOtelLoggingSupported(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !cmp.Equal(features, expectedFeatureBase) {
-		t.Fatalf("expected: %v, actual: %v", expectedFeatureBase, features)
+	if d := cmp.Diff(features, expectedFeatureBase); d != "" {
+		t.Fatalf("got (-)/want (+):\n%s", d)
 	}
 }
 
@@ -870,8 +898,8 @@ func TestOtelLoggingNotSupported(t *testing.T) {
 
 	fmt.Println(features)
 
-	if !cmp.Equal(features, expectedOtelLoggingNotSupported) {
-		t.Fatalf("expected: %v, actual: %v", expectedOtelLoggingNotSupported, features)
+	if d := cmp.Diff(features, expectedOtelLoggingNotSupported); d != "" {
+		t.Fatalf("got (-)/want (+):\n%s", d)
 	}
 }
 
@@ -893,8 +921,8 @@ func TestOverrideDefaultPipeline(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !cmp.Equal(features, expectedMetricsPipelineOverriden) {
-		t.Fatalf("expected: %v, actual: %v", expectedMetricsPipelineOverriden, features)
+	if d := cmp.Diff(features, expectedMetricsPipelineOverriden); d != "" {
+		t.Fatalf("got (-)/want (+):\n%s", d)
 	}
 }
 
@@ -1231,8 +1259,8 @@ func TestNestedStructs(t *testing.T) {
 		Key:    []string{"[0]", "b", "int"},
 		Value:  "64",
 	})
-	if !cmp.Equal(features, expected) {
-		t.Fatalf("expected: %v, actual: %v", expected, features)
+	if d := cmp.Diff(features, expected); d != "" {
+		t.Fatalf("got (-)/want (+):\n%s", d)
 	}
 }
 

confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/feature_tracking_otlp.json

@@ -1 +1 @@
-{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"receivers:hostmetrics"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"2"}}],"asInt":"1"}]}}]}]}]}
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"receivers:hostmetrics"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].exporters.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"2"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].exporters.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]}

confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/features.yaml

@@ -26,6 +26,18 @@
   feature: receivers:hostmetrics
   key: "[0].enabled"
   value: "true"
+- module: metrics
+  feature: service:service
+  key: pipelines.__length
+  value: "1"
+- module: metrics
+  feature: service:service
+  key: pipelines.[0].receivers.__length
+  value: "1"
+- module: metrics
+  feature: service:service
+  key: pipelines.[0].exporters.__length
+  value: "1"
 - module: logging
   feature: receivers:files
   key: "[0].enabled"
@@ -34,3 +46,15 @@
   feature: receivers:files
   key: "[0].include_paths.__length"
   value: "2"
+- module: logging
+  feature: service:service
+  key: pipelines.__length
+  value: "1"
+- module: logging
+  feature: service:service
+  key: pipelines.[0].receivers.__length
+  value: "1"
+- module: logging
+  feature: service:service
+  key: pipelines.[0].exporters.__length
+  value: "1"

confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/feature_tracking_otlp.json

@@ -1 +1 @@
-{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"receivers:hostmetrics"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"2"}}],"asInt":"1"}]}}]}]}]}
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"receivers:hostmetrics"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].exporters.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"2"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].exporters.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]}

confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/features.yaml

@@ -26,6 +26,18 @@
   feature: receivers:hostmetrics
   key: "[0].enabled"
   value: "true"
+- module: metrics
+  feature: service:service
+  key: pipelines.__length
+  value: "1"
+- module: metrics
+  feature: service:service
+  key: pipelines.[0].receivers.__length
+  value: "1"
+- module: metrics
+  feature: service:service
+  key: pipelines.[0].exporters.__length
+  value: "1"
 - module: logging
   feature: receivers:files
   key: "[0].enabled"
@@ -34,3 +46,15 @@
   feature: receivers:files
   key: "[0].include_paths.__length"
   value: "2"
+- module: logging
+  feature: service:service
+  key: pipelines.__length
+  value: "1"
+- module: logging
+  feature: service:service
+  key: pipelines.[0].receivers.__length
+  value: "1"
+- module: logging
+  feature: service:service
+  key: pipelines.[0].exporters.__length
+  value: "1"