Skip to content

refactor(test): consolidate split test methods #226

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

Merged
retr0h merged 1 commit into from
Mar 6, 2026
Merged

refactor(test): consolidate split test methods #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 0 additions & 76 deletions docs/docs/sidebar/development/tasks/backlog/2026-02-15-feat-facts-gathering.md
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions docs/docs/sidebar/development/tasks/backlog/2026-02-24-sdk-response-types.md
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions ...idebar/development/tasks/backlog/2026-02-25-feat-declarative-playbook-engine.md
View file
Open in desktop

This file was deleted.

116 changes: 57 additions & 59 deletions internal/telemetry/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ package telemetry
import (
"context"
"errors"
"net/http"
"testing"

"github.com/stretchr/testify/suite"
Expand All @@ -35,62 +36,68 @@ type InitMeterTestSuite struct {
suite.Suite
}

func (s *InitMeterTestSuite) TestInitMeterDefaultPath() {
func (s *InitMeterTestSuite) TestInitMeter() {
tests := []struct {
name string
name string
cfg config.MetricsConfig
setupFn func()
cleanupFn func()
validateFunc func(http.Handler, string, func(context.Context) error, error)
}{
{
name: "when path is empty uses default /metrics",
cfg: config.MetricsConfig{},
validateFunc: func(
handler http.Handler,
path string,
shutdown func(context.Context) error,
err error,
) {
s.NoError(err)
s.NotNil(handler)
s.Equal(DefaultMetricsPath, path)
s.NotNil(shutdown)
s.NoError(shutdown(context.Background()))
},
},
}

for _, tc := range tests {
s.Run(tc.name, func() {
cfg := config.MetricsConfig{}

handler, path, shutdown, err := InitMeter(cfg)

s.NoError(err)
s.NotNil(handler)
s.Equal(DefaultMetricsPath, path)
s.NotNil(shutdown)
s.NoError(shutdown(context.Background()))
})
}
}

func (s *InitMeterTestSuite) TestInitMeterCustomPath() {
tests := []struct {
name string
}{
{
name: "when path is configured uses custom path",
cfg: config.MetricsConfig{Path: "/custom/metrics"},
validateFunc: func(
handler http.Handler,
path string,
shutdown func(context.Context) error,
err error,
) {
s.NoError(err)
s.NotNil(handler)
s.Equal("/custom/metrics", path)
s.NotNil(shutdown)
s.NoError(shutdown(context.Background()))
},
},
}

for _, tc := range tests {
s.Run(tc.name, func() {
cfg := config.MetricsConfig{
Path: "/custom/metrics",
}

handler, path, shutdown, err := InitMeter(cfg)

s.NoError(err)
s.NotNil(handler)
s.Equal("/custom/metrics", path)
s.NotNil(shutdown)
s.NoError(shutdown(context.Background()))
})
}
}

func (s *InitMeterTestSuite) TestInitMeterExporterError() {
tests := []struct {
name string
}{
{
name: "when prometheus exporter creation fails returns error",
cfg: config.MetricsConfig{},
setupFn: func() {
prometheusNewFn = func(
_ ...prometheus.Option,
) (*prometheus.Exporter, error) {
return nil, errors.New("prometheus exporter failed")
}
},
validateFunc: func(
handler http.Handler,
path string,
shutdown func(context.Context) error,
err error,
) {
s.Error(err)
s.Nil(handler)
s.Empty(path)
s.Nil(shutdown)
s.Contains(err.Error(), "creating prometheus exporter")
},
},
}

Expand All @@ -99,21 +106,12 @@ func (s *InitMeterTestSuite) TestInitMeterExporterError() {
original := prometheusNewFn
defer func() { prometheusNewFn = original }()

prometheusNewFn = func(
_ ...prometheus.Option,
) (*prometheus.Exporter, error) {
return nil, errors.New("prometheus exporter failed")
if tc.setupFn != nil {
tc.setupFn()
}

cfg := config.MetricsConfig{}

handler, path, shutdown, err := InitMeter(cfg)

s.Error(err)
s.Nil(handler)
s.Empty(path)
s.Nil(shutdown)
s.Contains(err.Error(), "creating prometheus exporter")
handler, path, shutdown, err := InitMeter(tc.cfg)
tc.validateFunc(handler, path, shutdown, err)
})
}
}
Expand Down
31 changes: 16 additions & 15 deletions internal/telemetry/slog_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,22 @@ func (s *SlogPublicTestSuite) TestNewTraceHandler() {
s.NotContains(output, "span_id=")
},
},
{
name: "when active span preserves exact trace ID",
setupCtx: func() context.Context {
ctx, _ := otel.Tracer("test").Start(s.ctx, "test-span")

return ctx
},
validateFunc: func(output string) {
ctx, span := otel.Tracer("test").Start(s.ctx, "verify-span")
defer span.End()

expectedTraceID := trace.SpanContextFromContext(ctx).TraceID().String()
s.NotEmpty(expectedTraceID)
s.Contains(output, "trace_id=")
},
},
}

for _, tc := range tests {
Expand Down Expand Up @@ -129,21 +145,6 @@ func (s *SlogPublicTestSuite) TestTraceHandlerEnabled() {
s.True(handler.Enabled(s.ctx, slog.LevelWarn))
}

func (s *SlogPublicTestSuite) TestTraceHandlerPreservesTraceID() {
var buf bytes.Buffer
inner := slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelDebug})
handler := telemetry.NewTraceHandler(inner)
logger := slog.New(handler)

ctx, span := otel.Tracer("test").Start(s.ctx, "test-span")
defer span.End()

expectedTraceID := trace.SpanContextFromContext(ctx).TraceID().String()
logger.InfoContext(ctx, "check trace id")

s.Contains(buf.String(), expectedTraceID)
}

func TestSlogPublicTestSuite(t *testing.T) {
suite.Run(t, new(SlogPublicTestSuite))
}
Loading