use term "propagate" rather than "accept" for propagating traceparent

Author: catkins

agent/agent_configuration.go

@@ -61,7 +61,7 @@ type AgentConfiguration struct {
 	AcquireJob                   string
 	TracingBackend               string
 	TracingServiceName           string
-	TracingAcceptTraceparent     bool
+	TracingPropagateTraceparent  bool
 	TraceContextEncoding         string
 	DisableWarningsFor           []string
 	AllowMultipartArtifactUpload bool

agent/job_runner.go

@@ -621,8 +621,8 @@ func (r *JobRunner) createEnvironment(ctx context.Context) ([]string, error) {
 		if r.conf.Job.TraceParent != "" {
 			env["BUILDKITE_TRACING_TRACEPARENT"] = r.conf.Job.TraceParent
 		}
-		if r.conf.AgentConfiguration.TracingAcceptTraceparent {
-			env["BUILDKITE_TRACING_ACCEPT_TRACEPARENT"] = "true"
+		if r.conf.AgentConfiguration.TracingPropagateTraceparent {
+			env["BUILDKITE_TRACING_PROPAGATE_TRACEPARENT"] = "true"
 		}
 	}
 

clicommand/agent_start.go

@@ -173,9 +173,9 @@ type AgentStartConfig struct {
 	MetricsDatadogDistributions bool   `cli:"metrics-datadog-distributions"`
 
 	// Tracing config
-	TracingBackend           string `cli:"tracing-backend"`
-	TracingServiceName       string `cli:"tracing-service-name"`
-	TracingAcceptTraceparent bool   `cli:"tracing-accept-traceparent"`
+	TracingBackend              string `cli:"tracing-backend"`
+	TracingServiceName          string `cli:"tracing-service-name"`
+	TracingPropagateTraceparent bool   `cli:"tracing-propagate-traceparent"`
 
 	// Other shared flags
 	StrictSingleHooks         bool   `cli:"strict-single-hooks"`
@@ -224,8 +224,8 @@ func (asc AgentStartConfig) Features(ctx context.Context) []string {
 		features = append(features, "opentelemetry-tracing")
 	}
 
-	if asc.TracingAcceptTraceparent {
-		features = append(features, "accept-traceparent")
+	if asc.TracingPropagateTraceparent {
+		features = append(features, "propagate-traceparent")
 	}
 
 	if asc.DisconnectAfterJob {
@@ -673,9 +673,9 @@ var AgentStartCommand = cli.Command{
 			Value:  "",
 		},
 		cli.BoolFlag{
-			Name:   "tracing-accept-traceparent",
+			Name:   "tracing-propagate-traceparent",
 			Usage:  `Enable accepting traceparent context from Buildkite control plane (only supported for OpenTelemetry backend)`,
-			EnvVar: "BUILDKITE_TRACING_ACCEPT_TRACEPARENT",
+			EnvVar: "BUILDKITE_TRACING_PROPAGATE_TRACEPARENT",
 		},
 		cli.StringFlag{
 			Name:   "tracing-service-name",
@@ -1038,7 +1038,7 @@ var AgentStartCommand = cli.Command{
 			AcquireJob:                   cfg.AcquireJob,
 			TracingBackend:               cfg.TracingBackend,
 			TracingServiceName:           cfg.TracingServiceName,
-			TracingAcceptTraceparent:     cfg.TracingAcceptTraceparent,
+			TracingPropagateTraceparent:  cfg.TracingPropagateTraceparent,
 			TraceContextEncoding:         cfg.TraceContextEncoding,
 			AllowMultipartArtifactUpload: !cfg.NoMultipartArtifactUpload,
 			KubernetesExec:               cfg.KubernetesExec,

clicommand/bootstrap.go

@@ -98,7 +98,7 @@ type BootstrapConfig struct {
 	TracingBackend               string   `cli:"tracing-backend"`
 	TracingServiceName           string   `cli:"tracing-service-name"`
 	TracingTraceParent           string   `cli:"tracing-traceparent"`
-	TracingAcceptTraceparent     bool     `cli:"tracing-accept-traceparent"`
+	TracingPropagateTraceparent  bool     `cli:"tracing-propagate-traceparent"`
 	TraceContextEncoding         string   `cli:"trace-context-encoding"`
 	NoJobAPI                     bool     `cli:"no-job-api"`
 	DisableWarningsFor           []string `cli:"disable-warnings-for" normalize:"list"`
@@ -367,9 +367,9 @@ var BootstrapCommand = cli.Command{
 			Value:  "",
 		},
 		cli.BoolFlag{
-			Name:   "tracing-accept-traceparent",
+			Name:   "tracing-propagate-traceparent",
 			Usage:  "Accept traceparent from Buildkite control plane",
-			EnvVar: "BUILDKITE_TRACING_ACCEPT_TRACEPARENT",
+			EnvVar: "BUILDKITE_TRACING_PROPAGATE_TRACEPARENT",
 		},
 
 		cli.BoolFlag{
@@ -486,7 +486,7 @@ var BootstrapCommand = cli.Command{
 			TracingServiceName:           cfg.TracingServiceName,
 			TraceContextCodec:            traceContextCodec,
 			TracingTraceParent:           cfg.TracingTraceParent,
-			TracingAcceptTraceparent:     cfg.TracingAcceptTraceparent,
+			TracingPropagateTraceparent:  cfg.TracingPropagateTraceparent,
 			JobAPI:                       !cfg.NoJobAPI,
 			DisabledWarnings:             cfg.DisableWarningsFor,
 			KubernetesExec:               cfg.KubernetesExec,

internal/job/config.go

@@ -173,7 +173,7 @@ type ExecutorConfig struct {
 	TracingTraceParent string
 
 	// Accept traceparent context from Buildkite control plane
-	TracingAcceptTraceparent bool
+	TracingPropagateTraceparent bool
 
 	// Encoding (within base64) for the trace context environment variable.
 	TraceContextCodec tracetools.Codec

internal/job/tracing.go

@@ -188,12 +188,12 @@ func (e *Executor) startTracingOpenTelemetry(ctx context.Context) (tracetools.Sp
 // technically a breaking change to the behaviour, and if the server-side tracing
 // isn't set up correctly, agent traces may end up without root spans to link to
 func (e *Executor) contextWithTraceparentIfEnabled(ctx context.Context) context.Context {
-	if !e.ExecutorConfig.TracingAcceptTraceparent {
+	if !e.ExecutorConfig.TracingPropagateTraceparent {
 		return ctx
 	}
 
 	if e.ExecutorConfig.TracingTraceParent == "" {
-		e.shell.Warningf("tracing-accept-traceparent enabled, but no traceparent provided by server")
+		e.shell.Warningf("tracing-propagate-traceparent enabled, but no traceparent provided by server")
 		return ctx
 	}