GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-15 13:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix naming convention

Browse Source 
Signed-off-by: Shivanshu Raj Shrivastava <shivanshu1333@gmail.com>
This commit is contained in:
Shivanshu Raj Shrivastava 2025-04-29 17:19:29 +05:30
parent da9a2520a4
commit 9a96817a88
No known key found for this signature in database
GPG Key ID: D34D26C62AC3E9AE
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/modules/tracefunnel/impltracefunnel/handler_test.go
View File

@ -125,14 +125,14 @@ func TestHandler_Update(t *testing.T) {
Name: "updated-funnel", Name: "updated-funnel",
Steps: []traceFunnels.FunnelStep{ Steps: []traceFunnels.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",

4
pkg/modules/tracefunnel/utils.go
View File

@ -115,8 +115,8 @@ func ProcessFunnelSteps(steps []tracefunnel.FunnelStep) ([]tracefunnel.FunnelSte
if steps[i].Order < 1 { if steps[i].Order < 1 {
steps[i].Order = int64(i + 1) steps[i].Order = int64(i + 1)
} }
if steps[i].Id.IsZero() { if steps[i].ID.IsZero() {
steps[i].Id = valuer.GenerateUUID() steps[i].ID = valuer.GenerateUUID()
} }
} }

38
pkg/modules/tracefunnel/utils_test.go
View File

@ -98,14 +98,14 @@ func TestValidateFunnelSteps(t *testing.T) {
name: "valid steps", name: "valid steps",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -118,7 +118,7 @@ func TestValidateFunnelSteps(t *testing.T) {
name: "too few steps", name: "too few steps",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
@ -131,13 +131,13 @@ func TestValidateFunnelSteps(t *testing.T) {
name: "missing service name", name: "missing service name",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
SpanName: "test-span", SpanName: "test-span",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -150,13 +150,13 @@ func TestValidateFunnelSteps(t *testing.T) {
name: "missing span name", name: "missing span name",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -169,14 +169,14 @@ func TestValidateFunnelSteps(t *testing.T) {
name: "negative order", name: "negative order",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
Order: -1, Order: -1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -209,14 +209,14 @@ func TestNormalizeFunnelSteps(t *testing.T) {
name: "already normalized steps", name: "already normalized steps",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -242,14 +242,14 @@ func TestNormalizeFunnelSteps(t *testing.T) {
name: "unordered steps", name: "unordered steps",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
Order: 2, Order: 2,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
@ -275,21 +275,21 @@ func TestNormalizeFunnelSteps(t *testing.T) {
name: "steps with gaps in order", name: "steps with gaps in order",
steps: []tracefunnel.FunnelStep{ steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
Order: 1, Order: 1,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 3", Name: "Step 3",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-3", SpanName: "test-span-3",
Order: 3, Order: 3,
}, },
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 2", Name: "Step 2",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span-2", SpanName: "test-span-2",
@ -457,7 +457,7 @@ func TestConstructFunnelResponse(t *testing.T) {
}, },
Steps: []tracefunnel.FunnelStep{ Steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
@ -509,7 +509,7 @@ func TestConstructFunnelResponse(t *testing.T) {
}, },
Steps: []tracefunnel.FunnelStep{ Steps: []tracefunnel.FunnelStep{
{ {
Id: valuer.GenerateUUID(), ID: valuer.GenerateUUID(),
Name: "Step 1", Name: "Step 1",
ServiceName: "test-service", ServiceName: "test-service",
SpanName: "test-span", SpanName: "test-span",
@ -644,7 +644,7 @@ func TestProcessFunnelSteps(t *testing.T) {
// Verify IDs are generated // Verify IDs are generated
for _, step := range result { for _, step := range result {
assert.False(t, step.Id.IsZero()) assert.False(t, step.ID.IsZero())
} }
// Verify orders are normalized // Verify orders are normalized

2
pkg/types/tracefunnel/tracefunnel.go
View File

@ -27,7 +27,7 @@ type Funnel struct {
} }
type FunnelStep struct { type FunnelStep struct {
Id valuer.UUID `json:"id,omitempty"` ID valuer.UUID `json:"id,omitempty"`
Name string `json:"name,omitempty"` // step name Name string `json:"name,omitempty"` // step name
Description string `json:"description,omitempty"` // step description Description string `json:"description,omitempty"` // step description
Order int64 `json:"step_order"` Order int64 `json:"step_order"`