From a31d38f2edc2f7ba22074bdf3428508938073ee8 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 25 Mar 2024 17:28:44 -0400 Subject: [PATCH 1/3] go.mod: remove retract directives The retract directive was for Grafana Agent tags that are not carrying over so they are no longer required. --- go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 496c17a647..9a5e6d527d 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,6 @@ module github.com/grafana/alloy go 1.22.1 -retract ( - v1.3.191 // Published accidentally - v1.2.99 // Published accidentally - v1.2.99-rc1 // Published accidentally -) - require ( cloud.google.com/go/pubsub v1.33.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0-beta.1 From 168aabd9956cc0909b519ad2969685134fd315de Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 25 Mar 2024 17:29:44 -0400 Subject: [PATCH 2/3] go.mod: remove extra require blocks We only need two require blocks: one for direct dependencies and another for indirect dependencies. --- go.mod | 207 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 100 insertions(+), 107 deletions(-) diff --git a/go.mod b/go.mod index 9a5e6d527d..03a22a72f0 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.22.1 require ( cloud.google.com/go/pubsub v1.33.0 + connectrpc.com/connect v1.14.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0-beta.1 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 github.com/Azure/go-autorest/autorest v0.11.29 @@ -13,17 +14,20 @@ require ( github.com/PuerkitoBio/rehttp v1.3.0 github.com/alecthomas/kingpin/v2 v2.4.0 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 - github.com/aws/aws-sdk-go v1.45.25 // indirect github.com/aws/aws-sdk-go-v2 v1.25.0 github.com/aws/aws-sdk-go-v2/config v1.27.0 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.49.0 + github.com/blang/semver/v4 v4.0.0 github.com/bmatcuk/doublestar v1.3.4 + github.com/boynux/squid-exporter v1.10.5-0.20230618153315-c1fae094e18e github.com/burningalchemist/sql_exporter v0.0.0-20240103092044-466b38b6abc4 github.com/cespare/xxhash/v2 v2.2.0 - github.com/cilium/ebpf v0.12.3 // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/coreos/go-systemd/v22 v22.5.0 + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/davidmparrott/kafka_exporter/v2 v2.0.1 + github.com/dimchansky/utfbom v1.1.1 github.com/docker/docker v24.0.7+incompatible github.com/docker/go-connections v0.4.0 github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 @@ -31,10 +35,10 @@ require ( github.com/fortytw2/leaktest v1.3.0 github.com/fsnotify/fsnotify v1.6.0 github.com/github/smimesign v0.2.0 + github.com/githubexporter/github-exporter v0.0.0-20231025122338-656e7dc33fe7 github.com/go-git/go-git/v5 v5.11.0 github.com/go-kit/log v0.2.1 github.com/go-logfmt/logfmt v0.6.0 - github.com/go-logr/logr v1.4.1 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible github.com/go-sql-driver/mysql v1.7.1 github.com/gogo/protobuf v1.3.2 @@ -47,11 +51,16 @@ require ( github.com/google/renameio/v2 v2.0.0 github.com/google/uuid v1.4.0 github.com/gorilla/mux v1.8.0 + github.com/grafana/agent-remote-config v0.0.2 + github.com/grafana/alloy/syntax v0.0.0-00010101000000-000000000000 github.com/grafana/ckit v0.0.0-20230906125525-c046c99a5c04 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb github.com/grafana/go-gelf/v2 v2.0.1 + github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361 + github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d github.com/grafana/loki v1.6.2-0.20240221085104-f9d188620153 // k190 branch + github.com/grafana/loki/pkg/push v0.0.0-20231212100434-384e5c2dc872 // k180 branch github.com/grafana/pyroscope-go/godeltaprof v0.1.7 github.com/grafana/pyroscope/api v0.4.0 github.com/grafana/pyroscope/ebpf v0.4.3 @@ -59,9 +68,7 @@ require ( github.com/grafana/snowflake-prometheus-exporter v0.0.0-20221213150626-862cad8e9538 github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 github.com/grafana/vmware_exporter v0.0.4-beta - github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/hashicorp/consul/api v1.25.1 - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-discover v0.0.0-20230724184603-e89ebd1b2f65 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 @@ -84,11 +91,10 @@ require ( github.com/lib/pq v1.10.9 github.com/miekg/dns v1.1.56 github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f + github.com/natefinch/atomic v1.0.1 github.com/ncabatoff/process-exporter v0.7.10 github.com/nerdswords/yet-another-cloudwatch-exporter v0.55.0 - github.com/ohler55/ojg v1.20.1 // indirect github.com/oklog/run v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/oliver006/redis_exporter v1.54.0 @@ -97,17 +103,20 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.87.0 @@ -119,12 +128,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.87.0 - github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect - github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect - github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/ory/dockertest/v3 v3.8.1 github.com/oschwald/geoip2-golang v1.9.0 + github.com/oschwald/maxminddb-golang v1.11.0 github.com/percona/mongodb_exporter v0.39.1-0.20230706092307-28432707eb65 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/pkg/errors v0.9.1 @@ -140,6 +149,7 @@ require ( github.com/prometheus/client_golang v1.18.0 github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.46.0 + github.com/prometheus/common/sigv4 v0.1.0 github.com/prometheus/consul_exporter v0.8.0 github.com/prometheus/memcached_exporter v0.13.0 github.com/prometheus/mysqld_exporter v0.14.0 @@ -150,13 +160,16 @@ require ( github.com/prometheus/statsd_exporter v0.22.8 github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 github.com/rs/cors v1.10.1 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 github.com/shirou/gopsutil/v3 v3.23.9 github.com/sijms/go-ora/v2 v2.7.6 github.com/sirupsen/logrus v1.9.3 github.com/spaolacci/murmur3 v1.1.0 github.com/spf13/cobra v1.7.0 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.25.0 + github.com/tilinna/clock v1.1.0 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/vincent-petithory/dataurl v1.0.0 github.com/webdevops/azure-metrics-exporter v0.0.0-20230717202958-8701afc2b013 @@ -195,6 +208,7 @@ require ( go.opentelemetry.io/collector/service v0.87.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 go.opentelemetry.io/otel/exporters/prometheus v0.42.0 go.opentelemetry.io/otel/metric v1.21.0 @@ -207,12 +221,14 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/crypto v0.20.0 + golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb golang.org/x/net v0.21.0 golang.org/x/oauth2 v0.16.0 golang.org/x/sys v0.17.0 golang.org/x/text v0.14.0 golang.org/x/time v0.5.0 + golang.org/x/tools v0.16.0 google.golang.org/api v0.152.0 google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.33.0 @@ -220,7 +236,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible k8s.io/api v0.28.3 - k8s.io/apiextensions-apiserver v0.28.0 // indirect + k8s.io/apimachinery v0.28.3 k8s.io/client-go v0.28.3 k8s.io/component-base v0.28.1 k8s.io/klog/v2 v2.100.1 @@ -235,12 +251,15 @@ require ( cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect cloud.google.com/go/iam v1.1.5 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect + dario.cat/mergo v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/AlekSi/pointer v1.1.0 // indirect github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.4.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.10.2 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.8.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.2.0 // indirect @@ -258,7 +277,9 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect github.com/BurntSushi/toml v1.2.1 // indirect github.com/ClickHouse/clickhouse-go v1.5.4 // indirect + github.com/DataDog/sketches-go v1.4.4 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect @@ -266,6 +287,9 @@ require ( github.com/Microsoft/hcsshim v0.11.4 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/Shopify/sarama v1.38.1 // indirect + github.com/Showmax/go-fqdn v1.0.0 // indirect + github.com/Workiva/go-datastructures v1.1.0 // indirect github.com/alecthomas/participle/v2 v2.1.0 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/andybalholm/brotli v1.0.5 // indirect @@ -275,55 +299,68 @@ require ( github.com/armon/go-metrics v0.4.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270 // indirect + github.com/aws/aws-sdk-go v1.45.25 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.0 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.0 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.0 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.0 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.0 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.0 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.23.0 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.19.0 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.147.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.0 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.27.0 // indirect github.com/aws/smithy-go v1.20.0 // indirect + github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b // indirect github.com/beevik/ntp v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.2-0.20180723201105-3c1074078d32+incompatible // indirect - github.com/blang/semver/v4 v4.0.0 - github.com/boynux/squid-exporter v1.10.5-0.20230618153315-c1fae094e18e github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect + github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect + github.com/cilium/ebpf v0.12.3 // indirect + github.com/cloudflare/circl v1.3.7 // indirect github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/containerd v1.7.11 // indirect github.com/containerd/continuity v0.4.2 // indirect + github.com/containerd/log v0.1.0 // indirect github.com/containerd/ttrpc v1.2.2 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/danieljoos/wincred v1.2.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/dennwc/btrfs v0.0.0-20230312211831-a1f570bd01a1 // indirect github.com/dennwc/ioctl v1.0.0 // indirect github.com/dennwc/varint v1.0.0 // indirect github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect + github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.104.1 // indirect - github.com/dimchansky/utfbom v1.1.1 github.com/docker/cli v23.0.3+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/go-units v0.5.0 // indirect + github.com/drone/envsubst v1.0.3 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/eapache/go-resiliency v1.4.0 // indirect @@ -348,7 +385,9 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-jose/go-jose/v3 v3.0.3 // indirect github.com/go-kit/kit v0.13.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect @@ -371,12 +410,14 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/status v1.1.1 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/gomodule/redigo v1.8.9 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect @@ -387,12 +428,14 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/gosnmp/gosnmp v1.36.0 // indirect github.com/grafana/gomemcache v0.0.0-20231204155601-7de47a8c3cb0 // indirect - github.com/grafana/loki/pkg/push v0.0.0-20231212100434-384e5c2dc872 // k180 branch + github.com/grafana/jfr-parser v0.8.0 // indirect github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/cronexpr v1.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-envparse v0.1.0 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect @@ -410,13 +453,16 @@ require ( github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect + github.com/hetznercloud/hcloud-go/v2 v2.4.0 // indirect github.com/hodgesds/perf-utils v0.7.0 // indirect github.com/huandu/xstrings v1.3.3 // indirect github.com/iancoleman/strcase v0.3.0 // indirect + github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab // indirect github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/infinityworks/go-common v0.0.0-20170820165359-7f20a140fd37 // indirect + github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect github.com/influxdata/telegraf v1.16.3 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect @@ -439,15 +485,18 @@ require ( github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/jsimonetti/rtnetlink v1.3.5 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/knadh/koanf v1.5.0 // indirect + github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect github.com/krallistic/kazoo-go v0.0.0-20170526135507-a15279744f4e // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect + github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/linode/linodego v1.23.0 // indirect github.com/lufia/iostat v1.2.1 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect @@ -462,10 +511,15 @@ require ( github.com/mdlayher/netlink v1.7.2 // indirect github.com/mdlayher/socket v0.4.1 // indirect github.com/mdlayher/wifi v0.1.0 // indirect + github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect github.com/microsoft/go-mssqldb v1.6.0 // indirect + github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect + github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/mna/redisc v1.3.2 // indirect github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect @@ -481,33 +535,44 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect + github.com/ohler55/ojg v1.20.1 // indirect github.com/oklog/ulid v1.3.1 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.87.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc4 // indirect github.com/opencontainers/runc v1.1.12 // indirect github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect github.com/opencontainers/selinux v1.11.0 // indirect + github.com/openshift/api v3.9.0+incompatible // indirect + github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect + github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect + github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.2 // indirect - github.com/oschwald/maxminddb-golang v1.11.0 github.com/ovh/go-ovh v1.4.3 // indirect github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus-community/go-runit v0.1.0 // indirect + github.com/prometheus-community/prom-label-proxy v0.6.0 // indirect github.com/prometheus/alertmanager v0.26.0 // indirect - github.com/prometheus/common/sigv4 v0.1.0 github.com/prometheus/exporter-toolkit v0.11.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/remeh/sizedwaitgroup v1.0.0 // indirect @@ -517,28 +582,33 @@ require ( github.com/safchain/ethtool v0.3.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect + github.com/sercand/kuberesolver/v5 v5.1.1 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect + github.com/skeema/knownhosts v1.2.1 // indirect github.com/snowflakedb/gosnowflake v1.7.2-0.20240103203018-f1d625f17408 // indirect github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect github.com/soheilhy/cmux v0.1.5 // indirect + github.com/sony/gobreaker v0.5.0 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect - github.com/tilinna/clock v1.1.0 + github.com/tidwall/gjson v1.10.2 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/tidwall/tinylru v1.1.0 // indirect + github.com/tidwall/wal v1.1.7 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect @@ -572,11 +642,16 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.19.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/sync v0.5.0 // indirect golang.org/x/term v0.17.0 // indirect - golang.org/x/tools v0.16.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect @@ -591,94 +666,12 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect howett.net/plist v1.0.0 // indirect + k8s.io/apiextensions-apiserver v0.28.0 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect ) -require github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab // indirect - -require ( - connectrpc.com/connect v1.14.0 - github.com/githubexporter/github-exporter v0.0.0-20231025122338-656e7dc33fe7 - github.com/grafana/agent-remote-config v0.0.2 - github.com/grafana/alloy/syntax v0.0.0-00010101000000-000000000000 - github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361 - github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d - github.com/natefinch/atomic v1.0.1 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.87.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.87.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.87.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.87.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 - golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 - k8s.io/apimachinery v0.28.3 -) - -require ( - dario.cat/mergo v1.0.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect - github.com/DataDog/sketches-go v1.4.4 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 // indirect - github.com/Shopify/sarama v1.38.1 // indirect - github.com/Showmax/go-fqdn v1.0.0 // indirect - github.com/Workiva/go-datastructures v1.1.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.147.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.26.0 // indirect - github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b // indirect - github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61 // indirect - github.com/cloudflare/circl v1.3.7 // indirect - github.com/containerd/log v0.1.0 // indirect - github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect - github.com/drone/envsubst v1.0.3 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect - github.com/golang-jwt/jwt/v5 v5.0.0 // indirect - github.com/google/gnostic-models v0.6.8 // indirect - github.com/grafana/jfr-parser v0.8.0 // indirect - github.com/hetznercloud/hcloud-go/v2 v2.4.0 // indirect - github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect - github.com/knadh/koanf/v2 v2.0.1 // indirect - github.com/lightstep/go-expohisto v1.0.0 // indirect - github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect - github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect - github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect - github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.87.0 // indirect - github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect - github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/prometheus-community/prom-label-proxy v0.6.0 // indirect - github.com/sercand/kuberesolver/v5 v5.1.1 // indirect - github.com/skeema/knownhosts v1.2.1 // indirect - github.com/sony/gobreaker v0.5.0 // indirect - github.com/tidwall/gjson v1.10.2 // indirect - github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.0 // indirect - github.com/tidwall/tinylru v1.1.0 // indirect - github.com/tidwall/wal v1.1.7 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect -) - // NOTE: replace directives below must always be *temporary*. // // Adding a replace directive to change a module to a fork of a module will From 0b787e45d90f810e132555867d5dfabea95c472a Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 25 Mar 2024 17:30:48 -0400 Subject: [PATCH 3/3] go.mod: keep replace directives in same part of file This commit moves replace directives to consistently be defined in the same place of go.mod rather than being split between other directives (like exclude). --- go.mod | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 03a22a72f0..fdea4c0459 100644 --- a/go.mod +++ b/go.mod @@ -743,6 +743,15 @@ replace ( go.opentelemetry.io/collector/service => github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e052230 ) +replace github.com/github/smimesign => github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3 + +// Replacing for an internal for with a bugfix for delta histograms, https://github.com/grafana/stackdriver_exporter/pull/1 +// Moving back to upstream is being tracked in an internal issue +replace github.com/prometheus-community/stackdriver_exporter => github.com/grafana/stackdriver_exporter v0.0.0-20240228143257-3a2c9acef5a2 + +// Submodules. +replace github.com/grafana/alloy/syntax => ./syntax + // Required to avoid an ambiguous import with github.com/tencentcloud/tencentcloud-sdk-go exclude github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194 @@ -752,12 +761,3 @@ exclude ( k8s.io/client-go v8.0.0+incompatible k8s.io/client-go v12.0.0+incompatible ) - -replace github.com/github/smimesign => github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3 - -// Replacing for an internal for with a bugfix for delta histograms, https://github.com/grafana/stackdriver_exporter/pull/1 -// Moving back to upstream is being tracked in an internal issue -replace github.com/prometheus-community/stackdriver_exporter => github.com/grafana/stackdriver_exporter v0.0.0-20240228143257-3a2c9acef5a2 - -// Submodules. -replace github.com/grafana/alloy/syntax => ./syntax