fix: fix context logic

Signed-off-by: namkyu1999 <[email protected]>

Author: namkyu1999

bin/runner.go

@@ -9,6 +9,7 @@ import (
 	"github.com/litmuschaos/chaos-runner/pkg/utils"
 	"github.com/litmuschaos/chaos-runner/pkg/utils/analytics"
 	"github.com/sirupsen/logrus"
+	"go.opentelemetry.io/otel"
 )
 
 func init() {
@@ -34,9 +35,9 @@ func main() {
 	ctx = telemetry.GetTraceParentContext()
 
 	engineDetails := utils.EngineDetails{}
-	clients := utils.ClientSets{Context: ctx}
+	clients := utils.ClientSets{}
 
-	span := telemetry.StartTracing(clients, "ExecuteChaosRunner")
+	ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "ExecuteChaosRunner")
 	defer span.End()
 
 	// Getting kubeConfig and Generate ClientSets
@@ -85,7 +86,7 @@ func main() {
 			continue
 		}
 		// derive the envs from the chaos experiment and override their values from chaosengine if any
-		if err := experiment.SetENV(engineDetails, clients); err != nil {
+		if err := experiment.SetENV(ctx, engineDetails, clients); err != nil {
 			log.Errorf("unable to patch ENV, error: %v", err)
 			experiment.ExperimentSkipped(utils.ExperimentEnvParseErrorReason, engineDetails, clients)
 			engineDetails.ExperimentSkippedPatchEngine(&experiment, clients)
@@ -111,7 +112,7 @@ func main() {
 		experiment.ExperimentDependencyCheck(engineDetails, clients)
 
 		// Creation of PodTemplateSpec, and Final Job
-		if err := utils.BuildingAndLaunchJob(&experiment, clients); err != nil {
+		if err := utils.BuildingAndLaunchJob(ctx, &experiment, clients); err != nil {
 			log.Errorf("unable to construct chaos experiment job, error: %v", err)
 			experiment.ExperimentSkipped(utils.ExperimentDependencyCheckReason, engineDetails, clients)
 			engineDetails.ExperimentSkippedPatchEngine(&experiment, clients)

pkg/telemetry/tracing.go

@@ -6,23 +6,15 @@ import (
 	"os"
 
 	"github.com/litmuschaos/chaos-runner/pkg/log"
-	"github.com/litmuschaos/chaos-runner/pkg/utils"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/propagation"
-	"go.opentelemetry.io/otel/trace"
 )
 
 const (
 	TracerName  = "litmuschaos.io/chaos-runner"
 	TraceParent = "TRACE_PARENT"
 )
 
-func StartTracing(clients utils.ClientSets, spanName string) trace.Span {
-	ctx, span := otel.Tracer(TracerName).Start(clients.Context, spanName)
-	clients.Context = ctx
-	return span
-}
-
 func GetTraceParentContext() context.Context {
 	traceParent := os.Getenv(TraceParent)
 

pkg/utils/builders.go

@@ -11,6 +11,7 @@ import (
 	"github.com/litmuschaos/elves/kubernetes/jobspec"
 	"github.com/litmuschaos/elves/kubernetes/podtemplatespec"
 	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -113,8 +114,8 @@ func getEnvFromMap(m map[string]corev1.EnvVar) []corev1.EnvVar {
 }
 
 // BuildingAndLaunchJob builds Job, and then launch it.
-func BuildingAndLaunchJob(experiment *ExperimentDetails, clients ClientSets) error {
-	span := telemetry.StartTracing(clients, "CreateExperimentJob")
+func BuildingAndLaunchJob(ctx context.Context, experiment *ExperimentDetails, clients ClientSets) error {
+	ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateExperimentJob")
 	defer span.End()
 
 	experiment.VolumeOpts.VolumeOperations(experiment)

pkg/utils/environment.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"context"
 	"os"
 	"strconv"
 	"strings"
@@ -33,7 +34,7 @@ func (engineDetails *EngineDetails) SetEngineUID(clients ClientSets) error {
 }
 
 // SetENV sets ENV values in experimentDetails struct.
-func (expDetails *ExperimentDetails) SetENV(engineDetails EngineDetails, clients ClientSets) error {
+func (expDetails *ExperimentDetails) SetENV(ctx context.Context, engineDetails EngineDetails, clients ClientSets) error {
 
 	// Setting envs from engine fields other than env
 	expDetails.setEnv("CHAOSENGINE", engineDetails.Name).
@@ -47,7 +48,7 @@ func (expDetails *ExperimentDetails) SetENV(engineDetails EngineDetails, clients
 		setEnv("DEFAULT_HEALTH_CHECK", expDetails.DefaultHealthCheck).
 		setEnv("CHAOS_SERVICE_ACCOUNT", expDetails.SvcAccount).
 		setEnv("OTEL_EXPORTER_OTLP_ENDPOINT", os.Getenv(telemetry.OTELExporterOTLPEndpoint)).
-		setEnv("TRACE_PARENT", telemetry.GetMarshalledSpanFromContext(clients.Context))
+		setEnv("TRACE_PARENT", telemetry.GetMarshalledSpanFromContext(ctx))
 
 	// Get the Default ENV's from ChaosExperiment
 	log.Info("Getting the ENV Variables")

pkg/utils/types.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"context"
 	"flag"
 
 	"github.com/litmuschaos/chaos-operator/api/litmuschaos/v1alpha1"
@@ -78,7 +77,6 @@ type VolumeOpts struct {
 type ClientSets struct {
 	KubeClient   kubernetes.Interface
 	LitmusClient clientV1alpha1.Interface
-	Context      context.Context
 }
 
 // EventAttributes is for collecting all the events-related details