remove ENABLE_OTEL_BUILTIN_RESOURCE_LABELS (#51483)

istio · Jun 10, 2024 · a7f470b · a7f470b
1 parent afe3412
commit a7f470b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pilot/pkg/features/telemetry.go b/pilot/pkg/features/telemetry.go
@@ -59,8 +59,4 @@ var (
 
  EnableControllerQueueMetrics = env.Register("ISTIO_ENABLE_CONTROLLER_QUEUE_METRICS", false,
  "If enabled, publishes metrics for queue depth, latency and processing times.").Get()
-
- // User should not rely on builtin resource labels, this flag will be removed in future releases(1.20).
- EnableOTELBuiltinResourceLabels = env.Register("ENABLE_OTEL_BUILTIN_RESOURCE_LABELS", false,
- "If enabled, envoy will send builtin labels(e.g. node_name) via OTel sink.").Get()
 )
diff --git a/pilot/pkg/model/telemetry_logging.go b/pilot/pkg/model/telemetry_logging.go
@@ -30,7 +30,6 @@ import (
  "google.golang.org/protobuf/types/known/structpb"
 
  meshconfig "istio.io/api/mesh/v1alpha1"
- "istio.io/istio/pilot/pkg/features"
  "istio.io/istio/pilot/pkg/util/protoconv"
  "istio.io/istio/pkg/config/host"
  "istio.io/istio/pkg/maps"
@@ -489,7 +488,7 @@ func buildOpenTelemetryAccessLogConfig(logName, hostname, clusterName, format st
  TransportApiVersion: core.ApiVersion_V3,
  FilterStateObjectsToLog: envoyWasmStateToLog,
  },
- DisableBuiltinLabels: !features.EnableOTELBuiltinResourceLabels,
+ DisableBuiltinLabels: true,
  }
 
  if format != "" {

diff --git a/releasenotes/notes/otel-builtin-labels.yaml b/releasenotes/notes/otel-builtin-labels.yaml
@@ -0,0 +1,6 @@
+apiVersion: release-notes/v2
+kind: feature
+area: telemetry
+releaseNotes:
+ - |
+ **Removed** the feature flag `ENABLE_OTEL_BUILTIN_RESOURCE_LABELS`.