[wip] use otel-go config package to configure MeterProvider

This removes all the code that was mostly a duplication of the code that exists in otel-go contrib's config package. Signed-off-by: Alex Boten <[email protected]>
open-telemetry · Jul 11, 2024 · a9d3f59 · a9d3f59
1 parent 879afdd
commit a9d3f59
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 785 deletions.
diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go
@@ -86,6 +86,10 @@ func GetAvailableLocalIPv6Address(t testing.TB) string {
 	return endpoint
 }
 
+func ptr[T any](v T) *T {
+	return &v
+}
+
 func GetAvailableLocalAddressPrometheus(t testing.TB) *config.Prometheus {
 	address := GetAvailableLocalAddress(t)
 	host, port, err := net.SplitHostPort(address)
@@ -97,8 +101,14 @@ func GetAvailableLocalAddressPrometheus(t testing.TB) *config.Prometheus {
 		return nil
 	}
 	return &config.Prometheus{
-		Host: &host,
-		Port: &portInt,
+		Host:              &host,
+		Port:              &portInt,
+		WithoutScopeInfo:  ptr(true),
+		WithoutTypeSuffix: ptr(true),
+		WithoutUnits:      ptr(true),
+		WithResourceConstantLabels: &config.IncludeExclude{
+			Included: []string{"*"},
+		},
 	}
 }
 

diff --git a/service/go.mod b/service/go.mod
@@ -28,10 +28,7 @@ require (
 	go.opentelemetry.io/contrib/config v0.8.0
 	go.opentelemetry.io/contrib/propagators/b3 v1.28.0
 	go.opentelemetry.io/otel v1.28.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
 	go.opentelemetry.io/otel/exporters/prometheus v0.50.0
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0
 	go.opentelemetry.io/otel/metric v1.28.0
 	go.opentelemetry.io/otel/sdk v1.28.0
 	go.opentelemetry.io/otel/sdk/metric v1.28.0
@@ -87,9 +84,12 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
 	go.opentelemetry.io/contrib/zpages v0.53.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
 	go.opentelemetry.io/otel/log v0.4.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect

diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go