fix minor things

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>

Author: odubajDT

.chloggen/k8sattributes-semconv-gates.yaml

@@ -16,12 +16,12 @@ issues: [44693]
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
 subtext: |
-  - Added `semconv.k8s.k8sattributes.enableStable` feature gate to enable stable semantic convention attributes (singular form: `k8s.<workload>.label.<key>` and `k8s.<workload>.annotation.<key>`)
-  - Added `semconv.k8s.k8sattributes.disableLegacy` feature gate to disable legacy non-compliant attributes (plural form: `k8s.<workload>.labels.<key>` and `k8s.<workload>.annotations.<key>`)
+  - Added `processor.k8sattributes.EmitV1K8sConventions` feature gate to enable stable semantic convention attributes (singular form: `k8s.<workload>.label.<key>` and `k8s.<workload>.annotation.<key>`)
+  - Added `processor.k8sattributes.DontEmitV0K8sConventions` feature gate to disable legacy non-compliant attributes (plural form: `k8s.<workload>.labels.<key>` and `k8s.<workload>.annotations.<key>`)
   - Both feature gates are in `alpha` stage and disabled by default
   - The processor now validates that legacy attributes cannot be disabled without enabling stable attributes
   - Deprecated `k8sattr.labelsAnnotationsSingular.allow` feature gate in favor of the new semconv-compliant gates (will be removed in v0.150.0)
-  - During migration period, both legacy and stable attributes can coexist when `enableStable` is enabled but `disableLegacy` is not
+  - During migration period, both legacy and stable attributes can coexist when `EmitV1K8sConventions` is enabled but `DontEmitV0K8sConventions` is not
 
 # If your change doesn't affect end users or the exported elements of any package,
 # you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

processor/k8sattributesprocessor/config.go

@@ -175,8 +175,8 @@ type ExtractConfig struct {
 type FieldExtractConfig struct {
 	// TagName represents the name of the resource attribute that will be added to logs, metrics or spans.
 	// When not specified, a default tag name will be used of the format:
-	//   - k8s.pod.annotations.<annotation key>  (or k8s.pod.annotation.<annotation key> when k8sattr.labelsAnnotationsSingular.allow is enabled)
-	//   - k8s.pod.labels.<label key>  (or k8s.pod.label.<label key> when k8sattr.labelsAnnotationsSingular.allow is enabled)
+	//   - k8s.pod.annotations.<annotation key>  (or k8s.pod.annotation.<annotation key> when processor.k8sattributes.EmitV1K8sConventions is enabled)
+	//   - k8s.pod.labels.<label key>  (or k8s.pod.label.<label key> when processor.k8sattributes.EmitV1K8sConventions is enabled)
 	// For example, if tag_name is not specified and the key is git_sha,
 	// then the attribute name will be `k8s.pod.annotations.git_sha` (or `k8s.pod.annotation.git_sha` with the feature gate).
 	// When key_regex is present, tag_name supports back reference to both named capturing and positioned capturing.

processor/k8sattributesprocessor/internal/kube/kube.go

@@ -372,7 +372,12 @@ func (r *FieldExtractionRule) extractFromMetadata(metadata, tags map[string]stri
 			}
 		}
 	} else if v, ok := metadata[r.Key]; ok {
-		tags[r.Name] = r.extractField(v)
+		// Use formatter to determine attribute name if no custom name was specified
+		name := r.Name
+		if name == "" {
+			name = fmt.Sprintf(formatter, r.Key)
+		}
+		tags[name] = r.extractField(v)
 	}
 }
 

processor/k8sattributesprocessor/options.go

@@ -4,10 +4,8 @@
 package k8sattributesprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor"
 
 import (
-	"fmt"
 	"os"
 	"regexp"
-	"strings"
 	"time"
 
 	conventions "go.opentelemetry.io/otel/semconv/v1.39.0"
@@ -270,18 +268,6 @@ func extractFieldRules(fieldType string, fields ...FieldExtractConfig) ([]kube.F
 			a.From = kube.MetadataFromPod
 		}
 
-		if name == "" && a.Key != "" {
-			// name for KeyRegex case is set at extraction time/runtime, skipped here
-			// Use singular form when stable attributes are enabled and legacy attributes are disabled
-			fieldTypeName := fieldType
-			enableStable := metadata.ProcessorK8sattributesEmitV1K8sConventionsFeatureGate.IsEnabled()
-			disableLegacy := metadata.ProcessorK8sattributesDontEmitV0K8sConventionsFeatureGate.IsEnabled()
-			if enableStable && disableLegacy {
-				fieldTypeName = strings.TrimSuffix(fieldType, "s")
-			}
-			name = fmt.Sprintf("k8s.%v.%v.%v", a.From, fieldTypeName, a.Key)
-		}
-
 		var keyRegex *regexp.Regexp
 		var hasKeyRegexReference bool
 		if a.KeyRegex != "" {

processor/k8sattributesprocessor/options_test.go

@@ -9,12 +9,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/featuregate"
 	"k8s.io/apimachinery/pkg/selection"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/kube"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/metadata"
 )
 
 func TestWithAPIConfig(t *testing.T) {
@@ -584,7 +582,7 @@ func Test_extractFieldRules(t *testing.T) {
 			}},
 			want: []kube.FieldExtractionRule{
 				{
-					Name: "k8s.pod.labels.key",
+					Name: "", // Name is empty for dynamic resolution based on feature gates
 					Key:  "key",
 					From: kube.MetadataFromPod,
 				},
@@ -641,86 +639,57 @@ func Test_extractFieldRules(t *testing.T) {
 
 func Test_extractFieldRules_FeatureGate(t *testing.T) {
 	tests := []struct {
-		name             string
-		fieldType        string
-		fields           []FieldExtractConfig
-		featureGateValue bool
-		wantNamePattern  string
+		name            string
+		fieldType       string
+		fields          []FieldExtractConfig
+		wantNamePattern string
 	}{
 		{
-			name:      "labels plural when feature gate disabled",
+			name:      "labels without custom tag_name leaves Name empty for dynamic resolution",
 			fieldType: "labels",
 			fields: []FieldExtractConfig{
 				{
 					Key:  "app",
 					From: kube.MetadataFromPod,
 				},
 			},
-			featureGateValue: false,
-			wantNamePattern:  "k8s.pod.labels.app",
+			wantNamePattern: "",
 		},
 		{
-			name:      "labels singular when feature gate enabled",
-			fieldType: "labels",
-			fields: []FieldExtractConfig{
-				{
-					Key:  "app",
-					From: kube.MetadataFromPod,
-				},
-			},
-			featureGateValue: true,
-			wantNamePattern:  "k8s.pod.label.app",
-		},
-		{
-			name:      "annotations plural when feature gate disabled",
+			name:      "annotations without custom tag_name leaves Name empty for dynamic resolution",
 			fieldType: "annotations",
 			fields: []FieldExtractConfig{
 				{
 					Key:  "workload",
 					From: kube.MetadataFromPod,
 				},
 			},
-			featureGateValue: false,
-			wantNamePattern:  "k8s.pod.annotations.workload",
+			wantNamePattern: "",
 		},
 		{
-			name:      "annotations singular when feature gate enabled",
-			fieldType: "annotations",
-			fields: []FieldExtractConfig{
-				{
-					Key:  "workload",
-					From: kube.MetadataFromPod,
-				},
-			},
-			featureGateValue: true,
-			wantNamePattern:  "k8s.pod.annotation.workload",
-		},
-		{
-			name:      "namespace labels singular when feature gate enabled",
+			name:      "namespace labels without custom tag_name leaves Name empty",
 			fieldType: "labels",
 			fields: []FieldExtractConfig{
 				{
 					Key:  "env",
 					From: kube.MetadataFromNamespace,
 				},
 			},
-			featureGateValue: true,
-			wantNamePattern:  "k8s.namespace.label.env",
+			wantNamePattern: "",
 		},
 		{
-			name:      "node annotations singular when feature gate enabled",
+			name:      "node annotations without custom tag_name leaves Name empty",
 			fieldType: "annotations",
 			fields: []FieldExtractConfig{
 				{
 					Key:  "zone",
 					From: kube.MetadataFromNode,
 				},
 			},
-			featureGateValue: true,
-			wantNamePattern:  "k8s.node.annotation.zone",
+			wantNamePattern: "",
 		},
 		{
-			name:      "explicit tag name not affected by feature gate",
+			name:      "explicit tag name preserved regardless of feature gates",
 			fieldType: "labels",
 			fields: []FieldExtractConfig{
 				{
@@ -729,24 +698,12 @@ func Test_extractFieldRules_FeatureGate(t *testing.T) {
 					From:    kube.MetadataFromPod,
 				},
 			},
-			featureGateValue: true,
-			wantNamePattern:  "custom.tag.name",
+			wantNamePattern: "custom.tag.name",
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Set feature gate state for stable and legacy attributes
-			if tt.featureGateValue {
-				require.NoError(t, featuregate.GlobalRegistry().Set(metadata.ProcessorK8sattributesEmitV1K8sConventionsFeatureGate.ID(), true))
-				require.NoError(t, featuregate.GlobalRegistry().Set(metadata.ProcessorK8sattributesDontEmitV0K8sConventionsFeatureGate.ID(), true))
-			}
-			defer func() {
-				// Reset to default
-				require.NoError(t, featuregate.GlobalRegistry().Set(metadata.ProcessorK8sattributesEmitV1K8sConventionsFeatureGate.ID(), false))
-				require.NoError(t, featuregate.GlobalRegistry().Set(metadata.ProcessorK8sattributesDontEmitV0K8sConventionsFeatureGate.ID(), false))
-			}()
-
 			got, err := extractFieldRules(tt.fieldType, tt.fields...)
 			require.NoError(t, err)
 			require.Len(t, got, 1)