Skip to content

Commit a9d3f59

Browse files
committed
[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]>
1 parent 879afdd commit a9d3f59

File tree

9 files changed

+113
-785
lines changed

9 files changed

+113
-785
lines changed

internal/testutil/testutil.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ func GetAvailableLocalIPv6Address(t testing.TB) string {
8686
return endpoint
8787
}
8888

89+
func ptr[T any](v T) *T {
90+
return &v
91+
}
92+
8993
func GetAvailableLocalAddressPrometheus(t testing.TB) *config.Prometheus {
9094
address := GetAvailableLocalAddress(t)
9195
host, port, err := net.SplitHostPort(address)
@@ -97,8 +101,14 @@ func GetAvailableLocalAddressPrometheus(t testing.TB) *config.Prometheus {
97101
return nil
98102
}
99103
return &config.Prometheus{
100-
Host: &host,
101-
Port: &portInt,
104+
Host: &host,
105+
Port: &portInt,
106+
WithoutScopeInfo: ptr(true),
107+
WithoutTypeSuffix: ptr(true),
108+
WithoutUnits: ptr(true),
109+
WithResourceConstantLabels: &config.IncludeExclude{
110+
Included: []string{"*"},
111+
},
102112
}
103113
}
104114

service/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ require (
2828
go.opentelemetry.io/contrib/config v0.8.0
2929
go.opentelemetry.io/contrib/propagators/b3 v1.28.0
3030
go.opentelemetry.io/otel v1.28.0
31-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
32-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
3331
go.opentelemetry.io/otel/exporters/prometheus v0.50.0
34-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0
3532
go.opentelemetry.io/otel/metric v1.28.0
3633
go.opentelemetry.io/otel/sdk v1.28.0
3734
go.opentelemetry.io/otel/sdk/metric v1.28.0
@@ -87,9 +84,12 @@ require (
8784
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
8885
go.opentelemetry.io/contrib/zpages v0.53.0 // indirect
8986
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
88+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
9089
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
9190
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
9291
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
92+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
9393
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
9494
go.opentelemetry.io/otel/log v0.4.0 // indirect
9595
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect

service/internal/proctelemetry/config.go

Lines changed: 0 additions & 295 deletions
This file was deleted.

0 commit comments

Comments
 (0)