trace_metadata

coder · coadler · May 3, 2023 · May 3, 2023 · May 3, 2023 · May 3, 2023
commit e185a6c5a134418872a17b9b08d0920d95afa888
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000121_provisioner_job_tracing.down.sql b/coderd/database/migrations/000121_provisioner_job_tracing.down.sql
@@ -1 +1 @@
-ALTER TABLE provisioner_jobs DROP COLUMN metadata;
+ALTER TABLE provisioner_jobs DROP COLUMN trace_metadata;
diff --git a/coderd/database/migrations/000121_provisioner_job_tracing.up.sql b/coderd/database/migrations/000121_provisioner_job_tracing.up.sql
@@ -1 +1 @@
-ALTER TABLE provisioner_jobs ADD COLUMN metadata jsonb;
+ALTER TABLE provisioner_jobs ADD COLUMN trace_metadata jsonb;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerjobs.sql b/coderd/database/queries/provisionerjobs.sql
@@ -64,7 +64,7 @@ INSERT INTO
 		"type",
 		"input",
 		tags,
-		metadata
+		trace_metadata
 	)
 VALUES
 	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *;

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -133,20 +133,20 @@ func (server *Server) AcquireJob(ctx context.Context, _ *proto.Empty) (*proto.Ac
 		return nil, failJob(fmt.Sprintf("get user: %s", err))
 	}
 
-	jobMetadata := map[string]string{}
-	if job.Metadata.Valid {
-		err := json.Unmarshal(job.Metadata.RawMessage, &jobMetadata)
+	jobTraceMetadata := map[string]string{}
+	if job.TraceMetadata.Valid {
+		err := json.Unmarshal(job.TraceMetadata.RawMessage, &jobTraceMetadata)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("unmarshal metadata: %s", err))
 		}
 	}
 
 	protoJob := &proto.AcquiredJob{
-		JobId:       job.ID.String(),
-		CreatedAt:   job.CreatedAt.UnixMilli(),
-		Provisioner: string(job.Provisioner),
-		UserName:    user.Username,
-		Metadata:    jobMetadata,
+		JobId:         job.ID.String(),
+		CreatedAt:     job.CreatedAt.UnixMilli(),
+		Provisioner:   string(job.Provisioner),
+		UserName:      user.Username,
+		TraceMetadata: jobTraceMetadata,
 	}
 
 	switch job.Type {

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -600,7 +600,7 @@ func (api *API) postTemplateVersionDryRun(rw http.ResponseWriter, r *http.Reques
 		Input:          input,
 		// Copy tags from the previous run.
 		Tags: job.Tags,
-		Metadata: pqtype.NullRawMessage{
+		TraceMetadata: pqtype.NullRawMessage{
 			Valid:      true,
 			RawMessage: metadataRaw,
 		},
@@ -1423,7 +1423,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		if err != nil {
 			return xerrors.Errorf("marshal job input: %w", err)
 		}
-		metadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
+		traceMetadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
 		if err != nil {
 			return xerrors.Errorf("marshal job metadata: %w", err)
 		}
@@ -1440,9 +1440,9 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 			Type:           database.ProvisionerJobTypeTemplateVersionImport,
 			Input:          jobInput,
 			Tags:           tags,
-			Metadata: pqtype.NullRawMessage{
+			TraceMetadata: pqtype.NullRawMessage{
 				Valid:      true,
-				RawMessage: metadataRaw,
+				RawMessage: traceMetadataRaw,
 			},
 		})
 		if err != nil {

diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -607,7 +607,7 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			return xerrors.Errorf("marshal provision job: %w", err)
 		}
-		metadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
+		traceMetadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
 		if err != nil {
 			return xerrors.Errorf("marshal metadata: %w", err)
 		}
@@ -624,9 +624,9 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 			FileID:         templateVersionJob.FileID,
 			Input:          input,
 			Tags:           tags,
-			Metadata: pqtype.NullRawMessage{
+			TraceMetadata: pqtype.NullRawMessage{
 				Valid:      true,
-				RawMessage: metadataRaw,
+				RawMessage: traceMetadataRaw,
 			},
 		})
 		if err != nil {

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -516,7 +516,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 		if err != nil {
 			return xerrors.Errorf("marshal provision job: %w", err)
 		}
-		metadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
+		traceMetadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
 		if err != nil {
 			return xerrors.Errorf("marshal metadata: %w", err)
 		}
@@ -532,9 +532,9 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 			FileID:         templateVersionJob.FileID,
 			Input:          input,
 			Tags:           tags,
-			Metadata: pqtype.NullRawMessage{
+			TraceMetadata: pqtype.NullRawMessage{
 				Valid:      true,
-				RawMessage: metadataRaw,
+				RawMessage: traceMetadataRaw,
 			},
 		})
 		if err != nil {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE provisioner_jobs DROP COLUMN metadata;
		ALTER TABLE provisioner_jobs DROP COLUMN trace_metadata;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE provisioner_jobs ADD COLUMN metadata jsonb;
		ALTER TABLE provisioner_jobs ADD COLUMN trace_metadata jsonb;