Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmd/telemetrygen] remove reliance on JSON unmarshalling for status code string #26985

Merged
merged 7 commits into from
Sep 25, 2023
Merged

[cmd/telemetrygen] remove reliance on JSON unmarshalling for status code string #26985

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c916ec
[cmd/telemetrygen] fix issue when passing status-code as string to co…
Sep 18, 2023
31e3a17
Merge branch 'main' into fix/telemetrygen-trace-status-code-parameter
jmsnll Sep 18, 2023
9ca842d
chore: add chloggen entry
Sep 18, 2023
d2a339b
Merge branch 'main' into fix/telemetrygen-trace-status-code-parameter
jmsnll Sep 18, 2023
e0fb06d
Merge branch 'main' into fix/telemetrygen-trace-status-code-parameter
jmsnll Sep 18, 2023
cc34ffa
Merge branch 'main' into fix/telemetrygen-trace-status-code-parameter
fatsheep9146 Sep 25, 2023
4198c03
Merge branch 'main' into fix/telemetrygen-trace-status-code-parameter
mx-psi Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions cmd/telemetrygen/internal/traces/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package traces
import (
"context"
"fmt"
"strings"
"sync"
"sync/atomic"
"time"
Expand Down Expand Up @@ -123,13 +124,18 @@ func Run(c *Config, logger *zap.Logger) error {
}

var statusCode codes.Code
if c.StatusCode == "" {

switch strings.ToLower(c.StatusCode) {
case "0", "unset", "":
jmsnll marked this conversation as resolved.
Show resolved Hide resolved
statusCode = codes.Unset
} else {
if err := statusCode.UnmarshalJSON([]byte(c.StatusCode)); err != nil {
return fmt.Errorf("expected `status-code` to be one of (Unset, Error, Ok) or (0, 1, 2), got %q instead", c.StatusCode)
}
case "1", "error":
statusCode = codes.Error
case "2", "ok":
statusCode = codes.Ok
default:
return fmt.Errorf("expected `status-code` to be one of (Unset, Error, Ok) or (0, 1, 2), got %q instead", c.StatusCode)
}

wg := sync.WaitGroup{}

running := &atomic.Bool{}
Expand Down
67 changes: 37 additions & 30 deletions cmd/telemetrygen/internal/traces/worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,46 +131,53 @@ func TestSpanStatuses(t *testing.T) {
spanStatus codes.Code
validInput bool
}{
{inputStatus: `"Unset"`, spanStatus: codes.Unset, validInput: true},
{inputStatus: `"Error"`, spanStatus: codes.Error, validInput: true},
{inputStatus: `"Ok"`, spanStatus: codes.Ok, validInput: true},
{inputStatus: `Unset`, spanStatus: codes.Unset, validInput: true},
{inputStatus: `Error`, spanStatus: codes.Error, validInput: true},
{inputStatus: `Ok`, spanStatus: codes.Ok, validInput: true},
{inputStatus: `unset`, spanStatus: codes.Unset, validInput: true},
{inputStatus: `error`, spanStatus: codes.Error, validInput: true},
{inputStatus: `ok`, spanStatus: codes.Ok, validInput: true},
{inputStatus: `UNSET`, spanStatus: codes.Unset, validInput: true},
{inputStatus: `ERROR`, spanStatus: codes.Error, validInput: true},
{inputStatus: `OK`, spanStatus: codes.Ok, validInput: true},
{inputStatus: `0`, spanStatus: codes.Unset, validInput: true},
{inputStatus: `1`, spanStatus: codes.Error, validInput: true},
{inputStatus: `2`, spanStatus: codes.Ok, validInput: true},
{inputStatus: `"Foo"`, spanStatus: codes.Unset, validInput: false},
{inputStatus: `"UNSET"`, spanStatus: codes.Unset, validInput: false},
{inputStatus: `Foo`, spanStatus: codes.Unset, validInput: false},
{inputStatus: `-1`, spanStatus: codes.Unset, validInput: false},
{inputStatus: `3`, spanStatus: codes.Unset, validInput: false},
{inputStatus: `Err`, spanStatus: codes.Unset, validInput: false},
}

for _, tt := range tests {
syncer := &mockSyncer{}

tracerProvider := sdktrace.NewTracerProvider()
sp := sdktrace.NewSimpleSpanProcessor(syncer)
tracerProvider.RegisterSpanProcessor(sp)
otel.SetTracerProvider(tracerProvider)

cfg := &Config{
Config: common.Config{
WorkerCount: 1,
},
NumTraces: 1,
StatusCode: tt.inputStatus,
}

// test the program given input, including erroneous inputs
if tt.validInput {
require.NoError(t, Run(cfg, zap.NewNop()))
// verify that the default the span status is set as expected
for _, span := range syncer.spans {
assert.Equal(t, span.Status().Code, tt.spanStatus, fmt.Sprintf("span status: %v and expected status %v", span.Status().Code, tt.spanStatus))
t.Run(fmt.Sprintf("inputStatus=%s", tt.inputStatus), func(t *testing.T) {
syncer := &mockSyncer{}

tracerProvider := sdktrace.NewTracerProvider()
sp := sdktrace.NewSimpleSpanProcessor(syncer)
tracerProvider.RegisterSpanProcessor(sp)
otel.SetTracerProvider(tracerProvider)

cfg := &Config{
Config: common.Config{
WorkerCount: 1,
},
NumTraces: 1,
StatusCode: tt.inputStatus,
}
} else {
require.Error(t, Run(cfg, zap.NewNop()))
}
}

// test the program given input, including erroneous inputs
if tt.validInput {
require.NoError(t, Run(cfg, zap.NewNop()))
// verify that the default the span status is set as expected
for _, span := range syncer.spans {
assert.Equal(t, span.Status().Code, tt.spanStatus, fmt.Sprintf("span status: %v and expected status %v", span.Status().Code, tt.spanStatus))
}
} else {
require.Error(t, Run(cfg, zap.NewNop()))
}
})
}
}

var _ sdktrace.SpanExporter = (*mockSyncer)(nil)
Expand Down