temp fix

Author: amuraru

e2e/bin/integration-test.sh

@@ -51,6 +51,9 @@ validate_e2e_metrics() {
         "kminion_end_to_end_roundtrip_latency_seconds"
         "kminion_end_to_end_offset_commit_latency_seconds"
     )
+    echo ""
+    log_info "Available E2E metrics:"
+    echo "$metrics" | grep -E "kminion_end_to_end_" || echo "  (none found)"
 
     local missing_metrics=()
     for metric in "${required_metrics[@]}"; do
@@ -62,9 +65,6 @@ validate_e2e_metrics() {
     if [ ${#missing_metrics[@]} -ne 0 ]; then
         log_error "Missing required E2E metrics:"
         printf '  - %s\n' "${missing_metrics[@]}"
-        echo ""
-        log_info "Available E2E metrics:"
-        echo "$metrics" | grep -E "kminion_end_to_end_" || echo "  (none found)"
         return 1
     fi
 
@@ -95,6 +95,9 @@ validate_builtin_metrics() {
 
     local metrics
     metrics=$(fetch_metrics "$METRICS_URL") || return 1
+    echo ""
+    log_info "Available built-in metrics:"
+    echo "$metrics" | grep "^kminion_"
 
     # Core exporter metrics
     local core_metrics=(
@@ -142,9 +145,7 @@ validate_builtin_metrics() {
     if [ ${#missing_metrics[@]} -ne 0 ]; then
         log_error "Missing required built-in metrics:"
         printf '  - %s\n' "${missing_metrics[@]}"
-        echo ""
-        log_info "Available metrics:"
-        echo "$metrics" | grep "^kminion_"
+
         return 1
     fi
 

minion/list_offsets.go

@@ -64,49 +64,19 @@ func (s *Service) listOffsetsCached(ctx context.Context, offsetType string) (kad
 
 // ListEndOffsets fetches the high water mark for all topic partitions.
 func (s *Service) ListEndOffsets(ctx context.Context) (kadm.ListedOffsets, error) {
-	return s.listOffsetsInternal(ctx, func(ctx context.Context, topics ...string) (kadm.ListedOffsets, error) {
-		if len(topics) == 0 {
-			// Get all topics if none specified
-			allTopics, err := s.getAllowedTopics(ctx)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get topics for listing end offsets: %w", err)
-			}
-			topics = allTopics
-		}
-		return s.admClient.ListEndOffsets(ctx, topics...)
-	}, "end")
+	return s.listOffsetsInternal(ctx, s.admClient.ListEndOffsets, "end")
 }
 
 // ListStartOffsets fetches the low water mark for all topic partitions.
 func (s *Service) ListStartOffsets(ctx context.Context) (kadm.ListedOffsets, error) {
-	return s.listOffsetsInternal(ctx, func(ctx context.Context, topics ...string) (kadm.ListedOffsets, error) {
-		if len(topics) == 0 {
-			// Get all topics if none specified
-			allTopics, err := s.getAllowedTopics(ctx)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get topics for listing start offsets: %w", err)
-			}
-			topics = allTopics
-		}
-		return s.admClient.ListStartOffsets(ctx, topics...)
-	}, "start")
+	return s.listOffsetsInternal(ctx, s.admClient.ListStartOffsets, "start")
 }
 
 // ListMaxTimestampOffsets fetches the offsets for the maximum timestamp for all topic partitions.
 // This requires Kafka 3.0+ (see https://issues.apache.org/jira/browse/KAFKA-12541)
 // Uses the dedicated ListMaxTimestampOffsets method from franz-go.
 func (s *Service) ListMaxTimestampOffsets(ctx context.Context) (kadm.ListedOffsets, error) {
-	return s.listOffsetsInternal(ctx, func(ctx context.Context, topics ...string) (kadm.ListedOffsets, error) {
-		if len(topics) == 0 {
-			// Get all topics if none specified
-			allTopics, err := s.getAllowedTopics(ctx)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get topics for listing max timestamp offsets: %w", err)
-			}
-			topics = allTopics
-		}
-		return s.admClient.ListMaxTimestampOffsets(ctx, topics...)
-	}, "maxTimestamp")
+	return s.listOffsetsInternal(ctx, s.admClient.ListMaxTimestampOffsets, "maxTimestamp")
 }
 
 type listOffsetsFunc func(context.Context, ...string) (kadm.ListedOffsets, error)
@@ -159,20 +129,3 @@ func (s *Service) listOffsetsInternal(ctx context.Context, listFunc listOffsetsF
 
 	return listedOffsets, nil
 }
-
-// getAllowedTopics gets all topics from metadata and filters them according to the configuration
-func (s *Service) getAllowedTopics(ctx context.Context) ([]string, error) {
-	metadata, err := s.GetMetadataCached(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get metadata: %w", err)
-	}
-
-	var allowedTopics []string
-	for _, topic := range metadata.Topics {
-		if topic.Topic != nil && s.IsTopicAllowed(*topic.Topic) {
-			allowedTopics = append(allowedTopics, *topic.Topic)
-		}
-	}
-
-	return allowedTopics, nil
-}