From b6684ee6508f89d0d3b7d8c8b9fb1b2db93c1e43 Mon Sep 17 00:00:00 2001
From: Patrick <patrick.huie@smartcontract.com>
Date: Thu, 5 Dec 2024 20:12:33 -0500
Subject: [PATCH] Adding View option to Beholder config (#958)

* Adding View option to Beholder config

* updating to a slice of metric views

* fixing httm meter provider

* attempting to fix ExampleConfig test
---
 pkg/beholder/client.go      | 1 +
 pkg/beholder/config.go      | 2 ++
 pkg/beholder/config_test.go | 2 +-
 pkg/beholder/httpclient.go  | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/beholder/client.go b/pkg/beholder/client.go
index b4f64f650..f707d3346 100644
--- a/pkg/beholder/client.go
+++ b/pkg/beholder/client.go
@@ -359,6 +359,7 @@ func newMeterProvider(config Config, resource *sdkresource.Resource, creds crede
 				sdkmetric.WithInterval(config.MetricReaderInterval), // Default is 10s
 			)),
 		sdkmetric.WithResource(resource),
+		sdkmetric.WithView(config.MetricViews...),
 	)
 	return mp, nil
 }
diff --git a/pkg/beholder/config.go b/pkg/beholder/config.go
index b99d20176..75255c891 100644
--- a/pkg/beholder/config.go
+++ b/pkg/beholder/config.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	otelattr "go.opentelemetry.io/otel/attribute"
+	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
@@ -28,6 +29,7 @@ type Config struct {
 	// OTel Metric
 	MetricReaderInterval time.Duration
 	MetricRetryConfig    *RetryConfig
+	MetricViews          []sdkmetric.View
 	// OTel Log
 	LogExportTimeout time.Duration
 	// Batch processing is enabled by default
diff --git a/pkg/beholder/config_test.go b/pkg/beholder/config_test.go
index c1d2a42c0..538ad5d36 100644
--- a/pkg/beholder/config_test.go
+++ b/pkg/beholder/config_test.go
@@ -50,6 +50,6 @@ func ExampleConfig() {
 	}
 	fmt.Printf("%+v\n", *config.LogRetryConfig)
 	// Output:
-	// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> MetricReaderInterval:1s MetricRetryConfig:<nil> LogExportTimeout:1s LogBatchProcessor:true LogRetryConfig:<nil> AuthPublicKeyHex: AuthHeaders:map[]}
+	// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> MetricReaderInterval:1s MetricRetryConfig:<nil> MetricViews:[] LogExportTimeout:1s LogBatchProcessor:true LogRetryConfig:<nil> AuthPublicKeyHex: AuthHeaders:map[]}
 	// {InitialInterval:5s MaxInterval:30s MaxElapsedTime:1m0s}
 }
diff --git a/pkg/beholder/httpclient.go b/pkg/beholder/httpclient.go
index ee70e8243..ca2ebd014 100644
--- a/pkg/beholder/httpclient.go
+++ b/pkg/beholder/httpclient.go
@@ -231,6 +231,7 @@ func newHTTPMeterProvider(config Config, resource *sdkresource.Resource, tlsConf
 				sdkmetric.WithInterval(config.MetricReaderInterval), // Default is 10s
 			)),
 		sdkmetric.WithResource(resource),
+		sdkmetric.WithView(config.MetricViews...),
 	)
 	return mp, nil
 }