-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cli: add otel sdk tracing and metric providers to the core cli
This adds the code used by buildx and compose into the default CLI program to help normalize the usage of these APIs and allow code reuse between projects. It also allows these projects to benefit from improvements or changes that may be made by another team. At the moment, these APIs are a pretty thin layer on the OTEL SDK. It configures an additional exporter to a docker endpoint that's used for usage collection and is only active if the option is configured in docker desktop. This also upgrades the OTEL version to v1.19 which is the one being used by buildkit, buildx, compose, etc. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
- Loading branch information
1 parent
99eb502
commit f5bc6da
Showing
192 changed files
with
39,642 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| package command | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "path/filepath" | ||
| "time" | ||
|
|
||
| "github.com/docker/distribution/uuid" | ||
| "go.opentelemetry.io/otel" | ||
| "go.opentelemetry.io/otel/metric" | ||
| sdkmetric "go.opentelemetry.io/otel/sdk/metric" | ||
| "go.opentelemetry.io/otel/sdk/metric/metricdata" | ||
| "go.opentelemetry.io/otel/sdk/resource" | ||
| sdktrace "go.opentelemetry.io/otel/sdk/trace" | ||
| semconv "go.opentelemetry.io/otel/semconv/v1.21.0" | ||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| // TracerProvider is an extension of the trace.TracerProvider interface for CLI programs. | ||
| type TracerProvider interface { | ||
| trace.TracerProvider | ||
| ForceFlush(ctx context.Context) error | ||
| Shutdown(ctx context.Context) error | ||
| } | ||
|
|
||
| // MeterProvider is an extension of the metric.MeterProvider interface for CLI programs. | ||
| type MeterProvider interface { | ||
| metric.MeterProvider | ||
| ForceFlush(ctx context.Context) error | ||
| Shutdown(ctx context.Context) error | ||
| } | ||
|
|
||
| // TelemetryClient provides the methods for using OTEL tracing or metrics. | ||
| type TelemetryClient interface { | ||
| // Resource returns the OTEL Resource configured with this TelemetryClient. | ||
| // This resource may be created lazily, but the resource should be the same | ||
| // each time this function is invoked. | ||
| Resource() *resource.Resource | ||
|
|
||
| // TracerProvider returns a TracerProvider. This TracerProvider will be configured | ||
| // with the default tracing components for a CLI program along with any options given | ||
| // for the SDK. | ||
| TracerProvider(opts ...sdktrace.TracerProviderOption) TracerProvider | ||
|
|
||
| // MeterProvider returns a MeterProvider. This MeterProvider will be configured | ||
| // with the default metric components for a CLI program along with any options given | ||
| // for the SDK. | ||
| MeterProvider(opts ...sdkmetric.Option) MeterProvider | ||
| } | ||
|
|
||
| func (cli *DockerCli) Resource() *resource.Resource { | ||
| cli.resOnce.Do(func() { | ||
| if cli.res == nil { | ||
| opts := []resource.Option{ | ||
| resource.WithDetectors(serviceNameDetector{}), | ||
| resource.WithAttributes( | ||
| // Use a unique instance id so OTEL knows that each invocation | ||
| // of the CLI is its own instance. Without this, downstream | ||
| // OTEL processors may think the same process is restarting | ||
| // continuously. | ||
| semconv.ServiceInstanceID(uuid.Generate().String()), | ||
| ), | ||
| resource.WithFromEnv(), | ||
| resource.WithTelemetrySDK(), | ||
| } | ||
| if len(cli.resOpts) > 0 { | ||
| opts = append(opts, cli.resOpts...) | ||
| } | ||
|
|
||
| res, err := resource.New(context.Background(), opts...) | ||
| if err != nil { | ||
| otel.Handle(err) | ||
| } | ||
| cli.res = res | ||
| } | ||
| // Clear the resource options since they'll never be used again and to allow | ||
| // the garbage collector to retrieve that memory. | ||
| cli.resOpts = nil | ||
| }) | ||
| return cli.res | ||
| } | ||
|
|
||
| func (cli *DockerCli) TracerProvider(opts ...sdktrace.TracerProviderOption) TracerProvider { | ||
| exp, err := dockerSpanExporter(cli) | ||
| if err != nil { | ||
| otel.Handle(err) | ||
| } | ||
| defaultOpts := []sdktrace.TracerProviderOption{ | ||
| sdktrace.WithResource(cli.Resource()), | ||
| sdktrace.WithBatcher(exp), | ||
| } | ||
| return sdktrace.NewTracerProvider(append(defaultOpts, opts...)...) | ||
| } | ||
|
|
||
| func (cli *DockerCli) MeterProvider(opts ...sdkmetric.Option) MeterProvider { | ||
| exp, err := dockerMetricExporter(cli) | ||
| if err != nil { | ||
| otel.Handle(err) | ||
| } | ||
| defaultOpts := []sdkmetric.Option{ | ||
| sdkmetric.WithResource(cli.Resource()), | ||
| sdkmetric.WithReader(newCLIReader(exp)), | ||
| } | ||
| return sdkmetric.NewMeterProvider(append(defaultOpts, opts...)...) | ||
| } | ||
|
|
||
| // WithResourceOptions configures additional options for the default resource. The default | ||
| // resource will continue to include its default options. | ||
| func WithResourceOptions(opts ...resource.Option) CLIOption { | ||
| return func(cli *DockerCli) error { | ||
| cli.resOpts = append(cli.resOpts, opts...) | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // WithResource overwrites the default resource and prevents its creation. | ||
| func WithResource(res *resource.Resource) CLIOption { | ||
| return func(cli *DockerCli) error { | ||
| cli.res = res | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| type serviceNameDetector struct{} | ||
|
|
||
| func (serviceNameDetector) Detect(ctx context.Context) (*resource.Resource, error) { | ||
| return resource.StringDetector( | ||
| semconv.SchemaURL, | ||
| semconv.ServiceNameKey, | ||
| func() (string, error) { | ||
| return filepath.Base(os.Args[0]), nil | ||
| }, | ||
| ).Detect(ctx) | ||
| } | ||
|
|
||
| // cliReader is an implementation of Reader that will automatically | ||
| // report to a designated Exporter when Shutdown is called. | ||
| type cliReader struct { | ||
| sdkmetric.Reader | ||
| exporter sdkmetric.Exporter | ||
| } | ||
|
|
||
| func newCLIReader(exp sdkmetric.Exporter) sdkmetric.Reader { | ||
| reader := sdkmetric.NewManualReader( | ||
| sdkmetric.WithTemporalitySelector(deltaTemporality), | ||
| ) | ||
| return &cliReader{ | ||
| Reader: reader, | ||
| exporter: exp, | ||
| } | ||
| } | ||
|
|
||
| const shutdownTimeout = 2 * time.Second | ||
|
|
||
| func (r *cliReader) Shutdown(ctx context.Context) error { | ||
| var rm metricdata.ResourceMetrics | ||
| if err := r.Reader.Collect(ctx, &rm); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Place a pretty tight constraint on the actual reporting. | ||
| // We don't want CLI metrics to prevent the CLI from exiting | ||
| // so if there's some kind of issue we need to abort pretty | ||
| // quickly. | ||
| ctx, cancel := context.WithTimeout(ctx, shutdownTimeout) | ||
| defer cancel() | ||
|
|
||
| return r.exporter.Export(ctx, &rm) | ||
| } | ||
|
|
||
| // deltaTemporality sets the Temporality of every instrument to delta. | ||
| // | ||
| // This isn't really needed since we create a unique resource on each invocation, | ||
| // but it can help with cardinality concerns for downstream processors since they can | ||
| // perform aggregation for a time interval and then discard the data once that time | ||
| // period has passed. Cumulative temporality would imply to the downstream processor | ||
| // that they might receive a successive point and they may unnecessarily keep state | ||
| // they really shouldn't. | ||
| func deltaTemporality(_ sdkmetric.InstrumentKind) metricdata.Temporality { | ||
| return metricdata.DeltaTemporality | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| package command | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/url" | ||
| "path" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" | ||
| "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" | ||
| sdkmetric "go.opentelemetry.io/otel/sdk/metric" | ||
| sdktrace "go.opentelemetry.io/otel/sdk/trace" | ||
| ) | ||
|
|
||
| const otelConfigFieldName = "otel" | ||
|
|
||
| // dockerExporterOtlpEndpoint retrieves the OTLP endpoint used for the docker reporter | ||
| // from the current context. | ||
| func dockerExporterOtlpEndpoint(cli Cli) (endpoint string, secure bool, err error) { | ||
| meta, err := cli.ContextStore().GetMetadata(cli.CurrentContext()) | ||
| if err != nil { | ||
| return "", false, err | ||
| } | ||
|
|
||
| var otelCfg interface{} | ||
| switch m := meta.Metadata.(type) { | ||
| case DockerContext: | ||
| otelCfg = m.AdditionalFields[otelConfigFieldName] | ||
| case map[string]interface{}: | ||
| otelCfg = m[otelConfigFieldName] | ||
| } | ||
|
|
||
| if otelCfg == nil { | ||
| return "", false, nil | ||
| } | ||
|
|
||
| otelMap, ok := otelCfg.(map[string]interface{}) | ||
| if !ok { | ||
| return "", false, errors.Errorf( | ||
| "unexpected type for field %q: %T (expected: %T)", | ||
| otelConfigFieldName, | ||
| otelCfg, | ||
| otelMap, | ||
| ) | ||
| } | ||
|
|
||
| // keys from https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/ | ||
| endpoint, ok = otelMap["OTEL_EXPORTER_OTLP_ENDPOINT"].(string) | ||
| if !ok { | ||
| return "", false, nil | ||
| } | ||
|
|
||
| // Parse the endpoint. The docker config expects the endpoint to be | ||
| // in the form of a URL to match the environment variable, but this | ||
| // option doesn't correspond directly to WithEndpoint. | ||
| // | ||
| // We pretend we're the same as the environment reader. | ||
| u, err := url.Parse(endpoint) | ||
| if err != nil { | ||
| return "", false, errors.Errorf("docker otel endpoint is invalid: %s", err) | ||
| } | ||
|
|
||
| switch u.Scheme { | ||
| case "unix": | ||
| // Unix sockets are a bit weird. OTEL seems to imply they | ||
| // can be used as an environment variable and are handled properly, | ||
| // but they don't seem to be as the behavior of the environment variable | ||
| // is to strip the scheme from the endpoint, but the underlying implementation | ||
| // needs the scheme to use the correct resolver. | ||
| // | ||
| // We'll just handle this in a special way and add the unix:// back to the endpoint. | ||
| endpoint = fmt.Sprintf("unix://%s", path.Join(u.Host, u.Path)) | ||
| case "https": | ||
| secure = true | ||
| fallthrough | ||
| case "http": | ||
| endpoint = path.Join(u.Host, u.Path) | ||
| } | ||
| return endpoint, secure, nil | ||
| } | ||
|
|
||
| func dockerSpanExporter(cli Cli) (sdktrace.SpanExporter, error) { | ||
| endpoint, secure, err := dockerExporterOtlpEndpoint(cli) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| opts := []otlptracegrpc.Option{ | ||
| otlptracegrpc.WithEndpoint(endpoint), | ||
| } | ||
| if !secure { | ||
| opts = append(opts, otlptracegrpc.WithInsecure()) | ||
| } | ||
|
|
||
| exp, err := otlptracegrpc.New(context.Background(), opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return exp, nil | ||
| } | ||
|
|
||
| func dockerMetricExporter(cli Cli) (sdkmetric.Exporter, error) { | ||
| endpoint, secure, err := dockerExporterOtlpEndpoint(cli) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| opts := []otlpmetricgrpc.Option{ | ||
| otlpmetricgrpc.WithEndpoint(endpoint), | ||
| } | ||
| if !secure { | ||
| opts = append(opts, otlpmetricgrpc.WithInsecure()) | ||
| } | ||
|
|
||
| exp, err := otlpmetricgrpc.New(context.Background(), opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return exp, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.