From 4f87e23180252ebb98ed499e9ea292d78251fa12 Mon Sep 17 00:00:00 2001
From: FlamingSaint <raghuramkannan400@gmail.com>
Date: Sun, 21 Jul 2024 22:28:19 +0530
Subject: [PATCH] Add changes

Signed-off-by: FlamingSaint <raghuramkannan400@gmail.com>
---
 cmd/jaeger/internal/extension/jaegerquery/server.go |  6 ------
 scripts/spm-integration-test.sh                     | 12 +++++++++---
 storage/factory.go                                  |  8 --------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
index 2804eb045f2..d1b8b5bf481 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -10,7 +10,6 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
-	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
@@ -19,7 +18,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
-	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/metricsstore"
 )
 
@@ -142,10 +140,6 @@ func (s *server) createMetricStorage(host component.Host) (metricsstore.Reader,
 	}
 
 	metricsReader, err := mf.CreateMetricsReader()
-	if errors.Is(err, storage.ErrMetricStorageNotConfigured) || errors.Is(err, storage.ErrMetricStorageNotSupported) {
-		s.telset.Logger.Info("Metric storage not created", zap.Error(err))
-		return disabled.NewMetricsReader()
-	}
 	return metricsReader, err
 }
 
diff --git a/scripts/spm-integration-test.sh b/scripts/spm-integration-test.sh
index 16f168579c1..33e346c4f23 100755
--- a/scripts/spm-integration-test.sh
+++ b/scripts/spm-integration-test.sh
@@ -89,13 +89,19 @@ validate_service_metrics() {
     echo "Metric datapoints found for service '$service': " "${metric_points[@]}"
     # Check that atleast some values are non-zero after the threshold
     local non_zero_count=0
-    local expected_non_zero_count=3
+    local expected_non_zero_count=5
     local zero_count=0
-    local expected_max_zero_count=3
+    local expected_max_zero_count=4
+    local flag=false # Becomes true after first non-zero value 
     for value in "${metric_points[@]}"; do
       if [[ $(echo "$value > 0.0" | bc) == "1" ]]; then
+        flag=true
         non_zero_count=$((non_zero_count + 1))
       else
+        if [ $flag == true ]; then
+          echo "❌ ERROR: Zero values appearing after a non-zero value not expected"
+          return 1
+        fi
         zero_count=$((zero_count + 1))
       fi
 
@@ -105,7 +111,7 @@ validate_service_metrics() {
       fi
     done
     if [ $non_zero_count -lt $expected_non_zero_count ]; then
-      echo "⏳ Expecting at least 3 non-zero data points"
+      echo "⏳ Expecting at least 4 non-zero data points"
       return 1
     fi
     return 0
diff --git a/storage/factory.go b/storage/factory.go
index 7ea98429bd3..462a626b64f 100644
--- a/storage/factory.go
+++ b/storage/factory.go
@@ -83,14 +83,6 @@ type ArchiveFactory interface {
 	CreateArchiveSpanWriter() (spanstore.Writer, error)
 }
 
-var (
-	// ErrMetricStorageNotConfigured can be returned by the MetricsFactory when the metric storage is not configured.
-	ErrMetricStorageNotConfigured = errors.New("Metric storage not configured")
-
-	// ErrMetricStorageNotSupported can be returned by the MetricsFactory when the metric storage is not supported by the backend.
-	ErrMetricStorageNotSupported = errors.New("Metric storage not supported")
-)
-
 // MetricsFactory defines an interface for a factory that can create implementations of different metrics storage components.
 // Implementations are also encouraged to implement plugin.Configurable interface.
 //