with object

Signed-off-by: Li Zhijian <[email protected]>

Author: zhijianli88

pkg/controller/deployment/sync.go

@@ -74,7 +74,7 @@ func (dc *DeploymentController) sync(d *apps.Deployment, rsList []*apps.ReplicaS
 // that were paused for longer than progressDeadlineSeconds.
 func (dc *DeploymentController) checkPausedConditions(d *apps.Deployment) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), d.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), d)
 
 	if !deploymentutil.HasProgressDeadline(d) {
 		return nil
@@ -141,7 +141,7 @@ const (
 // Note that the pod-template-hash will be added to adopted RSes and pods.
 func (dc *DeploymentController) getNewReplicaSet(d *apps.Deployment, rsList, oldRSs []*apps.ReplicaSet, createIfNotExisted bool) (*apps.ReplicaSet, error) {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), d.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), d)
 
 	existingNewRS := deploymentutil.FindNewReplicaSet(d, rsList)
 
@@ -418,7 +418,7 @@ func (dc *DeploymentController) scaleReplicaSetAndRecordEvent(rs *apps.ReplicaSe
 
 func (dc *DeploymentController) scaleReplicaSet(rs *apps.ReplicaSet, newScale int32, deployment *apps.Deployment, scalingOperation string) (bool, *apps.ReplicaSet, error) {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), rs.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), rs)
 
 	sizeNeedsUpdate := *(rs.Spec.Replicas) != newScale
 
@@ -444,7 +444,7 @@ func (dc *DeploymentController) scaleReplicaSet(rs *apps.ReplicaSet, newScale in
 // around by default 1) for historical reasons and 2) for the ability to rollback a deployment.
 func (dc *DeploymentController) cleanupDeployment(oldRSs []*apps.ReplicaSet, deployment *apps.Deployment) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), deployment.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), deployment)
 
 	if !deploymentutil.HasRevisionHistoryLimit(deployment) {
 		return nil
@@ -483,8 +483,8 @@ func (dc *DeploymentController) cleanupDeployment(oldRSs []*apps.ReplicaSet, dep
 
 // syncDeploymentStatus checks if the status is up-to-date and sync it if necessary
 func (dc *DeploymentController) syncDeploymentStatus(allRSs []*apps.ReplicaSet, newRS *apps.ReplicaSet, d *apps.Deployment) error {
-	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), d.GetAnnotations())
+	// Get span and baggage from object and set to ctx
+	ctx := httptrace.SpanContextWithObject(context.Background(), d)
 
 	newStatus := calculateStatus(allRSs, newRS, d)
 

pkg/controller/replicaset/replica_set.go

@@ -541,7 +541,7 @@ func (rsc *ReplicaSetController) processNextWorkItem() bool {
 // It will requeue the replica set in case of an error while creating/deleting pods.
 func (rsc *ReplicaSetController) manageReplicas(filteredPods []*v1.Pod, rs *apps.ReplicaSet) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), rs.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), rs)
 
 	diff := len(filteredPods) - int(*(rs.Spec.Replicas))
 	rsKey, err := controller.KeyFunc(rs)
@@ -717,7 +717,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(key string) error {
 
 func (rsc *ReplicaSetController) claimPods(rs *apps.ReplicaSet, selector labels.Selector, filteredPods []*v1.Pod) ([]*v1.Pod, error) {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), rs.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), rs)
 
 	// If any adoptions are attempted, we should first recheck for deletion with
 	// an uncached quorum read sometime after listing Pods (see #42639).

pkg/controller/statefulset/stateful_pod_control.go

@@ -75,7 +75,7 @@ type realStatefulPodControl struct {
 
 func (spc *realStatefulPodControl) CreateStatefulPod(set *apps.StatefulSet, pod *v1.Pod) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), set.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), set)
 
 	// Create the Pod's PVCs prior to creating the Pod
 	if err := spc.createPersistentVolumeClaims(set, pod); err != nil {
@@ -95,7 +95,7 @@ func (spc *realStatefulPodControl) CreateStatefulPod(set *apps.StatefulSet, pod
 
 func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod *v1.Pod) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), set.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), set)
 
 	attemptedUpdate := false
 	err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
@@ -145,7 +145,7 @@ func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod
 
 func (spc *realStatefulPodControl) DeleteStatefulPod(set *apps.StatefulSet, pod *v1.Pod) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), set.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), set)
 
 	err := spc.client.CoreV1().Pods(set.Namespace).Delete(ctx, pod.Name, metav1.DeleteOptions{})
 	spc.recordPodEvent("delete", set, pod, err)
@@ -191,7 +191,7 @@ func (spc *realStatefulPodControl) recordClaimEvent(verb string, set *apps.State
 // set's Spec.
 func (spc *realStatefulPodControl) createPersistentVolumeClaims(set *apps.StatefulSet, pod *v1.Pod) error {
 	// Get span from annotations and set to ctx
-	ctx := httptrace.SpanContextFromAnnotations(context.Background(), set.GetAnnotations())
+	ctx := httptrace.SpanContextWithObject(context.Background(), set)
 
 	var errs []error
 	for _, claim := range getPersistentVolumeClaims(set, pod) {

pkg/util/httptrace/httptrace.go

@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/otel"
 	apitrace "go.opentelemetry.io/otel/api/trace"
 	"go.opentelemetry.io/otel/label"
-	"go.opentelemetry.io/otel/propagators"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type contextKeyType int
@@ -38,6 +38,11 @@ const spanContextAnnotationKey string = "trace.kubernetes.io.span.context"
 
 const initialTraceIDBaggageKey label.Key = "Initial-Trace-Id"
 
+// SpanContextWithObject returns a context.Context with Spacn and Baggage from the passed object
+func SpanContextWithObject(ctx context.Context, meta metav1.Object) context.Context {
+	return SpanContextFromAnnotations(ctx, meta.GetAnnotations())
+}
+
 // SpanContextFromAnnotations get span context from annotations
 func SpanContextFromAnnotations(ctx context.Context, annotations map[string]string) context.Context {
 	// get init trace id from annotations