updated based on feedback

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
open-telemetry · Oct 16, 2024 · bbe69b3 · bbe69b3
1 parent d5c74f1
commit bbe69b3
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/config/metric.go b/config/metric.go
@@ -297,28 +297,6 @@ func newIncludeExcludeFilter(lists *IncludeExclude) (attribute.Filter, error) {
 	}, nil
 }
 
-func prometheusReaderOpts(prometheusConfig *Prometheus) ([]otelprom.Option, error) {
-	var opts []otelprom.Option
-	if prometheusConfig.WithoutScopeInfo != nil && *prometheusConfig.WithoutScopeInfo {
-		opts = append(opts, otelprom.WithoutScopeInfo())
-	}
-	if prometheusConfig.WithoutTypeSuffix != nil && *prometheusConfig.WithoutTypeSuffix {
-		opts = append(opts, otelprom.WithoutCounterSuffixes())
-	}
-	if prometheusConfig.WithoutUnits != nil && *prometheusConfig.WithoutUnits {
-		opts = append(opts, otelprom.WithoutUnits())
-	}
-	if prometheusConfig.WithResourceConstantLabels != nil {
-		f, err := newIncludeExcludeFilter(prometheusConfig.WithResourceConstantLabels)
-		if err != nil {
-			return nil, err
-		}
-		opts = append(opts, otelprom.WithResourceAsConstantLabels(f))
-	}
-
-	return opts, nil
-}
-
 func prometheusReader(ctx context.Context, prometheusConfig *Prometheus) (sdkmetric.Reader, error) {
 	if prometheusConfig.Host == nil {
 		return nil, fmt.Errorf("host must be specified")
@@ -368,6 +346,28 @@ func prometheusReader(ctx context.Context, prometheusConfig *Prometheus) (sdkmet
 	return readerWithServer{reader, &server}, nil
 }
 
+func prometheusReaderOpts(prometheusConfig *Prometheus) ([]otelprom.Option, error) {
+	var opts []otelprom.Option
+	if prometheusConfig.WithoutScopeInfo != nil && *prometheusConfig.WithoutScopeInfo {
+		opts = append(opts, otelprom.WithoutScopeInfo())
+	}
+	if prometheusConfig.WithoutTypeSuffix != nil && *prometheusConfig.WithoutTypeSuffix {
+		opts = append(opts, otelprom.WithoutCounterSuffixes())
+	}
+	if prometheusConfig.WithoutUnits != nil && *prometheusConfig.WithoutUnits {
+		opts = append(opts, otelprom.WithoutUnits())
+	}
+	if prometheusConfig.WithResourceConstantLabels != nil {
+		f, err := newIncludeExcludeFilter(prometheusConfig.WithResourceConstantLabels)
+		if err != nil {
+			return nil, err
+		}
+		opts = append(opts, otelprom.WithResourceAsConstantLabels(f))
+	}
+
+	return opts, nil
+}
+
 type readerWithServer struct {
 	sdkmetric.Reader
 	server *http.Server