feat(provisioner): propagate trace info

coryb · coryb · commit 2fdd89981d04 · 2025-03-29T14:31:39.000-07:00
If tracing is enabled, propagate the trace information to the terraform
provisioner via environment variables.  This sets the `TRACEPARENT`
environment variable using the default W3C trace propagators.  Users
can choose to continue the trace by adding new spans in the provisioner
by reading from the environment like:

	ctx := env.ContextWithRemoteSpanContext(context.Background(), os.Environ())
diff --git a/go.mod b/go.mod
@@ -99,6 +99,7 @@ require (
 	github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0
 	github.com/coreos/go-oidc/v3 v3.13.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
+	github.com/coryb/otelbundle/propagation/env v0.0.0-20250329212302-8bba361f6186
 	github.com/creack/pty v1.1.21
 	github.com/dave/dst v0.27.2
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
diff --git a/go.sum b/go.sum
@@ -264,6 +264,8 @@ github.com/coreos/go-oidc/v3 v3.13.0 h1:M66zd0pcc5VxvBNM4pB331Wrsanby+QomQYjN8Ha
 github.com/coreos/go-oidc/v3 v3.13.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coryb/otelbundle/propagation/env v0.0.0-20250329212302-8bba361f6186 h1:UFDyqz3hul8sfB6pDvXtTUbwI1XENo4nmBeDCOV65GQ=
+github.com/coryb/otelbundle/propagation/env v0.0.0-20250329212302-8bba361f6186/go.mod h1:wkP46S9+xTbU8C9L7RpTMMXiWOJyql54WIMq3hpM7tQ=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
 github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -1020,6 +1022,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/contrib/propagators/b3 v1.3.0 h1:f+JfMSDNm2u+fekYYjyoixk+DWDTDAGD3SC50y61koE=
+go.opentelemetry.io/contrib/propagators/b3 v1.3.0/go.mod h1:qzi0km8qO3l2jxB5aDg4Q9xyqV4HKnCWZYpVYDTUIT0=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -17,6 +17,7 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/terraform-provider-coder/v2/provider"
+	propenv "github.com/coryb/otelbundle/propagation/env"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/tracing"
@@ -156,6 +157,7 @@ func (s *server) Plan(
 	if err != nil {
 		return provisionersdk.PlanErrorf("setup env: %s", err)
 	}
+	env = propenv.Inject(ctx, env)
 
 	vars, err := planVars(request)
 	if err != nil {
@@ -208,6 +210,7 @@ func (s *server) Apply(
 	if err != nil {
 		return provisionersdk.ApplyErrorf("provision env: %s", err)
 	}
+	env = propenv.Inject(ctx, env)
 	resp, err := e.apply(
 		ctx, killCtx, env, sess,
 	)

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`
`18`	`18`	`"cdr.dev/slog"`
`19`	`19`	`"github.com/coder/terraform-provider-coder/v2/provider"`
	`20`	`+ propenv "github.com/coryb/otelbundle/propagation/env"`
`20`	`21`
`21`	`22`	`"github.com/coder/coder/v2/coderd/database"`
`22`	`23`	`"github.com/coder/coder/v2/coderd/tracing"`
`@@ -156,6 +157,7 @@ func (s *server) Plan(`
`156`	`157`	`if err != nil {`
`157`	`158`	`return provisionersdk.PlanErrorf("setup env: %s", err)`
`158`	`159`	`}`
	`160`	`+ env = propenv.Inject(ctx, env)`
`159`	`161`
`160`	`162`	`vars, err := planVars(request)`
`161`	`163`	`if err != nil {`
`@@ -208,6 +210,7 @@ func (s *server) Apply(`
`208`	`210`	`if err != nil {`
`209`	`211`	`return provisionersdk.ApplyErrorf("provision env: %s", err)`
`210`	`212`	`}`
	`213`	`+ env = propenv.Inject(ctx, env)`
`211`	`214`	`resp, err := e.apply(`
`212`	`215`	`ctx, killCtx, env, sess,`
`213`	`216`	`)`