docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-29 17:05:46 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2258 from jsternberg/docker-otel-non-experimental

Browse Source 
metricutil: remove BUILDX_EXPERIMENTAL from internal docker reporting
This commit is contained in:
Tõnis Tiigi 2024-02-21 11:45:23 -08:00 committed by GitHub
commit 2eccaadce5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/metricutil/metric.go
View File

@ -37,14 +37,14 @@ type MeterProvider struct {
func NewMeterProvider(ctx context.Context, cli command.Cli) (*MeterProvider, error) { func NewMeterProvider(ctx context.Context, cli command.Cli) (*MeterProvider, error) {
var exps []sdkmetric.Exporter var exps []sdkmetric.Exporter
// Only metric exporters if the experimental flag is set. if exp, err := dockerOtelExporter(cli); err != nil {
if confutil.IsExperimental() { return nil, err
if exp, err := dockerOtelExporter(cli); err != nil { } else if exp != nil {
return nil, err exps = append(exps, exp)
} else if exp != nil { }
exps = append(exps, exp)
}
if confutil.IsExperimental() {
// Expose the user-facing metric exporter only if the experimental flag is set.
if exp, err := detectOtlpExporter(ctx); err != nil { if exp, err := detectOtlpExporter(ctx); err != nil {
return nil, err return nil, err
} else if exp != nil { } else if exp != nil {