Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ By following these guidelines, we can easily determine which changes should be i

## Edge

- [#242](https://github.com/circleci/runner-init/pull/242) [INTERNAL] Bump `ex` and migrate from `o11y.Config` to `o11y.OtelConfig`.
- [#235](https://github.com/circleci/runner-init/pull/235) Decrease runner API request timeout and add correlation string to requests.
- [#174](https://github.com/circleci/runner-init/pull/174) Add support for a custom entrypoint override.
- [#224](https://github.com/circleci/runner-init/pull/224) Record and log timings in orchestrator init function.
Expand Down
4 changes: 4 additions & 0 deletions acceptance/task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ func TestRunTask(t *testing.T) {
assert.NilError(t, res.Ready("admin", time.Second*20))
})

t.Run("Check logs", func(t *testing.T) {
assert.Check(t, cmp.Contains(res.Logs(), "starting orchestrator app.date= app.version=dev"))
})

t.Run("Custom entrypoint ran", func(t *testing.T) {
assert.Check(t, cmp.Contains(res.Logs(), "Executing custom entrypoint"))
})
Expand Down
14 changes: 4 additions & 10 deletions cmd/setup/o11y.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@ import (
)

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

return o11y.Setup(context.Background(), cfg)
return o11y.Otel(context.Background(), cfg)
}
14 changes: 0 additions & 14 deletions go-project-licenses.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ github.com/cenkalti/backoff/v5,MIT
github.com/cespare/xxhash/v2,MIT
github.com/circleci/ex,MIT
github.com/circleci/runner-init,Apache-2.0
github.com/facebookgo/clock,MIT
github.com/facebookgo/limitgroup,BSD-3-Clause
github.com/facebookgo/muster,BSD-3-Clause
github.com/fsnotify/fsnotify,BSD-3-Clause
github.com/gabriel-vasile/mimetype,MIT
github.com/gin-contrib/sse,MIT
Expand All @@ -24,14 +21,6 @@ github.com/google/uuid,BSD-3-Clause
github.com/grpc-ecosystem/grpc-gateway/v2,BSD-3-Clause
github.com/hashicorp/go-reap,MPL-2.0
github.com/hellofresh/health-go/v5,Apache-2.0
github.com/honeycombio/beeline-go,Apache-2.0
github.com/honeycombio/dynsampler-go,Apache-2.0
github.com/honeycombio/libhoney-go,Apache-2.0
github.com/klauspost/compress,MIT
github.com/klauspost/compress,Apache-2.0
github.com/klauspost/compress,BSD-3-Clause
github.com/klauspost/compress/internal/snapref,BSD-3-Clause
github.com/klauspost/compress/zstd/internal/xxhash,MIT
github.com/leodido/go-urn,MIT
github.com/mattn/go-isatty,MIT
github.com/pelletier/go-toml/v2,MIT
Expand All @@ -40,8 +29,6 @@ github.com/quic-go/quic-go,MIT
github.com/rollbar/rollbar-go,MIT
github.com/ugorji/go/codec,MIT
github.com/vmihailenco/go-tinylfu,MIT
github.com/vmihailenco/msgpack/v5,BSD-2-Clause
github.com/vmihailenco/tagparser/v2,BSD-2-Clause
go.opentelemetry.io/auto/sdk,Apache-2.0
go.opentelemetry.io/otel,Apache-2.0
go.opentelemetry.io/otel,BSD-3-Clause
Expand All @@ -67,4 +54,3 @@ google.golang.org/genproto/googleapis/api/httpbody,Apache-2.0
google.golang.org/genproto/googleapis/rpc,Apache-2.0
google.golang.org/grpc,Apache-2.0
google.golang.org/protobuf,BSD-3-Clause
gopkg.in/alexcesaro/statsd.v2,MIT
87 changes: 39 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
github.com/BurntSushi/toml v1.5.0 // indirect
github.com/DataDog/zstd v1.5.7 // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
Expand Down Expand Up @@ -103,28 +104,28 @@ require (
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
github.com/atc0005/go-teams-notify/v2 v2.13.0 // indirect
github.com/aws/aws-sdk-go v1.55.8 // indirect
github.com/aws/aws-sdk-go-v2 v1.40.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.2 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.12 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.49.1 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
github.com/aws/smithy-go v1.24.0 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.11.0 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
Expand Down Expand Up @@ -466,8 +467,8 @@ require (
github.com/quasilyte/gogrep v0.5.0 // indirect
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
github.com/quic-go/qpack v0.5.1 // indirect
github.com/quic-go/quic-go v0.54.1 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
github.com/quic-go/quic-go v0.57.0 // indirect
github.com/raeperd/recvcheck v0.2.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand Down Expand Up @@ -577,23 +578,22 @@ require (
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/mock v0.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
gocloud.dev v0.41.0 // indirect
golang.org/x/arch v0.20.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/oauth2 v0.33.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/term v0.38.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.39.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
Expand Down Expand Up @@ -630,36 +630,27 @@ require (
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/circleci/ex v1.0.18572-c9dd937
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
github.com/circleci/ex v1.0.19586-d176743
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
github.com/honeycombio/beeline-go v1.19.0 // indirect
github.com/honeycombio/dynsampler-go v0.6.3 // indirect
github.com/honeycombio/libhoney-go v1.26.0 // indirect
github.com/klauspost/compress v1.18.1 // indirect
github.com/rollbar/rollbar-go v1.4.8 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.opentelemetry.io/otel v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
go.opentelemetry.io/otel/metric v1.38.0 // indirect
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0
golang.org/x/text v0.31.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0
golang.org/x/text v0.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/grpc v1.77.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
)

tool (
Expand Down
Loading