Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pin prometheus and bump other dependencies #494

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Pin prometheus and bump other dependencies #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa08a03
Pin prometheus and bump other dependencies
mkocher Apr 15, 2024
5f89478
Add check for bundler in spec-test script
mkocher Apr 15, 2024
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
8 changes: 8 additions & 0 deletions scripts/subtests/spec-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ set -o pipefail

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

set +e
bundler_executable=$(which bundle)
set -e
if [ -z "${bundler_executable}" ] || [ ! -x "${bundler_executable}" ]; then
gem install bundler
fi

pushd "${SCRIPT_DIR}/../.." > /dev/null
bundle install
bundle exec rspec
popd > /dev/null

39 changes: 21 additions & 18 deletions src/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ module code.cloudfoundry.org/log-cache

go 1.21.0

toolchain go1.21.9

require (
code.cloudfoundry.org/go-batching v0.0.0-20240220234425-8ed16c9cf36e
code.cloudfoundry.org/go-diodes v0.0.0-20240220215648-1478b399ee36
code.cloudfoundry.org/go-batching v0.0.0-20240325232529-c21ea48767e2
code.cloudfoundry.org/go-diodes v0.0.0-20240325171903-fa19631aa7ba
code.cloudfoundry.org/go-envstruct v1.7.0
code.cloudfoundry.org/go-log-cache/v2 v2.0.7
code.cloudfoundry.org/go-loggregator/v9 v9.2.0
code.cloudfoundry.org/go-metric-registry v0.0.0-20240220234528-807ab4354e38
code.cloudfoundry.org/tlsconfig v0.0.0-20240301143844-95036809ae27
code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4
code.cloudfoundry.org/tlsconfig v0.0.0-20240410162701-78a97c114f7f
github.com/Benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
github.com/benbjohnson/jmphash v0.0.0-20141216154655-2d58f234cd86
github.com/cespare/xxhash v1.1.0
github.com/cloudfoundry/gosigar v1.3.52
github.com/cloudfoundry/gosigar v1.3.54
github.com/dvsekhvalnov/jose2go v1.6.0
github.com/emirpasic/gods v1.18.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
Expand All @@ -22,11 +24,11 @@ require (
github.com/onsi/gomega v1.32.0
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.51.1
github.com/prometheus/prometheus v2.13.1+incompatible // pinned
github.com/prometheus/common v0.52.3
github.com/prometheus/prometheus v0.51.2
github.com/shirou/gopsutil/v3 v3.24.3
golang.org/x/net v0.24.0
google.golang.org/grpc v1.62.1
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
)

Expand All @@ -39,37 +41,38 @@ require (
github.com/benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/go-kit/kit v0.13.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240327155427-868f304927ed // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/square/certstrap v1.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.step.sm/crypto v0.43.1 // indirect
go.step.sm/crypto v0.44.4 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240415151819-79826c84ba32 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415151819-79826c84ba32 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v2.13.1+incompatible // pinned
Loading
Loading