1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

otel: fix initialization / error-handling (#10717)

Browse Source 
* If there's no `otel` key (or the value is `null`) in the config,
  don't return an error
* Propagate error from the exporter instead of panicking

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2023-06-15 12:43:15 -04:00 committed by GitHub
parent 2efea2e9f5
commit ff3984e609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/tracing/docker_context.go
View File

@ -94,6 +94,10 @@ func ConfigFromDockerContext(st store.Store, name string) (OTLPConfig, error) {
case map[string]interface{}: case map[string]interface{}:
otelCfg = m[otelConfigFieldName] otelCfg = m[otelConfigFieldName]
} }
if otelCfg == nil {
return OTLPConfig{}, nil
}
otelMap, ok := otelCfg.(map[string]interface{}) otelMap, ok := otelCfg.(map[string]interface{})
if !ok { if !ok {
return OTLPConfig{}, fmt.Errorf( return OTLPConfig{}, fmt.Errorf(

6
internal/tracing/mux.go
View File

@ -18,7 +18,6 @@ package tracing
import ( import (
"context" "context"
"log"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
sdktrace "go.opentelemetry.io/otel/sdk/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace"
@ -36,10 +35,7 @@ func (m MuxExporter) ExportSpans(ctx context.Context, spans []sdktrace.ReadOnlyS
return exporter.ExportSpans(ctx, spans) return exporter.ExportSpans(ctx, spans)
}) })
} }
if err := eg.Wait(); err != nil { return eg.Wait()
log.Fatal(err)
}
return nil
} }
func (m MuxExporter) Shutdown(ctx context.Context) error { func (m MuxExporter) Shutdown(ctx context.Context) error {