Skip to content

Commit 890cbb3

Browse files
SimKev2SimKev2
authored
Update to grafana/sobek and fix ambiguous imports (#33)
* Update to grafana/sobek and fix ambiguous imports Remove jaeger exporter * Bump gloang ci lint * Update golangci-lint config and ignore list * Ignore both errors * Lower required go version * Change log level * Update Dockerfile to match new go requirements
1 parent 95dd25e commit 890cbb3

File tree

6 files changed

+319
-976
lines changed

6 files changed

+319
-976
lines changed

‎.github/workflows/lint-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
cache: true
1717

1818
- name: Lint
19-
uses: golangci/golangci-lint-action@v3
19+
uses: golangci/golangci-lint-action@v6.5.0
2020
with:
21-
version: v1.59.0
21+
version: v1.64.6
2222
args: --config ./golangci.yml
2323

2424
- name: Test

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine AS xk6-client-tracing-build
1+
FROM golang:1.24-alpine AS xk6-client-tracing-build
22

33
RUN apk add --no-cache \
44
build-base \
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
77
make
88

99
RUN go install go.k6.io/xk6/cmd/xk6@latest \
10-
&& wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.0 \
10+
&& wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.6 \
1111
&& golangci-lint --version
1212

1313
WORKDIR /opt/xk6-client-tracing

‎go.mod

+81-85
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,103 @@
11
module github.com/grafana/xk6-client-tracing
22

3-
go 1.21
3+
go 1.23.0
4+
5+
toolchain go1.24.0
46

57
require (
6-
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
7-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.85.0
8+
github.com/grafana/sobek v0.0.0-20250219104821-ed22af7a8d6c
89
github.com/pkg/errors v0.9.1
9-
github.com/stretchr/testify v1.8.4
10-
go.k6.io/k6 v0.48.0
11-
go.opentelemetry.io/collector/component v0.90.1
12-
go.opentelemetry.io/collector/config/configgrpc v0.90.1
13-
go.opentelemetry.io/collector/config/confighttp v0.90.1
14-
go.opentelemetry.io/collector/config/configopaque v0.90.0
15-
go.opentelemetry.io/collector/config/configtls v0.90.1
16-
go.opentelemetry.io/collector/exporter v0.90.0
17-
go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1
18-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1
19-
go.opentelemetry.io/collector/pdata v1.0.0
20-
go.opentelemetry.io/otel/metric v1.21.0
21-
go.opentelemetry.io/otel/trace v1.21.0
22-
go.uber.org/zap v1.26.0
10+
github.com/stretchr/testify v1.10.0
11+
go.k6.io/k6 v0.57.0
12+
go.opentelemetry.io/collector/component v0.120.0
13+
go.opentelemetry.io/collector/component/componenttest v0.120.0
14+
go.opentelemetry.io/collector/config/configgrpc v0.120.0
15+
go.opentelemetry.io/collector/config/confighttp v0.120.0
16+
go.opentelemetry.io/collector/config/configopaque v1.26.0
17+
go.opentelemetry.io/collector/config/configtls v1.26.0
18+
go.opentelemetry.io/collector/exporter v0.120.0
19+
go.opentelemetry.io/collector/exporter/otlpexporter v0.120.0
20+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.0
21+
go.opentelemetry.io/collector/pdata v1.26.0
22+
go.opentelemetry.io/otel/metric v1.34.0
23+
go.opentelemetry.io/otel/trace v1.34.0
24+
go.uber.org/zap v1.27.0
2325
)
2426

2527
require (
26-
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
27-
github.com/apache/thrift v0.19.0 // indirect
28-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
29-
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/dlclark/regexp2 v1.9.0 // indirect
31-
github.com/fatih/color v1.15.0 // indirect
28+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30+
github.com/dlclark/regexp2 v1.11.5 // indirect
31+
github.com/evanw/esbuild v0.25.0 // indirect
32+
github.com/fatih/color v1.18.0 // indirect
3233
github.com/felixge/httpsnoop v1.0.4 // indirect
33-
github.com/fsnotify/fsnotify v1.7.0 // indirect
34-
github.com/go-logr/logr v1.3.0 // indirect
34+
github.com/fsnotify/fsnotify v1.8.0 // indirect
35+
github.com/go-logr/logr v1.4.2 // indirect
3536
github.com/go-logr/stdr v1.2.2 // indirect
36-
github.com/go-sourcemap/sourcemap v2.1.4-0.20211119122758-180fcef48034+incompatible // indirect
37-
github.com/gogo/googleapis v1.4.1 // indirect
37+
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
3838
github.com/gogo/protobuf v1.3.2 // indirect
39-
github.com/golang/protobuf v1.5.3 // indirect
4039
github.com/golang/snappy v0.0.4 // indirect
41-
github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 // indirect
42-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
43-
github.com/hashicorp/go-version v1.6.0 // indirect
44-
github.com/jaegertracing/jaeger v1.41.0 // indirect
40+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
41+
github.com/google/uuid v1.6.0 // indirect
42+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
43+
github.com/hashicorp/go-version v1.7.0 // indirect
4544
github.com/josharian/intern v1.0.0 // indirect
4645
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/klauspost/compress v1.17.3 // indirect
48-
github.com/knadh/koanf v1.5.0 // indirect
49-
github.com/knadh/koanf/v2 v2.0.1 // indirect
50-
github.com/mailru/easyjson v0.7.7 // indirect
51-
github.com/mattn/go-colorable v0.1.13 // indirect
52-
github.com/mattn/go-isatty v0.0.19 // indirect
53-
github.com/mitchellh/copystructure v1.2.0 // indirect
54-
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
55-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
46+
github.com/klauspost/compress v1.18.0 // indirect
47+
github.com/mailru/easyjson v0.9.0 // indirect
48+
github.com/mattn/go-colorable v0.1.14 // indirect
49+
github.com/mattn/go-isatty v0.0.20 // indirect
5650
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5751
github.com/modern-go/reflect2 v1.0.2 // indirect
58-
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
52+
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
5953
github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd // indirect
60-
github.com/nxadm/tail v1.4.8 // indirect
61-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 // indirect
62-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.85.0 // indirect
63-
github.com/opentracing/opentracing-go v1.2.0 // indirect
64-
github.com/pmezard/go-difflib v1.0.0 // indirect
65-
github.com/rs/cors v1.10.1 // indirect
54+
github.com/onsi/ginkgo v1.16.5 // indirect
55+
github.com/onsi/gomega v1.33.0 // indirect
56+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
57+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
58+
github.com/rs/cors v1.11.1 // indirect
6659
github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e // indirect
6760
github.com/sirupsen/logrus v1.9.3 // indirect
68-
github.com/spf13/afero v1.9.2 // indirect
69-
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
70-
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
71-
go.opencensus.io v0.24.0 // indirect
72-
go.opentelemetry.io/collector v0.90.0 // indirect
73-
go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect
74-
go.opentelemetry.io/collector/config/configcompression v0.90.0 // indirect
75-
go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect
76-
go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect
77-
go.opentelemetry.io/collector/config/internal v0.90.0 // indirect
78-
go.opentelemetry.io/collector/confmap v0.90.0 // indirect
79-
go.opentelemetry.io/collector/consumer v0.90.0 // indirect
80-
go.opentelemetry.io/collector/extension v0.90.0 // indirect
81-
go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect
82-
go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
83-
go.opentelemetry.io/collector/semconv v0.85.0 // indirect
84-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
85-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
86-
go.opentelemetry.io/otel v1.21.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
88-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
89-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
90-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
91-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
92-
go.uber.org/atomic v1.10.0 // indirect
61+
github.com/spf13/afero v1.12.0 // indirect
62+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
63+
go.opentelemetry.io/collector v0.120.0 // indirect
64+
go.opentelemetry.io/collector/client v1.26.0 // indirect
65+
go.opentelemetry.io/collector/config/configauth v0.120.0 // indirect
66+
go.opentelemetry.io/collector/config/configcompression v1.26.0 // indirect
67+
go.opentelemetry.io/collector/config/confignet v1.26.0 // indirect
68+
go.opentelemetry.io/collector/config/configretry v1.26.0 // indirect
69+
go.opentelemetry.io/collector/consumer v1.26.0 // indirect
70+
go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect
71+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.120.0 // indirect
72+
go.opentelemetry.io/collector/consumer/xconsumer v0.120.0 // indirect
73+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.120.0 // indirect
74+
go.opentelemetry.io/collector/exporter/xexporter v0.120.0 // indirect
75+
go.opentelemetry.io/collector/extension v0.120.0 // indirect
76+
go.opentelemetry.io/collector/extension/auth v0.120.0 // indirect
77+
go.opentelemetry.io/collector/extension/xextension v0.120.0 // indirect
78+
go.opentelemetry.io/collector/featuregate v1.26.0 // indirect
79+
go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
80+
go.opentelemetry.io/collector/pipeline v0.120.0 // indirect
81+
go.opentelemetry.io/collector/pipeline/xpipeline v0.120.0 // indirect
82+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
84+
go.opentelemetry.io/otel v1.34.0 // indirect
85+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
86+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
88+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
89+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
90+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
9391
go.uber.org/multierr v1.11.0 // indirect
94-
golang.org/x/net v0.18.0 // indirect
95-
golang.org/x/oauth2 v0.13.0 // indirect
96-
golang.org/x/sys v0.14.0 // indirect
97-
golang.org/x/text v0.14.0 // indirect
98-
golang.org/x/time v0.3.0 // indirect
99-
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
101-
google.golang.org/grpc v1.59.0 // indirect
102-
google.golang.org/protobuf v1.31.0 // indirect
103-
gopkg.in/guregu/null.v3 v3.3.0 // indirect
92+
golang.org/x/crypto v0.35.0 // indirect
93+
golang.org/x/net v0.35.0 // indirect
94+
golang.org/x/sys v0.30.0 // indirect
95+
golang.org/x/text v0.22.0 // indirect
96+
golang.org/x/time v0.10.0 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
99+
google.golang.org/grpc v1.70.0 // indirect
100+
google.golang.org/protobuf v1.36.5 // indirect
101+
gopkg.in/guregu/null.v3 v3.5.0 // indirect
104102
gopkg.in/yaml.v3 v3.0.1 // indirect
105103
)
106-
107-
replace cloud.google.com/go/compute/metadata => cloud.google.com/go/compute/metadata v0.2.3

0 commit comments

Comments
 (0)