Skip to content

Commit 24e7413

Browse files
committed
Remove dependency github.com/pkg/errors
1 parent 10865a5 commit 24e7413

4 files changed

Lines changed: 12 additions & 15 deletions

File tree

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ toolchain go1.24.0
66

77
require (
88
github.com/grafana/sobek v0.0.0-20250219104821-ed22af7a8d6c
9-
github.com/pkg/errors v0.9.1
109
github.com/stretchr/testify v1.10.0
1110
go.k6.io/k6 v0.57.0
1211
go.opentelemetry.io/collector/component v0.120.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
117117
github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
118118
github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
119119
github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
120-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
121-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
122120
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
123121
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
124122
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

pkg/tracegen/templated.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tracegen
22

33
import (
4+
"errors"
45
"fmt"
56
"net/http"
67
"net/url"
@@ -10,7 +11,6 @@ import (
1011

1112
"github.com/grafana/xk6-client-tracing/pkg/random"
1213
"github.com/grafana/xk6-client-tracing/pkg/util"
13-
"github.com/pkg/errors"
1414
"go.opentelemetry.io/collector/pdata/pcommon"
1515
"go.opentelemetry.io/collector/pdata/ptrace"
1616
)
@@ -134,7 +134,7 @@ func NewTemplatedGenerator(template *TraceTemplate) (*TemplatedGenerator, error)
134134
gen := &TemplatedGenerator{}
135135
err := gen.initialize(template)
136136
if err != nil {
137-
return nil, errors.Wrap(err, "fail to create new templated generator")
137+
return nil, fmt.Errorf("fail to create new templated generator: %w", err)
138138
}
139139
return gen, nil
140140
}
@@ -559,7 +559,7 @@ func initializeSpanKind(parent *internalSpanTemplate, tmpl, child *SpanTemplate)
559559
if k, found := tmpl.Attributes["span.kind"]; found {
560560
kindStr, ok := k.(string)
561561
if !ok {
562-
return ptrace.SpanKindUnspecified, errors.Errorf("attribute %s expected to be a string, but was %T", "span.kind", k)
562+
return ptrace.SpanKindUnspecified, fmt.Errorf("attribute span.kind expected to be a string, but was %T", k)
563563
}
564564
kind = spanKindFromString(kindStr)
565565
} else {

tracing.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package clienttracing
33
import (
44
"context"
55
"encoding/base64"
6+
"fmt"
67
"os"
78
"sync"
89

910
"github.com/grafana/sobek"
10-
"github.com/pkg/errors"
1111
"go.k6.io/k6/js/common"
1212
"go.k6.io/k6/js/modules"
1313
"go.opentelemetry.io/collector/component"
@@ -85,13 +85,13 @@ func (ct *TracingModule) newClient(g sobek.ConstructorCall, rt *sobek.Runtime) *
8585
var cfg ClientConfig
8686
err := rt.ExportTo(g.Argument(0), &cfg)
8787
if err != nil {
88-
common.Throw(rt, errors.Wrap(err, "unable to create client: constructor expects first argument to be ClientConfig"))
88+
common.Throw(rt, fmt.Errorf("unable to create client: constructor expects first argument to be ClientConfig: %w", err))
8989
}
9090

9191
if ct.client == nil {
9292
ct.client, err = NewClient(&cfg, ct.vu)
9393
if err != nil {
94-
common.Throw(rt, errors.Wrap(err, "unable to create client"))
94+
common.Throw(rt, fmt.Errorf("unable to create client: %w", err))
9595
}
9696
}
9797

@@ -107,7 +107,7 @@ func (ct *TracingModule) newParameterizedGenerator(g sobek.ConstructorCall, rt *
107107
var param []*tracegen.TraceParams
108108
err := rt.ExportTo(paramVal, &param)
109109
if err != nil {
110-
common.Throw(rt, errors.Wrap(err, "the ParameterizedGenerator constructor expects first argument to be []TraceParams"))
110+
common.Throw(rt, fmt.Errorf("the ParameterizedGenerator constructor expects first argument to be []TraceParams: %w", err))
111111
}
112112

113113
generator = tracegen.NewParameterizedGenerator(param)
@@ -126,12 +126,12 @@ func (ct *TracingModule) newTemplatedGenerator(g sobek.ConstructorCall, rt *sobe
126126
var tmpl tracegen.TraceTemplate
127127
err := rt.ExportTo(tmplVal, &tmpl)
128128
if err != nil {
129-
common.Throw(rt, errors.Wrap(err, "the TemplatedGenerator constructor expects first argument to be TraceTemplate"))
129+
common.Throw(rt, fmt.Errorf("the TemplatedGenerator constructor expects first argument to be TraceTemplate: %w", err))
130130
}
131131

132132
generator, err = tracegen.NewTemplatedGenerator(&tmpl)
133133
if err != nil {
134-
common.Throw(rt, errors.Wrap(err, "unable to generate TemplatedGenerator"))
134+
common.Throw(rt, fmt.Errorf("unable to generate TemplatedGenerator: %w", err))
135135
}
136136

137137
ct.templatedGenerators[tmplObj] = generator
@@ -208,7 +208,7 @@ func NewClient(cfg *ClientConfig, vu modules.VU) (*Client, error) {
208208
}, cfg.Headers),
209209
}
210210
default:
211-
return nil, errors.Errorf("failed to init exporter: unknown exporter type %s", cfg.Exporter)
211+
return nil, fmt.Errorf("failed to init exporter: unknown exporter type %s", cfg.Exporter)
212212
}
213213

214214
exporter, err := factory.CreateTraces(
@@ -224,12 +224,12 @@ func NewClient(cfg *ClientConfig, vu modules.VU) (*Client, error) {
224224
exporterCfg,
225225
)
226226
if err != nil {
227-
return nil, errors.Wrap(err, "failed create exporter")
227+
return nil, fmt.Errorf("failed create exporter: %w", err)
228228
}
229229

230230
err = exporter.Start(vu.Context(), componenttest.NewNopHost())
231231
if err != nil {
232-
return nil, errors.Wrap(err, "failed to start exporter")
232+
return nil, fmt.Errorf("failed to start exporter: %w", err)
233233
}
234234

235235
return &Client{

0 commit comments

Comments
 (0)