Fix orphan bulk decrypt traces #10037

t0yv0 · 2022-07-01T21:38:09Z

Description

Currently opentracing spans generated by the HTTP client when calling BulkDecrypt endpoint are not parented correctly. This seems to be an issue with not propagating context.Context through the code correctly. I took a stab at propagating it and I can see the spans snapping back into place.

Since we're changing interfaces under sdk/ this is a breaking change. It can be fixed by injecting context.Background() at the call sites.

Example project:

package main

import (
	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/s3"
	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
)

func main() {
	pulumi.Run(func(ctx *pulumi.Context) error {
		// Create an AWS resource (S3 Bucket)
		bucket, err := s3.NewBucket(ctx, "my-bucket", nil)
		if err != nil {
			return err
		}

		// Export the name of the bucket
		ctx.Export("bucketName", bucket.ID())
		return nil
	})
}

pulumi up --tracing file:./up.trace --yes
PULUMI_DEBUG_COMMANDS=1 pulumi view-trace ./up.trace
# observe orphan traces around bulkdecrypt calls

Fixes # (issue)

Checklist

I have added tests that prove my fix is effective or that my feature works

I have updated the CHANGELOG-PENDING file with my change

Yes, there are changes in this PR that warrants bumping the Pulumi Service API version

sdk/go/common/resource/config/crypt.go

pkg/resource/stack/deployment.go

pkg/backend/filestate/state.go

pkg/cmd/pulumi/import.go

pkg/resource/stack/checkpoint.go

pkg/testing/integration/program.go

iwahbe

This looks good to me in general. See my comments for details.

… tracing spans

Frassle · 2022-07-15T16:13:31Z

pkg/cmd/pulumi/import.go

@@ -510,7 +514,7 @@ func newImportCmd() *cobra.Command {
 			}, imports)

 			if generateCode {
-				deployment, err := getCurrentDeploymentForStack(s)
+				deployment, err := getCurrentDeploymentForStack(ctx, s)


s.Import above can take ctx instead of commandContext() as well

Frassle · 2022-07-15T16:14:26Z

pkg/cmd/pulumi/stack_import.go

@@ -76,7 +77,7 @@ func newStackImportCmd() *cobra.Command {
 			// We do, however, now want to unmarshal the json.RawMessage into a real, typed deployment.  We do this so
 			// we can check that the deployment doesn't contain resources from a stack other than the selected one. This
 			// catches errors wherein someone imports the wrong stack's deployment (which can seriously hork things).
-			snapshot, err := stack.DeserializeUntypedDeployment(&deployment, stack.DefaultSecretsProvider)
+			snapshot, err := stack.DeserializeUntypedDeployment(ctx, &deployment, stack.DefaultSecretsProvider)


Again, there's a call to s.ImportDeployment below which can take ctx instead of commandContext()