Skip to content

Commit 1c1c4dc

Browse files
aarongableaarongable
authored
Update certificate-transparency-go to get static/tiled log support (#8150)
Update github.com/google/certificate-transparency-go from v1.1.6 to v1.3.1. This updates the loglist file schema to recognize logs which are tagged as being tiled logs / implementing the static CT API. Transitively update: - github.com/go-sql-driver/mysql from v1.7.1 to v1.8.1 - github.com/prometheus/client_golang from v1.15.1 to v1.22.0 - github.com/prometheus/client_model from v0.4.0 to v0.6.1 - go.opentelemetry.io/otel from v1.30.0 to v1.31.0 - google.golang.org/grpc from v1.66.1 to v1.69.4 - google.golang.org/protobuf from v1.34.2 to v1.36.5 - and a variety of indirect dependencies Remove one indirect dependency: - github.com/matttproud/golang_protobuf_extensions Add two new indirect dependencies: - filippo.io/[email protected] (used by go-sql-driver to handle mariadb's custom encryption implementation) - github.com/munnerz/[email protected] (previously inlined into prometheus/common) Also fix two unit tests which need minor modifications to work with updated type signatures and behavior. Part of #7872
1 parent 1274878 commit 1c1c4dc

File tree

449 files changed

+23619
-11360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

449 files changed

+23619
-11360
lines changed

‎go.mod‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/eggsampler/acme/v3 v3.6.2-0.20250208073118-0466a0230941
1111
github.com/go-jose/go-jose/v4 v4.1.0
1212
github.com/go-logr/stdr v1.2.2
13-
github.com/go-sql-driver/mysql v1.7.1
13+
github.com/go-sql-driver/mysql v1.8.1
1414
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
15-
github.com/google/certificate-transparency-go v1.1.6
15+
github.com/google/certificate-transparency-go v1.3.1
1616
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
1717
github.com/jmhodges/clock v1.2.0
1818
github.com/letsencrypt/borp v0.0.0-20240620175310-a78493c6e2bd
@@ -22,8 +22,8 @@ require (
2222
github.com/miekg/dns v1.1.61
2323
github.com/miekg/pkcs11 v1.1.1
2424
github.com/nxadm/tail v1.4.11
25-
github.com/prometheus/client_golang v1.15.1
26-
github.com/prometheus/client_model v0.4.0
25+
github.com/prometheus/client_golang v1.22.0
26+
github.com/prometheus/client_model v0.6.1
2727
github.com/redis/go-redis/extra/redisotel/v9 v9.5.3
2828
github.com/redis/go-redis/v9 v9.7.3
2929
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399
@@ -32,21 +32,23 @@ require (
3232
github.com/zmap/zlint/v3 v3.6.4
3333
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0
3434
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
35-
go.opentelemetry.io/otel v1.30.0
35+
go.opentelemetry.io/otel v1.31.0
3636
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0
37-
go.opentelemetry.io/otel/sdk v1.30.0
38-
go.opentelemetry.io/otel/trace v1.30.0
37+
go.opentelemetry.io/otel/sdk v1.31.0
38+
go.opentelemetry.io/otel/trace v1.31.0
3939
golang.org/x/crypto v0.36.0
4040
golang.org/x/net v0.38.0
4141
golang.org/x/sync v0.12.0
4242
golang.org/x/term v0.30.0
4343
golang.org/x/text v0.23.0
44-
google.golang.org/grpc v1.66.1
45-
google.golang.org/protobuf v1.34.2
44+
golang.org/x/time v0.10.0
45+
google.golang.org/grpc v1.69.4
46+
google.golang.org/protobuf v1.36.5
4647
gopkg.in/yaml.v3 v3.0.1
4748
)
4849

4950
require (
51+
filippo.io/edwards25519 v1.1.0 // indirect
5052
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
5153
github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
5254
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
@@ -70,25 +72,23 @@ require (
7072
github.com/go-logr/logr v1.4.2 // indirect
7173
github.com/go-playground/locales v0.14.1 // indirect
7274
github.com/go-playground/universal-translator v0.18.1 // indirect
73-
github.com/golang/protobuf v1.5.4 // indirect
7475
github.com/google/uuid v1.6.0 // indirect
7576
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
7677
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
77-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
78+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7879
github.com/pelletier/go-toml v1.9.5 // indirect
7980
github.com/poy/onpar v1.1.2 // indirect
80-
github.com/prometheus/common v0.42.0 // indirect
81-
github.com/prometheus/procfs v0.9.0 // indirect
81+
github.com/prometheus/common v0.62.0 // indirect
82+
github.com/prometheus/procfs v0.15.1 // indirect
8283
github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 // indirect
8384
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
84-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
85+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
8586
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
86-
golang.org/x/mod v0.18.0 // indirect
87+
golang.org/x/mod v0.22.0 // indirect
8788
golang.org/x/sys v0.31.0 // indirect
88-
golang.org/x/time v0.10.0
89-
golang.org/x/tools v0.22.0 // indirect
90-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
91-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
89+
golang.org/x/tools v0.29.0 // indirect
90+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
9292
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
93-
k8s.io/klog/v2 v2.100.1 // indirect
93+
k8s.io/klog/v2 v2.130.1 // indirect
9494
)

‎go.sum‎

Lines changed: 44 additions & 39 deletions
Large diffs are not rendered by default.

‎grpc/noncebalancer/noncebalancer_test.go‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,12 @@ func setupTest(noSubConns bool) (*Balancer, balancer.Picker, []*subConn) {
115115
return b, p, subConns
116116
}
117117

118-
// subConn implements the balancer.SubConn interface.
118+
// subConn is a test mock which implements the balancer.SubConn interface.
119119
type subConn struct {
120+
balancer.SubConn
120121
addrs []resolver.Address
121122
}
122123

123124
func (s *subConn) UpdateAddresses(addrs []resolver.Address) {
124125
s.addrs = addrs
125126
}
126-
127-
func (s *subConn) Connect() {}
128-
129-
func (s *subConn) GetOrBuildProducer(balancer.ProducerBuilder) (p balancer.Producer, close func()) {
130-
panic("unimplemented")
131-
}
132-
133-
func (s *subConn) Shutdown() {}

‎redis/metrics_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,17 @@ func TestMetrics(t *testing.T) {
4040
results := make(map[string]bool)
4141
for range expectedMetrics {
4242
metric := <-outChan
43+
t.Log(metric.Desc().String())
4344
results[metric.Desc().String()] = true
4445
}
4546

4647
expected := strings.Split(
47-
`Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: [{result <nil>}]}
48-
Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: [{result <nil>}]}
49-
Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: [{result <nil>}]}
50-
Desc{fqName: "redis_connection_pool_total_conns", help: "Number of total connections in the pool.", constLabels: {foo="bar"}, variableLabels: []}
51-
Desc{fqName: "redis_connection_pool_idle_conns", help: "Number of idle connections in the pool.", constLabels: {foo="bar"}, variableLabels: []}
52-
Desc{fqName: "redis_connection_pool_stale_conns", help: "Number of stale connections removed from the pool.", constLabels: {foo="bar"}, variableLabels: []}`,
48+
`Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: {result}}
49+
Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: {result}}
50+
Desc{fqName: "redis_connection_pool_lookups", help: "Number of lookups for a connection in the pool, labeled by hit/miss", constLabels: {foo="bar"}, variableLabels: {result}}
51+
Desc{fqName: "redis_connection_pool_total_conns", help: "Number of total connections in the pool.", constLabels: {foo="bar"}, variableLabels: {}}
52+
Desc{fqName: "redis_connection_pool_idle_conns", help: "Number of idle connections in the pool.", constLabels: {foo="bar"}, variableLabels: {}}
53+
Desc{fqName: "redis_connection_pool_stale_conns", help: "Number of stale connections removed from the pool.", constLabels: {foo="bar"}, variableLabels: {}}`,
5354
"\n")
5455

5556
for _, e := range expected {

‎vendor/github.com/golang/protobuf/LICENSE‎ renamed to ‎vendor/filippo.io/edwards25519/LICENSE‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/filippo.io/edwards25519/README.md‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/filippo.io/edwards25519/doc.go‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)