Skip to content

Commit 7db6a8f

Browse files
test(slo): make jobName unique for every workload
1 parent a7dd934 commit 7db6a8f

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

.github/workflows/slo.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ jobs:
4747
workload_path0: 'tests/slo'
4848
language0: 'Go SDK'
4949
workload_build_context0: ../..
50-
workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native
50+
workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native --build-arg JOB_NAME=workload-native
5151

5252
language_id1: 'databasesql'
5353
workload_path1: 'tests/slo'
5454
language1: 'Go SDK'
5555
workload_build_context1: ../..
56-
workload_build_options1: -f Dockerfile --build-arg SRC_PATH=database/sql
56+
workload_build_options1: -f Dockerfile --build-arg SRC_PATH=database/sql --build-arg JOB_NAME=workload-databasesql
5757

5858
language_id2: 'gorm'
5959
workload_path2: 'tests/slo'
6060
language2: 'Go SDK'
6161
workload_build_context2: ../..
62-
workload_build_options2: -f Dockerfile --build-arg SRC_PATH=gorm
62+
workload_build_options2: -f Dockerfile --build-arg SRC_PATH=gorm --build-arg JOB_NAME=workload-gorm

tests/slo/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
FROM golang:1.20 as build
22
ARG SRC_PATH
3+
ARG JOB_NAME
34
COPY . /src
45
WORKDIR /src/tests/slo/${SRC_PATH}
5-
RUN CGO_ENABLED=0 go build -o /build/slo-go-workload -ldflags "-X \"main.label=${SRC_PATH}\"" .
6+
RUN CGO_ENABLED=0 go build -o /build/slo-go-workload -ldflags "-X \"main.label=${SRC_PATH}\" -X \"main.jobName=${JOB_NAME}\"" .
67

78
FROM scratch
89
COPY --from=build /build /

tests/slo/database/sql/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

tests/slo/gorm/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

tests/slo/internal/metrics/metrics.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
)
1212

1313
const (
14-
jobName = "workload-go"
1514
sdk = "go"
1615
sdkVersion = ydb.Version
1716
)
@@ -32,7 +31,7 @@ type (
3231
}
3332
)
3433

35-
func New(logger *zap.Logger, url, label string) (*Metrics, error) {
34+
func New(logger *zap.Logger, url, label, jobName string) (*Metrics, error) {
3635
m := &Metrics{
3736
logger: logger.Named("metrics"),
3837

tests/slo/internal/workers/workers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ type Workers struct {
2222
logger *zap.Logger
2323
}
2424

25-
func New(cfg *config.Config, s ReadWriter, logger *zap.Logger, label string) (*Workers, error) {
25+
func New(cfg *config.Config, s ReadWriter, logger *zap.Logger, label, jobName string) (*Workers, error) {
2626
logger = logger.Named("workers")
2727

28-
m, err := metrics.New(logger, cfg.PushGateway, label)
28+
m, err := metrics.New(logger, cfg.PushGateway, label, jobName)
2929
if err != nil {
3030
logger.Error("create metrics failed", zap.Error(err))
3131
return nil, err

tests/slo/native/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

0 commit comments

Comments
 (0)