Skip to content

Commit

Permalink
Update Prometheus to main (#18507)
Browse files Browse the repository at this point in the history 
I'm trying to implement OTLP receive endpoint in Prometheus
and ran into incompatible types.

Basically this PR: prometheus/prometheus#11935
was merged 3 days after the last release 😭

Error encountered:
```
../../../../pkg/mod/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite@v0.71.0/histograms.go:90:19: cannot use pSpans (variable of type []*prompb.BucketSpan) as type []prompb.BucketSpan in struct literal
../../../../pkg/mod/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite@v0.71.0/histograms.go:92:19: cannot use nSpans (variable of type []*prompb.BucketSpan) as type []prompb.BucketSpan in struct literal
```

But this makes me concerned. If I succeed in getting an OTLP endpoint
merged into Prometheus, it means there is a circular dependency now.

`pkg/translator/prometheusremotewrite` imports `prometheus/prometheus`
and `prometheus/prometheus` will import `pkg/translator/prometheusremotewrite`.

Not sure how to solve the dependency. Will speak to Prometheus team as well.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
  • Loading branch information
@gouthamve
gouthamve authored Feb 14, 2023
1 parent 610a00c commit 4747138
Show file tree
Hide file tree
Showing 31 changed files with 487 additions and 456 deletions.
16 changes: 8 additions & 8 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ require (
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
Expand Down Expand Up @@ -151,7 +151,7 @@ require (
github.com/denisenkom/go-mssqldb v0.12.2 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/devigned/tab v0.1.1 // indirect
github.com/digitalocean/godo v1.91.1 // indirect
github.com/digitalocean/godo v1.95.0 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v23.0.0+incompatible // indirect
Expand Down Expand Up @@ -237,9 +237,9 @@ require (
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/nomad/api v0.0.0-20221214074818-7dbbf6bc584d // indirect
github.com/hashicorp/nomad/api v0.0.0-20230124213148-69fd1a0e4bf7 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/hetznercloud/hcloud-go v1.38.0 // indirect
github.com/hetznercloud/hcloud-go v1.39.0 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
Expand Down Expand Up @@ -279,7 +279,7 @@ require (
github.com/lib/pq v1.10.7 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/linkedin/goavro/v2 v2.9.8 // indirect
github.com/linode/linodego v1.9.3 // indirect
github.com/linode/linodego v1.12.0 // indirect
github.com/logicmonitor/lm-data-sdk-go v0.7.1 // indirect
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand Down Expand Up @@ -524,12 +524,12 @@ require (
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/prometheus v0.41.0 // indirect
github.com/prometheus/prometheus v0.42.1-0.20230210113933-af1d9e01c7e4 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/relvacode/iso8601 v1.3.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.10 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.12 // indirect
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down Expand Up @@ -613,7 +613,7 @@ require (
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.4.0 // indirect
golang.org/x/tools v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/api v0.109.0 // indirect
Expand Down
33 changes: 17 additions & 16 deletions cmd/configschema/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions cmd/otelcontribcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ require (
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
Expand Down Expand Up @@ -300,7 +300,7 @@ require (
github.com/denisenkom/go-mssqldb v0.12.2 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/devigned/tab v0.1.1 // indirect
github.com/digitalocean/godo v1.91.1 // indirect
github.com/digitalocean/godo v1.95.0 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v23.0.0+incompatible // indirect
Expand Down Expand Up @@ -335,7 +335,7 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.22.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-redis/redis/v7 v7.4.1 // indirect
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
Expand Down Expand Up @@ -385,11 +385,11 @@ require (
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/nomad/api v0.0.0-20221214074818-7dbbf6bc584d // indirect
github.com/hashicorp/nomad/api v0.0.0-20230124213148-69fd1a0e4bf7 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/hetznercloud/hcloud-go v1.38.0 // indirect
github.com/hetznercloud/hcloud-go v1.39.0 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
Expand Down Expand Up @@ -420,7 +420,7 @@ require (
github.com/lib/pq v1.10.7 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/linkedin/goavro/v2 v2.9.8 // indirect
github.com/linode/linodego v1.9.3 // indirect
github.com/linode/linodego v1.12.0 // indirect
github.com/logicmonitor/lm-data-sdk-go v0.7.1 // indirect
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
github.com/magiconair/properties v1.8.7 // indirect
Expand Down Expand Up @@ -513,12 +513,12 @@ require (
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/prometheus v0.41.0 // indirect
github.com/prometheus/prometheus v0.42.1-0.20230210113933-af1d9e01c7e4 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/relvacode/iso8601 v1.3.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.10 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.12 // indirect
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down Expand Up @@ -596,12 +596,12 @@ require (
golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.4.0 // indirect
golang.org/x/tools v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/api v0.109.0 // indirect
Expand Down
Loading

0 comments on commit 4747138

Please sign in to comment.