Skip to content

Commit 7241a9c

Browse files
namkyu1999namkyu1999
committed
feat: rename spans and enhance coverage
Signed-off-by: namkyu1999 <[email protected]>
1 parent 86c0bab commit 7241a9c

File tree

48 files changed

+194
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+194
-72
lines changed

‎chaoslib/litmus/aws-ssm-chaos/lib/ssm-chaos.go

+6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import (
1212
"github.com/litmuschaos/litmus-go/pkg/events"
1313
"github.com/litmuschaos/litmus-go/pkg/log"
1414
"github.com/litmuschaos/litmus-go/pkg/probe"
15+
"github.com/litmuschaos/litmus-go/pkg/telemetry"
1516
"github.com/litmuschaos/litmus-go/pkg/types"
1617
"github.com/litmuschaos/litmus-go/pkg/utils/common"
1718
"github.com/palantir/stacktrace"
19+
"go.opentelemetry.io/otel"
1820
)
1921

2022
// InjectChaosInSerialMode will inject the aws ssm chaos in serial mode that is one after other
2123
func InjectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails, inject chan os.Signal) error {
24+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSSSMFaultInSerialMode")
25+
defer span.End()
2226

2327
select {
2428
case <-inject:
@@ -87,6 +91,8 @@ func InjectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
8791

8892
// InjectChaosInParallelMode will inject the aws ssm chaos in parallel mode that is all at once
8993
func InjectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails, inject chan os.Signal) error {
94+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSSSMFaultInParallelMode")
95+
defer span.End()
9096

9197
select {
9298
case <-inject:

‎chaoslib/litmus/aws-ssm-chaos/lib/ssm/aws-ssm-chaos-by-id.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828

2929
// PrepareAWSSSMChaosByID contains the prepration and injection steps for the experiment
3030
func PrepareAWSSSMChaosByID(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
31-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSChaosByIDChaos")
31+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAWSSSMFaultByID")
3232
defer span.End()
3333

3434
// inject channel is used to transmit signal notifications.

‎chaoslib/litmus/aws-ssm-chaos/lib/ssm/aws-ssm-chaos-by-tag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
// PrepareAWSSSMChaosByTag contains the prepration and injection steps for the experiment
2525
func PrepareAWSSSMChaosByTag(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
26-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSSSMChaosByTagChaos")
26+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSSSMFaultByTag")
2727
defer span.End()
2828

2929
// inject channel is used to transmit signal notifications.

‎chaoslib/litmus/azure-disk-loss/lib/azure-disk-loss.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var (
3333

3434
// PrepareChaos contains the prepration and injection steps for the experiment
3535
func PrepareChaos(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
36-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureDiskLossChaos")
36+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAzureDiskLossFault")
3737
defer span.End()
3838

3939
// inject channel is used to transmit signal notifications.
@@ -106,6 +106,8 @@ func PrepareChaos(ctx context.Context, experimentsDetails *experimentTypes.Exper
106106

107107
// injectChaosInParallelMode will inject the Azure disk loss chaos in parallel mode that is all at once
108108
func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceNamesWithDiskNames map[string][]string, attachedDisksWithInstance map[string]*[]compute.DataDisk, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
109+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureDiskLossFaultInParallelMode")
110+
defer span.End()
109111

110112
//ChaosStartTimeStamp contains the start timestamp, when the chaos injection begin
111113
ChaosStartTimeStamp := time.Now()
@@ -184,6 +186,8 @@ func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experime
184186

185187
// injectChaosInSerialMode will inject the Azure disk loss chaos in serial mode that is one after other
186188
func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceNamesWithDiskNames map[string][]string, attachedDisksWithInstance map[string]*[]compute.DataDisk, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
189+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureDiskLossFaultInSerialMode")
190+
defer span.End()
187191

188192
//ChaosStartTimeStamp contains the start timestamp, when the chaos injection begin
189193
ChaosStartTimeStamp := time.Now()

‎chaoslib/litmus/azure-instance-stop/lib/azure-instance-stop.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var (
3131

3232
// PrepareAzureStop will initialize instanceNameList and start chaos injection based on sequence method selected
3333
func PrepareAzureStop(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
34-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureInstanceStopChaos")
34+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAzureInstanceStopFault")
3535
defer span.End()
3636

3737
// inject channel is used to transmit signal notifications
@@ -81,6 +81,9 @@ func PrepareAzureStop(ctx context.Context, experimentsDetails *experimentTypes.E
8181

8282
// injectChaosInSerialMode will inject the Azure instance termination in serial mode that is one after the other
8383
func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceNameList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
84+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureInstanceStopFaultInSerialMode")
85+
defer span.End()
86+
8487
select {
8588
case <-inject:
8689
// stopping the chaos execution, if abort signal received
@@ -159,6 +162,9 @@ func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
159162

160163
// injectChaosInParallelMode will inject the Azure instance termination in parallel mode that is all at once
161164
func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceNameList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
165+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAzureInstanceStopFaultInParallelMode")
166+
defer span.End()
167+
162168
select {
163169
case <-inject:
164170
// Stopping the chaos execution, if abort signal received

‎chaoslib/litmus/container-kill/lib/container-kill.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
// PrepareContainerKill contains the preparation steps before chaos injection
2929
func PrepareContainerKill(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
30-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectContainerKillChaos")
30+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareContainerKillFault")
3131
defer span.End()
3232

3333
var err error
@@ -93,6 +93,8 @@ func PrepareContainerKill(ctx context.Context, experimentsDetails *experimentTyp
9393

9494
// injectChaosInSerialMode kill the container of all target application serially (one by one)
9595
func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetPodList apiv1.PodList, clients clients.ClientSets, chaosDetails *types.ChaosDetails, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails) error {
96+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectContainerKillFaultInSerialMode")
97+
defer span.End()
9698
// run the probes during chaos
9799
if len(resultDetails.ProbeDetails) != 0 {
98100
if err := probe.RunProbes(ctx, chaosDetails, clients, resultDetails, "DuringChaos", eventsDetails); err != nil {
@@ -143,6 +145,8 @@ func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
143145

144146
// injectChaosInParallelMode kill the container of all target application in parallel mode (all at once)
145147
func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetPodList apiv1.PodList, clients clients.ClientSets, chaosDetails *types.ChaosDetails, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails) error {
148+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectContainerKillFaultInParallelMode")
149+
defer span.End()
146150
// run the probes during chaos
147151
if len(resultDetails.ProbeDetails) != 0 {
148152
if err := probe.RunProbes(ctx, chaosDetails, clients, resultDetails, "DuringChaos", eventsDetails); err != nil {
@@ -193,7 +197,7 @@ func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experime
193197

194198
// createHelperPod derive the attributes for helper pod and create the helper pod
195199
func createHelperPod(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, chaosDetails *types.ChaosDetails, targets, nodeName, runID string) error {
196-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateContainerKillHelperPod")
200+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateContainerKillFaultHelperPod")
197201
defer span.End()
198202

199203
privilegedEnable := false

‎chaoslib/litmus/disk-fill/lib/disk-fill.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
// PrepareDiskFill contains the preparation steps before chaos injection
3030
func PrepareDiskFill(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
31-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectDiskFillChaos")
31+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareDiskFillFault")
3232
defer span.End()
3333

3434
var err error
@@ -98,7 +98,8 @@ func PrepareDiskFill(ctx context.Context, experimentsDetails *experimentTypes.Ex
9898

9999
// injectChaosInSerialMode fill the ephemeral storage of all target application serially (one by one)
100100
func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetPodList apiv1.PodList, clients clients.ClientSets, chaosDetails *types.ChaosDetails, execCommandDetails exec.PodDetails, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails) error {
101-
101+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectDiskFillFaultInSerialMode")
102+
defer span.End()
102103
// run the probes during chaos
103104
if len(resultDetails.ProbeDetails) != 0 {
104105
if err := probe.RunProbes(ctx, chaosDetails, clients, resultDetails, "DuringChaos", eventsDetails); err != nil {
@@ -150,7 +151,8 @@ func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
150151

151152
// injectChaosInParallelMode fill the ephemeral storage of of all target application in parallel mode (all at once)
152153
func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetPodList apiv1.PodList, clients clients.ClientSets, chaosDetails *types.ChaosDetails, execCommandDetails exec.PodDetails, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails) error {
153-
154+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectDiskFillFaultInParallelMode")
155+
defer span.End()
154156
var err error
155157
// run the probes during chaos
156158
if len(resultDetails.ProbeDetails) != 0 {
@@ -202,7 +204,7 @@ func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experime
202204

203205
// createHelperPod derive the attributes for helper pod and create the helper pod
204206
func createHelperPod(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, chaosDetails *types.ChaosDetails, targets, appNodeName, runID string) error {
205-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateDiskFillHelperPod")
207+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateDiskFillFaultHelperPod")
206208
defer span.End()
207209

208210
privilegedEnable := true

‎chaoslib/litmus/docker-service-kill/lib/docker-service-kill.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
// PrepareDockerServiceKill contains prepration steps before chaos injection
2828
func PrepareDockerServiceKill(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
29-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectDockerServiceKillChaos")
29+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareDockerServiceKillFault")
3030
defer span.End()
3131

3232
var err error
@@ -115,7 +115,7 @@ func PrepareDockerServiceKill(ctx context.Context, experimentsDetails *experimen
115115

116116
// createHelperPod derive the attributes for helper pod and create the helper pod
117117
func createHelperPod(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, chaosDetails *types.ChaosDetails, appNodeName string) error {
118-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateDockerServiceKillHelperPod")
118+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "CreateDockerServiceKillFaultHelperPod")
119119
defer span.End()
120120

121121
privileged := true

‎chaoslib/litmus/ebs-loss/lib/ebs-loss-by-id/lib/ebs-loss-by-id.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727

2828
// PrepareEBSLossByID contains the prepration and injection steps for the experiment
2929
func PrepareEBSLossByID(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
30-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectEBSLossByIDChaos")
30+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAWSEBSLossFaultByID")
3131
defer span.End()
3232

3333
// inject channel is used to transmit signal notifications.

‎chaoslib/litmus/ebs-loss/lib/ebs-loss-by-tag/lib/ebs-loss-by-tag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727

2828
// PrepareEBSLossByTag contains the prepration and injection steps for the experiment
2929
func PrepareEBSLossByTag(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
30-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectEBSLossByTagChaos")
30+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAWSEBSLossFaultByTag")
3131
defer span.End()
3232

3333
// inject channel is used to transmit signal notifications.

‎chaoslib/litmus/ebs-loss/lib/ebs-loss.go

+6
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ import (
1313
experimentTypes "github.com/litmuschaos/litmus-go/pkg/kube-aws/ebs-loss/types"
1414
"github.com/litmuschaos/litmus-go/pkg/log"
1515
"github.com/litmuschaos/litmus-go/pkg/probe"
16+
"github.com/litmuschaos/litmus-go/pkg/telemetry"
1617
"github.com/litmuschaos/litmus-go/pkg/types"
1718
"github.com/litmuschaos/litmus-go/pkg/utils/common"
1819
"github.com/palantir/stacktrace"
20+
"go.opentelemetry.io/otel"
1921
)
2022

2123
// InjectChaosInSerialMode will inject the ebs loss chaos in serial mode which means one after other
2224
func InjectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetEBSVolumeIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
25+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSEBSLossFaultInSerialMode")
26+
defer span.End()
2327

2428
//ChaosStartTimeStamp contains the start timestamp, when the chaos injection begin
2529
ChaosStartTimeStamp := time.Now()
@@ -97,6 +101,8 @@ func InjectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
97101

98102
// InjectChaosInParallelMode will inject the chaos in parallel mode that means all at once
99103
func InjectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, targetEBSVolumeIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
104+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSEBSLossFaultInParallelMode")
105+
defer span.End()
100106

101107
var ec2InstanceIDList, deviceList []string
102108

‎chaoslib/litmus/ec2-terminate-by-id/lib/ec2-terminate-by-id.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var (
3030

3131
// PrepareEC2TerminateByID contains the prepration and injection steps for the experiment
3232
func PrepareEC2TerminateByID(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
33-
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectEC2TerminateByIDChaos")
33+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "PrepareAWSEC2TerminateFaultByID")
3434
defer span.End()
3535

3636
// inject channel is used to transmit signal notifications.
@@ -81,6 +81,8 @@ func PrepareEC2TerminateByID(ctx context.Context, experimentsDetails *experiment
8181

8282
// injectChaosInSerialMode will inject the ec2 instance termination in serial mode that is one after other
8383
func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
84+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSEC2TerminateFaultByIDInSerialMode")
85+
defer span.End()
8486

8587
select {
8688
case <-inject:
@@ -153,6 +155,8 @@ func injectChaosInSerialMode(ctx context.Context, experimentsDetails *experiment
153155

154156
// injectChaosInParallelMode will inject the ec2 instance termination in parallel mode that is all at once
155157
func injectChaosInParallelMode(ctx context.Context, experimentsDetails *experimentTypes.ExperimentDetails, instanceIDList []string, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
158+
ctx, span := otel.Tracer(telemetry.TracerName).Start(ctx, "InjectAWSEC2TerminateFaultByIDInParallelMode")
159+
defer span.End()
156160

157161
select {
158162
case <-inject:

0 commit comments

Comments
 (0)