github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8645 from cpuguy83/otlp_from_env

Browse Source
This commit is contained in:
Samuel Karp 2023-06-07 02:05:23 -07:00 committed by GitHub
commit d9ff3236bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tracing/plugin/otlp.go
View File

@ -47,9 +47,6 @@ func init() {
Config: &OTLPConfig{}, Config: &OTLPConfig{},
InitFn: func(ic *plugin.InitContext) (interface{}, error) { InitFn: func(ic *plugin.InitContext) (interface{}, error) {
cfg := ic.Config.(*OTLPConfig) cfg := ic.Config.(*OTLPConfig)
if cfg.Endpoint == "" {
return nil, fmt.Errorf("no OpenTelemetry endpoint: %w", plugin.ErrSkipPlugin)
}
exp, err := newExporter(ic.Context, cfg) exp, err := newExporter(ic.Context, cfg)
if err != nil { if err != nil {
return nil, err return nil, err
@ -121,27 +118,30 @@ func newExporter(ctx context.Context, cfg *OTLPConfig) (*otlptrace.Exporter, err
ctx, cancel := context.WithTimeout(ctx, timeout) ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel() defer cancel()
if cfg.Protocol == "http/protobuf" || cfg.Protocol == "" { switch cfg.Protocol {
u, err := url.Parse(cfg.Endpoint) case "", "http/protobuf":
if err != nil { var opts []otlptracehttp.Option
return nil, fmt.Errorf("OpenTelemetry endpoint %q %w : %v", cfg.Endpoint, errdefs.ErrInvalidArgument, err) if cfg.Endpoint != "" {
} u, err := url.Parse(cfg.Endpoint)
opts := []otlptracehttp.Option{ if err != nil {
otlptracehttp.WithEndpoint(u.Host), return nil, fmt.Errorf("OpenTelemetry endpoint %q %w : %v", cfg.Endpoint, errdefs.ErrInvalidArgument, err)
} }
if u.Scheme == "http" { opts = append(opts, otlptracehttp.WithEndpoint(u.Host))
opts = append(opts, otlptracehttp.WithInsecure()) if u.Scheme == "http" {
opts = append(opts, otlptracehttp.WithInsecure())
}
} }
return otlptracehttp.New(ctx, opts...) return otlptracehttp.New(ctx, opts...)
} else if cfg.Protocol == "grpc" { case "grpc":
opts := []otlptracegrpc.Option{ var opts []otlptracegrpc.Option
otlptracegrpc.WithEndpoint(cfg.Endpoint), if cfg.Endpoint != "" {
opts = append(opts, otlptracegrpc.WithEndpoint(cfg.Endpoint))
} }
if cfg.Insecure { if cfg.Insecure {
opts = append(opts, otlptracegrpc.WithInsecure()) opts = append(opts, otlptracegrpc.WithInsecure())
} }
return otlptracegrpc.New(ctx, opts...) return otlptracegrpc.New(ctx, opts...)
} else { default:
// Other protocols such as "http/json" are not supported. // Other protocols such as "http/json" are not supported.
return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented) return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented)
} }
@ -152,7 +152,6 @@ func newExporter(ctx context.Context, cfg *OTLPConfig) (*otlptrace.Exporter, err
// //
// Note that this function sets process-wide tracing configuration. // Note that this function sets process-wide tracing configuration.
func newTracer(ctx context.Context, config *TraceConfig, procs []trace.SpanProcessor) (io.Closer, error) { func newTracer(ctx context.Context, config *TraceConfig, procs []trace.SpanProcessor) (io.Closer, error) {
res, err := resource.New(ctx, res, err := resource.New(ctx,
resource.WithHost(), resource.WithHost(),
resource.WithAttributes( resource.WithAttributes(