chore: backport Prometheus v0.311.3 dependency upgrade (#7298) to release-v2.9

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## main / unreleased
 
+* [CHANGE] Updated Prometheus to v0.311.3 and the OpenTelemetry Collector dependencies to v1.52, along with related transitive dependencies (dskit and others). [#7338](https://github.com/grafana/tempo/pull/7338) (@zhxiaogg)
 * [CHANGE] **BREAKING CHANGE** Dropped support for the OpenCensus receiver. [#7323](https://github.com/grafana/tempo/pull/7323) (@zhxiaogg)
+* [BUGFIX] generator: fix panic when `write_relabel_configs` is configured on remote write endpoints [#7338](https://github.com/grafana/tempo/pull/7338) (@carles-grafana)
 
 # v2.9.2
 

docs/sources/tempo/configuration/manifest.md

@@ -67,6 +67,8 @@ server:
     grpc_server_num_workers: 0
     grpc_server_stats_tracking_enabled: true
     grpc_server_recv_buffer_pools_enabled: false
+    grpc_server_read_buffer_size: 32768
+    grpc_server_write_buffer_size: 32768
     log_format: logfmt
     log_level: info
     log_source_ips_enabled: false
@@ -81,6 +83,7 @@ server:
     http_path_prefix: ""
     cluster_validation:
         label: ""
+        additional_labels: ""
         grpc:
             enabled: false
             soft_validation: false
@@ -89,6 +92,7 @@ server:
             soft_validation: false
             excluded_paths: ""
             excluded_user_agents: ""
+    create_new_traces: false
 internal_server:
     http_listen_network: tcp
     http_listen_address: ""
@@ -139,6 +143,8 @@ internal_server:
     grpc_server_num_workers: 0
     grpc_server_stats_tracking_enabled: false
     grpc_server_recv_buffer_pools_enabled: false
+    grpc_server_read_buffer_size: 0
+    grpc_server_write_buffer_size: 0
     log_format: logfmt
     log_level: info
     log_source_ips_enabled: false
@@ -153,6 +159,7 @@ internal_server:
     http_path_prefix: ""
     cluster_validation:
         label: ""
+        additional_labels: ""
         grpc:
             enabled: false
             soft_validation: false
@@ -161,6 +168,7 @@ internal_server:
             soft_validation: false
             excluded_paths: ""
             excluded_user_agents: ""
+    create_new_traces: false
     enable: false
 distributor:
     ring:
@@ -238,6 +246,7 @@ ingester_client:
         checkinterval: 15s
         healthcheckenabled: true
         healthchecktimeout: 1s
+        healthcheckgraceperiod: 0s
         maxconcurrenthealthchecks: 0
     remote_timeout: 5s
     grpc_client_config:
@@ -271,6 +280,7 @@ metrics_generator_client:
         checkinterval: 15s
         healthcheckenabled: true
         healthchecktimeout: 1s
+        healthcheckgraceperiod: 0s
         maxconcurrenthealthchecks: 0
     remote_timeout: 5s
     grpc_client_config:
@@ -304,6 +314,7 @@ live_store_client:
         checkinterval: 15s
         healthcheckenabled: true
         healthchecktimeout: 1s
+        healthcheckgraceperiod: 0s
         maxconcurrenthealthchecks: 0
     remote_timeout: 5s
     grpc_client_config:
@@ -992,17 +1003,20 @@ memberlist:
     dead_node_reclaim_time: 0s
     compression_enabled: false
     notify_interval: 0s
+    received_messages_queue_size: 1024
     advertise_addr: ""
     advertise_port: 7946
     cluster_label: ""
     cluster_label_verification_disabled: false
-    join_members: []
+    join_members: ""
     min_join_backoff: 1s
     max_join_backoff: 1m0s
     max_join_retries: 10
     abort_if_cluster_fast_join_fails: false
+    abort_if_cluster_fast_join_fails_min_nodes: 1
     abort_if_cluster_join_fails: false
     rejoin_interval: 0s
+    rejoin_seed_nodes: ""
     left_ingesters_timeout: 5m0s
     obsolete_entries_timeout: 30s
     leave_timeout: 20s
@@ -1023,6 +1037,15 @@ memberlist:
     tls_insecure_skip_verify: false
     tls_cipher_suites: ""
     tls_min_version: ""
+    zone_aware_routing:
+        enabled: false
+        instance_availability_zone: ""
+        role: member
+    propagation_delay_tracker:
+        enabled: false
+        beacon_interval: 1m0s
+        beacon_lifetime: 10m0s
+        log_beacons_latency_longer_than: 0s
 usage_report:
     reporting_enabled: true
     backoff: