Skip to content

Commit 6dd612a

Browse files
renovate[bot]christian-stephen
renovate[bot]
and
christian-stephen
authored
[ONPREM-2858] fix(deps): update module github.com/circleci/ex to v1.0.19586-d176743 (#242)
* fix(deps): update module github.com/circleci/ex to v1.0.19586-d176743 * ./do license-attributions * Migrate runner to o11y.OtelConfig The Honeycomb config has been removed from ex --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Chris Stephen <chris.stephen@circleci.com>
1 parent 9c0dea1 commit 6dd612a

6 files changed

Lines changed: 126 additions & 174 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ By following these guidelines, we can easily determine which changes should be i
1010

1111
## Edge
1212

13+
- [#242](https://github.com/circleci/runner-init/pull/242) [INTERNAL] Bump `ex` and migrate from `o11y.Config` to `o11y.OtelConfig`.
1314
- [#235](https://github.com/circleci/runner-init/pull/235) Decrease runner API request timeout and add correlation string to requests.
1415
- [#174](https://github.com/circleci/runner-init/pull/174) Add support for a custom entrypoint override.
1516
- [#224](https://github.com/circleci/runner-init/pull/224) Record and log timings in orchestrator init function.

‎acceptance/task_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ func TestRunTask(t *testing.T) {
9090
assert.NilError(t, res.Ready("admin", time.Second*20))
9191
})
9292

93+
t.Run("Check logs", func(t *testing.T) {
94+
assert.Check(t, cmp.Contains(res.Logs(), "starting orchestrator app.date= app.version=dev"))
95+
})
96+
9397
t.Run("Custom entrypoint ran", func(t *testing.T) {
9498
assert.Check(t, cmp.Contains(res.Logs(), "Executing custom entrypoint"))
9599
})

‎cmd/setup/o11y.go‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ import (
77
)
88

99
func O11y(version string) (context.Context, func(context.Context), error) {
10-
cfg := o11y.Config{
11-
HoneycombEnabled: false,
12-
// Set `HoneycombKey` to something to suppress the "WARN: Missing API Key." log on startup.
13-
// If `HoneycombEnabled` is false, this doesn't matter. Without context,
14-
// this log can be misleading and has been confused with the runner API token.
15-
HoneycombKey: "-",
16-
Format: "text",
17-
Version: version,
18-
Service: "orchestrator",
10+
cfg := o11y.OtelConfig{
11+
Version: version,
12+
Service: "orchestrator",
1913
}
2014

21-
return o11y.Setup(context.Background(), cfg)
15+
return o11y.Otel(context.Background(), cfg)
2216
}

‎go-project-licenses.csv‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ github.com/cenkalti/backoff/v5,MIT
55
github.com/cespare/xxhash/v2,MIT
66
github.com/circleci/ex,MIT
77
github.com/circleci/runner-init,Apache-2.0
8-
github.com/facebookgo/clock,MIT
9-
github.com/facebookgo/limitgroup,BSD-3-Clause
10-
github.com/facebookgo/muster,BSD-3-Clause
118
github.com/fsnotify/fsnotify,BSD-3-Clause
129
github.com/gabriel-vasile/mimetype,MIT
1310
github.com/gin-contrib/sse,MIT
@@ -24,14 +21,6 @@ github.com/google/uuid,BSD-3-Clause
2421
github.com/grpc-ecosystem/grpc-gateway/v2,BSD-3-Clause
2522
github.com/hashicorp/go-reap,MPL-2.0
2623
github.com/hellofresh/health-go/v5,Apache-2.0
27-
github.com/honeycombio/beeline-go,Apache-2.0
28-
github.com/honeycombio/dynsampler-go,Apache-2.0
29-
github.com/honeycombio/libhoney-go,Apache-2.0
30-
github.com/klauspost/compress,MIT
31-
github.com/klauspost/compress,Apache-2.0
32-
github.com/klauspost/compress,BSD-3-Clause
33-
github.com/klauspost/compress/internal/snapref,BSD-3-Clause
34-
github.com/klauspost/compress/zstd/internal/xxhash,MIT
3524
github.com/leodido/go-urn,MIT
3625
github.com/mattn/go-isatty,MIT
3726
github.com/pelletier/go-toml/v2,MIT
@@ -40,8 +29,6 @@ github.com/quic-go/quic-go,MIT
4029
github.com/rollbar/rollbar-go,MIT
4130
github.com/ugorji/go/codec,MIT
4231
github.com/vmihailenco/go-tinylfu,MIT
43-
github.com/vmihailenco/msgpack/v5,BSD-2-Clause
44-
github.com/vmihailenco/tagparser/v2,BSD-2-Clause
4532
go.opentelemetry.io/auto/sdk,Apache-2.0
4633
go.opentelemetry.io/otel,Apache-2.0
4734
go.opentelemetry.io/otel,BSD-3-Clause
@@ -67,4 +54,3 @@ google.golang.org/genproto/googleapis/api/httpbody,Apache-2.0
6754
google.golang.org/genproto/googleapis/rpc,Apache-2.0
6855
google.golang.org/grpc,Apache-2.0
6956
google.golang.org/protobuf,BSD-3-Clause
70-
gopkg.in/alexcesaro/statsd.v2,MIT

‎go.mod‎

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ require (
6565
github.com/Azure/go-autorest/tracing v0.6.1 // indirect
6666
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
6767
github.com/BurntSushi/toml v1.5.0 // indirect
68+
github.com/DataDog/zstd v1.5.7 // indirect
6869
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
6970
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
7071
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
@@ -103,28 +104,28 @@ require (
103104
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
104105
github.com/atc0005/go-teams-notify/v2 v2.13.0 // indirect
105106
github.com/aws/aws-sdk-go v1.55.8 // indirect
106-
github.com/aws/aws-sdk-go-v2 v1.40.0 // indirect
107-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
108-
github.com/aws/aws-sdk-go-v2/config v1.32.2 // indirect
109-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2 // indirect
110-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
111-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.12 // indirect
112-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
113-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
107+
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
108+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
109+
github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
110+
github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
111+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
112+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.17 // indirect
113+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
114+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
114115
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
115-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
116+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
116117
github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2 // indirect
117118
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.2 // indirect
118-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
119-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
120-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
121-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
119+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
120+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
121+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
122+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
122123
github.com/aws/aws-sdk-go-v2/service/kms v1.49.1 // indirect
123-
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1 // indirect
124-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
125-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
126-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
127-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
124+
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0 // indirect
125+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
126+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
127+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
128+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
128129
github.com/aws/smithy-go v1.24.0 // indirect
129130
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.11.0 // indirect
130131
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
@@ -466,8 +467,8 @@ require (
466467
github.com/quasilyte/gogrep v0.5.0 // indirect
467468
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
468469
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
469-
github.com/quic-go/qpack v0.5.1 // indirect
470-
github.com/quic-go/quic-go v0.54.1 // indirect
470+
github.com/quic-go/qpack v0.6.0 // indirect
471+
github.com/quic-go/quic-go v0.57.0 // indirect
471472
github.com/raeperd/recvcheck v0.2.0 // indirect
472473
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
473474
github.com/rivo/uniseg v0.4.7 // indirect
@@ -577,23 +578,22 @@ require (
577578
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
578579
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
579580
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
580-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
581-
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
581+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
582+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
582583
go.uber.org/atomic v1.11.0 // indirect
583584
go.uber.org/automaxprocs v1.6.0 // indirect
584-
go.uber.org/mock v0.6.0 // indirect
585585
go.uber.org/multierr v1.11.0 // indirect
586586
go.uber.org/zap v1.27.1 // indirect
587587
go.yaml.in/yaml/v2 v2.4.3 // indirect
588588
go.yaml.in/yaml/v3 v3.0.4 // indirect
589589
gocloud.dev v0.41.0 // indirect
590590
golang.org/x/arch v0.20.0 // indirect
591-
golang.org/x/crypto v0.45.0 // indirect
591+
golang.org/x/crypto v0.46.0 // indirect
592592
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
593593
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
594594
golang.org/x/mod v0.30.0 // indirect
595595
golang.org/x/oauth2 v0.33.0 // indirect
596-
golang.org/x/term v0.37.0 // indirect
596+
golang.org/x/term v0.38.0 // indirect
597597
golang.org/x/time v0.14.0 // indirect
598598
golang.org/x/tools v0.39.0 // indirect
599599
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
@@ -630,36 +630,27 @@ require (
630630
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
631631
github.com/Microsoft/go-winio v0.6.2 // indirect
632632
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
633-
github.com/circleci/ex v1.0.18572-c9dd937
634-
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
635-
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
636-
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
633+
github.com/circleci/ex v1.0.19586-d176743
637634
github.com/go-logr/logr v1.4.3 // indirect
638635
github.com/go-logr/stdr v1.2.2 // indirect
639636
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
640-
github.com/honeycombio/beeline-go v1.19.0 // indirect
641-
github.com/honeycombio/dynsampler-go v0.6.3 // indirect
642-
github.com/honeycombio/libhoney-go v1.26.0 // indirect
643637
github.com/klauspost/compress v1.18.1 // indirect
644638
github.com/rollbar/rollbar-go v1.4.8 // indirect
645-
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
646-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
647-
go.opentelemetry.io/otel v1.38.0 // indirect
648-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
649-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
650-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
651-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
652-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
639+
go.opentelemetry.io/otel v1.39.0 // indirect
640+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
641+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
642+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
643+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
644+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
653645
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
654-
golang.org/x/net v0.47.0 // indirect
655-
golang.org/x/sync v0.18.0 // indirect
656-
golang.org/x/sys v0.38.0
657-
golang.org/x/text v0.31.0 // indirect
658-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
659-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
646+
golang.org/x/net v0.48.0 // indirect
647+
golang.org/x/sync v0.19.0 // indirect
648+
golang.org/x/sys v0.39.0
649+
golang.org/x/text v0.32.0 // indirect
650+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
651+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
660652
google.golang.org/grpc v1.77.0 // indirect
661-
google.golang.org/protobuf v1.36.10 // indirect
662-
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
653+
google.golang.org/protobuf v1.36.11 // indirect
663654
)
664655

665656
tool (

0 commit comments

Comments
 (0)