letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Standardize on `AssertMetricWithLabelsEquals` (#5371) 

Update all of our tests to use `AssertMetricWithLabelsEquals`
instead of combinations of the older `CountFoo` helpers with
simple asserts. This coalesces all of our prometheus inspection
logic into a single function, allowing the deletion of four separate
helper functions.
This commit is contained in:
Aaron Gable 2021-04-01 15:20:43 -07:00 committed by GitHub
parent b4da43ea74
commit ef1d3c4cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 99 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bdns/dns_test.go
View File

@ -489,7 +489,7 @@ func TestRetry(t *testing.T) {
te *testExchanger
expected error
expectedCount int
metricsAllRetries int
metricsAllRetries float64
}
tests := []*testCase{
// The success on first try case
@ -614,14 +614,12 @@ func TestRetry(t *testing.T) {
t.Errorf("#%d, error, expectedCount %v, got %v", i, tc.expectedCount, tc.te.count)
}
if tc.metricsAllRetries > 0 {
count := test.CountCounter(dr.timeoutCounter.With(prometheus.Labels{
"qtype": "TXT",
"type": "out of retries",
"resolver": dnsLoopbackHost,
}))
if count != tc.metricsAllRetries {
t.Errorf("wrong count for timeoutCounter: got %d, expected %d", count, tc.metricsAllRetries)
}
test.AssertMetricWithLabelsEquals(
t, dr.timeoutCounter, prometheus.Labels{
"qtype": "TXT",
"type": "out of retries",
"resolver": dnsLoopbackHost,
}, tc.metricsAllRetries)
}
}
@ -654,23 +652,19 @@ func TestRetry(t *testing.T) {
t.Errorf("expected %s, got %s", context.DeadlineExceeded, err)
}
count := test.CountCounter(dr.timeoutCounter.With(prometheus.Labels{
"qtype": "TXT",
"type": "canceled",
"resolver": dnsLoopbackHost,
}))
if count != 1 {
t.Errorf("wrong count for timeoutCounter canceled: got %d, expected %d", count, 1)
}
test.AssertMetricWithLabelsEquals(
t, dr.timeoutCounter, prometheus.Labels{
"qtype": "TXT",
"type": "canceled",
"resolver": dnsLoopbackHost,
}, 1)
count = test.CountCounter(dr.timeoutCounter.With(prometheus.Labels{
"qtype": "TXT",
"type": "deadline exceeded",
"resolver": dnsLoopbackHost,
}))
if count != 2 {
t.Errorf("wrong count for timeoutCounter deadline exceeded: got %d, expected %d", count, 2)
}
test.AssertMetricWithLabelsEquals(
t, dr.timeoutCounter, prometheus.Labels{
"qtype": "TXT",
"type": "deadline exceeded",
"resolver": dnsLoopbackHost,
}, 2)
}
type tempError bool

8
ca/ca_test.go
View File

@ -990,8 +990,8 @@ func TestPrecertOrphanQueue(t *testing.T) {
strings.Join(testCtx.logger.GetAllMatching(".*"), "\n"))
}
orphanCount := test.CountCounterVec("type", "precert", ca.orphanCount)
test.AssertEquals(t, orphanCount, 1)
test.AssertMetricWithLabelsEquals(
t, ca.orphanCount, prometheus.Labels{"type": "precert"}, 1)
qsa.fail = false
err = ca.integrateOrphan()
@ -1004,8 +1004,8 @@ func TestPrecertOrphanQueue(t *testing.T) {
t.Fatalf("Unexpected error, wanted %q, got %q", goque.ErrEmpty, err)
}
adoptedCount := test.CountCounterVec("type", "precert", ca.adoptedOrphanCount)
test.AssertEquals(t, adoptedCount, 1)
test.AssertMetricWithLabelsEquals(
t, ca.adoptedOrphanCount, prometheus.Labels{"type": "precert"}, 1)
}
func TestOrphanQueue(t *testing.T) {

15
cmd/boulder-janitor/janitor/job_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/letsencrypt/boulder/db"
blog "github.com/letsencrypt/boulder/log"
"github.com/letsencrypt/boulder/test"
"github.com/prometheus/client_golang/prometheus"
)
func setup() (*blog.Mock, clock.FakeClock) {
@ -136,8 +137,8 @@ LIMIT :limit`
}
// We expect the work gauge for this table has been updated
workCount := test.CountCounterVec("table", table, workStat)
test.AssertEquals(t, workCount, len(mockIDs))
test.AssertMetricWithLabelsEquals(
t, workStat, prometheus.Labels{"table": table}, float64(len(mockIDs)))
// Set the third item in mockIDs to have an expiry after the purge cutoff
// so we expect to only get the first two items returned from getWork
@ -153,8 +154,8 @@ LIMIT :limit`
got := <-workChan
test.AssertEquals(t, got, mockIDs[i].ID)
}
workCount = test.CountCounterVec("table", table, workStat)
test.AssertEquals(t, workCount, 2)
test.AssertMetricWithLabelsEquals(
t, workStat, prometheus.Labels{"table": table}, 2)
}
func TestDeleteResource(t *testing.T) {
@ -185,14 +186,16 @@ func TestDeleteResource(t *testing.T) {
// We expect an err result back
test.AssertError(t, err, "no error returned from deleteHandler with bad DB")
// We expect no deletes to have been tracked in the deletedStat
test.AssertEquals(t, test.CountCounterVec("table", "certificates", deletedStat), 0)
test.AssertMetricWithLabelsEquals(
t, deletedStat, prometheus.Labels{"table": "certificates"}, 0)
// With the mock error removed we expect no error returned from simpleDeleteResource
testDB.errResult = nil
err = job.deleteHandler(job, testID)
test.AssertNotError(t, err, "unexpected error from deleteHandler")
// We expect a delete to have been tracked in the deletedStat
test.AssertEquals(t, test.CountCounterVec("table", "certificates", deletedStat), 1)
test.AssertMetricWithLabelsEquals(
t, deletedStat, prometheus.Labels{"table": "certificates"}, 1)
}
type slowDB struct{}

6
cmd/ocsp-updater/main_test.go
View File

@ -25,6 +25,7 @@ import (
"github.com/letsencrypt/boulder/sa/satest"
"github.com/letsencrypt/boulder/test"
"github.com/letsencrypt/boulder/test/vars"
"github.com/prometheus/client_golang/prometheus"
"google.golang.org/grpc"
)
@ -114,10 +115,7 @@ func TestStalenessHistogram(t *testing.T) {
test.AssertNotError(t, err, "Couldn't find stale responses")
test.AssertEquals(t, len(statuses), 2)
samples := test.CountHistogramSamples(updater.stalenessHistogram)
if samples != 2 {
t.Errorf("Wrong number of samples for invalid validation. Expected 1, got %d", samples)
}
test.AssertMetricWithLabelsEquals(t, updater.stalenessHistogram, prometheus.Labels{}, 2)
}
func TestGenerateAndStoreOCSPResponse(t *testing.T) {

8
ctpolicy/ctpolicy_test.go
View File

@ -175,8 +175,8 @@ func TestGetSCTsMetrics(t *testing.T) {
}, nil, blog.NewMock(), metrics.NoopRegisterer)
_, err := ctp.GetSCTs(context.Background(), []byte{0}, time.Time{})
test.AssertNotError(t, err, "GetSCTs failed")
test.AssertEquals(t, test.CountCounter(ctp.winnerCounter.With(prometheus.Labels{"log": "ghi", "group": "a"})), 1)
test.AssertEquals(t, test.CountCounter(ctp.winnerCounter.With(prometheus.Labels{"log": "ghi", "group": "b"})), 1)
test.AssertMetricWithLabelsEquals(t, ctp.winnerCounter, prometheus.Labels{"log": "ghi", "group": "a"}, 1)
test.AssertMetricWithLabelsEquals(t, ctp.winnerCounter, prometheus.Labels{"log": "ghi", "group": "b"}, 1)
}
func TestGetSCTsFailMetrics(t *testing.T) {
@ -194,7 +194,7 @@ func TestGetSCTsFailMetrics(t *testing.T) {
if err == nil {
t.Fatal("GetSCTs should have failed")
}
test.AssertEquals(t, test.CountCounter(ctp.winnerCounter.With(prometheus.Labels{"log": "all_failed", "group": "a"})), 1)
test.AssertMetricWithLabelsEquals(t, ctp.winnerCounter, prometheus.Labels{"log": "all_failed", "group": "a"}, 1)
// Same thing, but for when an entire log group times out.
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
@ -212,7 +212,7 @@ func TestGetSCTsFailMetrics(t *testing.T) {
if err == nil {
t.Fatal("GetSCTs should have failed")
}
test.AssertEquals(t, test.CountCounter(ctp.winnerCounter.With(prometheus.Labels{"log": "timeout", "group": "a"})), 1)
test.AssertMetricWithLabelsEquals(t, ctp.winnerCounter, prometheus.Labels{"log": "timeout", "group": "a"}, 1)
}
// A mock publisher that counts submissions

14
grpc/interceptors_test.go
View File

@ -229,8 +229,7 @@ func TestRequestTimeTagging(t *testing.T) {
}
// There should be one histogram sample in the serverInterceptor rpcLag stat
count := test.CountHistogramSamples(si.metrics.rpcLag)
test.AssertEquals(t, count, 1)
test.AssertMetricWithLabelsEquals(t, si.metrics.rpcLag, prometheus.Labels{}, 1)
}
// blockedServer implements a ChillerServer with a Chill method that:
@ -322,11 +321,8 @@ func TestInFlightRPCStat(t *testing.T) {
"method": "Chill",
}
// Retrieve the gauge for inflight Chiller.Chill RPCs
inFlightCount, err := test.GaugeValueWithLabels(ci.metrics.inFlightRPCs, labels)
test.AssertNotError(t, err, "Error collecting gauge value for inFlightRPCs")
// We expect the inFlightRPCs gauge for the Chiller.Chill RPCs to be equal to numRPCs.
test.AssertEquals(t, inFlightCount, numRPCs)
test.AssertMetricWithLabelsEquals(t, ci.metrics.inFlightRPCs, labels, float64(numRPCs))
// Unblock the blockedServer to let all of the Chiller.Chill RPCs complete
server.roadblock.Done()
@ -334,9 +330,5 @@ func TestInFlightRPCStat(t *testing.T) {
time.Sleep(1 * time.Second)
// Check the gauge value again
inFlightCount, err = test.GaugeValueWithLabels(ci.metrics.inFlightRPCs, labels)
test.AssertNotError(t, err, "Error collecting gauge value for inFlightRPCs")
// There should now be zero in flight chill requests.
// What a ~ ~ Chill Sitch ~ ~
test.AssertEquals(t, inFlightCount, 0)
test.AssertMetricWithLabelsEquals(t, ci.metrics.inFlightRPCs, labels, 0)
}

11
ocsp/responder_test.go
View File

@ -122,17 +122,16 @@ func TestOCSP(t *testing.T) {
t.Errorf("Incorrect response code: got %d, wanted %d", rw.Code, tc.expected)
}
if rw.Code == http.StatusOK {
test.AssertEquals(t, 1, test.CountCounterVec("type", "Success", responder.responseTypes))
test.AssertMetricWithLabelsEquals(
t, responder.responseTypes, prometheus.Labels{"type": "Success"}, 1)
} else if rw.Code == http.StatusBadRequest {
test.AssertEquals(t, 1, test.CountCounterVec("type", "Malformed", responder.responseTypes))
test.AssertMetricWithLabelsEquals(
t, responder.responseTypes, prometheus.Labels{"type": "Malformed"}, 1)
}
})
}
// Exactly two of the cases above result in an OCSP response being sent.
samples := test.CountHistogramSamples(responder.responseAges)
if samples != 2 {
t.Errorf("Ages histogram updated incorrect number of times: %d", samples)
}
test.AssertMetricWithLabelsEquals(t, responder.responseAges, prometheus.Labels{}, 2)
}
func TestRequestTooBig(t *testing.T) {

8
publisher/publisher_test.go
View File

@ -346,11 +346,11 @@ func TestHTTPStatusMetric(t *testing.T) {
Der: leaf.Raw,
})
test.AssertError(t, err, "SubmitToSingleCTWithResult didn't fail")
test.AssertEquals(t, test.CountHistogramSamples(pub.metrics.submissionLatency.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, pub.metrics.submissionLatency, prometheus.Labels{
"log": logURI,
"status": "error",
"http_status": "400",
})), 1)
}, 1)
pub, leaf, k = setup(t)
pkDER, err = x509.MarshalPKIXPublicKey(&k.PublicKey)
@ -368,11 +368,11 @@ func TestHTTPStatusMetric(t *testing.T) {
Der: leaf.Raw,
})
test.AssertNotError(t, err, "SubmitToSingleCTWithResult failed")
test.AssertEquals(t, test.CountHistogramSamples(pub.metrics.submissionLatency.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, pub.metrics.submissionLatency, prometheus.Labels{
"log": logURI,
"status": "success",
"http_status": "",
})), 1)
}, 1)
}
func Test_GetCTBundleForChain(t *testing.T) {
chain, err := issuance.LoadChain([]string{

14
ra/ra_test.go
View File

@ -3488,7 +3488,7 @@ func TestCTPolicyMeasurements(t *testing.T) {
CSR: ExampleCSR,
}, accountID(Registration.ID), 0, 0)
test.AssertError(t, err, "ra.issueCertificate didn't fail when CTPolicy.GetSCTs timed out")
test.AssertEquals(t, test.CountHistogramSamples(ra.ctpolicyResults.With(prometheus.Labels{"result": "failure"})), 1)
test.AssertMetricWithLabelsEquals(t, ra.ctpolicyResults, prometheus.Labels{"result": "failure"}, 1)
}
func TestWildcardOverlap(t *testing.T) {
@ -3894,8 +3894,8 @@ func TestRevocationAddBlockedKey(t *testing.T) {
err = ra.RevokeCertificateWithReg(context.Background(), *cert, ocsp.Unspecified, 0)
test.AssertNotError(t, err, "RevokeCertificateWithReg failed")
test.Assert(t, mockSA.added == nil, "blocked key was added when reason was not keyCompromise")
test.AssertEquals(t, test.CountCounterVec(
"reason", "unspecified", ra.revocationReasonCounter), 1)
test.AssertMetricWithLabelsEquals(
t, ra.revocationReasonCounter, prometheus.Labels{"reason": "unspecified"}, 1)
err = ra.RevokeCertificateWithReg(context.Background(), *cert, ocsp.KeyCompromise, 0)
test.AssertNotError(t, err, "RevokeCertificateWithReg failed")
@ -3903,8 +3903,8 @@ func TestRevocationAddBlockedKey(t *testing.T) {
test.Assert(t, bytes.Equal(digest[:], mockSA.added.KeyHash), "key hash mismatch")
test.AssertEquals(t, mockSA.added.Source, "API")
test.Assert(t, mockSA.added.Comment == "", "Comment is not empty")
test.AssertEquals(t, test.CountCounterVec(
"reason", "keyCompromise", ra.revocationReasonCounter), 1)
test.AssertMetricWithLabelsEquals(
t, ra.revocationReasonCounter, prometheus.Labels{"reason": "keyCompromise"}, 1)
mockSA.added = nil
err = ra.AdministrativelyRevokeCertificate(context.Background(), *cert, ocsp.KeyCompromise, "root")
@ -3914,6 +3914,6 @@ func TestRevocationAddBlockedKey(t *testing.T) {
test.AssertEquals(t, mockSA.added.Source, "admin-revoker")
test.Assert(t, mockSA.added.Comment != "", "Comment is nil")
test.AssertEquals(t, mockSA.added.Comment, "revoked by root")
test.AssertEquals(t, test.CountCounterVec(
"reason", "keyCompromise", ra.revocationReasonCounter), 2)
test.AssertMetricWithLabelsEquals(
t, ra.revocationReasonCounter, prometheus.Labels{"reason": "keyCompromise"}, 2)
}

57
test/test-tools.go
View File

@ -204,63 +204,6 @@ loop:
AssertEquals(t, total, expected)
}
// CountCounterVec returns the count by label and value of a prometheus metric
func CountCounterVec(labelName string, value string, counterVec *prometheus.CounterVec) int {
return CountCounter(counterVec.With(prometheus.Labels{labelName: value}))
}
// CountCounter returns the count by label and value of a prometheus metric
func CountCounter(counter prometheus.Counter) int {
ch := make(chan prometheus.Metric, 10)
counter.Collect(ch)
var m prometheus.Metric
select {
case <-time.After(time.Second):
panic("timed out collecting metrics")
case m = <-ch:
}
var iom io_prometheus_client.Metric
_ = m.Write(&iom)
return int(iom.Counter.GetValue())
}
func CountHistogramSamples(obs prometheus.Observer) int {
hist := obs.(prometheus.Histogram)
ch := make(chan prometheus.Metric, 10)
hist.Collect(ch)
var m prometheus.Metric
select {
case <-time.After(time.Second):
panic("timed out collecting metrics")
case m = <-ch:
}
var iom io_prometheus_client.Metric
_ = m.Write(&iom)
return int(iom.Histogram.GetSampleCount())
}
// GaugeValueWithLabels returns the current value with the provided labels from the
// the GaugeVec argument, or an error if there was a problem collecting the value.
func GaugeValueWithLabels(vecGauge *prometheus.GaugeVec, labels prometheus.Labels) (int, error) {
gauge, err := vecGauge.GetMetricWith(labels)
if err != nil {
return 0, err
}
ch := make(chan prometheus.Metric, 10)
gauge.Collect(ch)
var m prometheus.Metric
select {
case <-time.After(time.Second):
return 0, fmt.Errorf("timed out collecting gauge metrics")
case m = <-ch:
}
var iom io_prometheus_client.Metric
_ = m.Write(&iom)
return int(iom.Gauge.GetValue()), nil
}
var throwawayCertIssuer *x509.Certificate
// ThrowAwayCert is a small test helper function that creates a self-signed

7
va/dns_test.go
View File

@ -32,14 +32,11 @@ func TestDNSValidationEmpty(t *testing.T) {
test.AssertEquals(t, res.Problems.ProblemType, "unauthorized")
test.AssertEquals(t, res.Problems.Detail, "No TXT record found at _acme-challenge.empty-txts.com")
samples := test.CountHistogramSamples(va.metrics.validationTime.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, va.metrics.validationTime, prometheus.Labels{
"type": "dns-01",
"result": "invalid",
"problem_type": "unauthorized",
}))
if samples != 1 {
t.Errorf("Wrong number of samples for invalid validation. Expected 1, got %d", samples)
}
}, 1)
}
func TestDNSValidationWrong(t *testing.T) {

12
va/tlsalpn_test.go
View File

@ -24,6 +24,7 @@ import (
"github.com/letsencrypt/boulder/identifier"
"github.com/letsencrypt/boulder/probs"
"github.com/letsencrypt/boulder/test"
"github.com/prometheus/client_golang/prometheus"
)
func tlsalpnChallenge() core.Challenge {
@ -392,7 +393,8 @@ func TestTLSALPN01Success(t *testing.T) {
if prob != nil {
t.Errorf("Validation failed: %v", prob)
}
test.AssertEquals(t, test.CountCounterVec("oid", IdPeAcmeIdentifier.String(), va.metrics.tlsALPNOIDCounter), 1)
test.AssertMetricWithLabelsEquals(
t, va.metrics.tlsALPNOIDCounter, prometheus.Labels{"oid": IdPeAcmeIdentifier.String()}, 1)
hs.Close()
chall = tlsalpnChallenge()
@ -405,7 +407,8 @@ func TestTLSALPN01Success(t *testing.T) {
if prob != nil {
t.Errorf("Validation failed: %v", prob)
}
test.AssertEquals(t, test.CountCounterVec("oid", IdPeAcmeIdentifierV1Obsolete.String(), va.metrics.tlsALPNOIDCounter), 1)
test.AssertMetricWithLabelsEquals(
t, va.metrics.tlsALPNOIDCounter, prometheus.Labels{"oid": IdPeAcmeIdentifierV1Obsolete.String()}, 1)
}
func TestValidateTLSALPN01BadChallenge(t *testing.T) {
@ -544,7 +547,6 @@ func TestTLSALPN01TLS13(t *testing.T) {
t.Errorf("Validation failed: %v", prob)
}
// The correct TLS-ALPN-01 OID counter should have been incremented
test.AssertEquals(t, test.CountCounterVec(
"oid", IdPeAcmeIdentifier.String(), va.metrics.tlsALPNOIDCounter),
1)
test.AssertMetricWithLabelsEquals(
t, va.metrics.tlsALPNOIDCounter, prometheus.Labels{"oid": IdPeAcmeIdentifier.String()}, 1)
}

21
va/va_test.go
View File

@ -248,14 +248,11 @@ func TestPerformValidationInvalid(t *testing.T) {
res, _ := va.PerformValidation(context.Background(), req)
test.Assert(t, res.Problems != nil, "validation succeeded")
samples := test.CountHistogramSamples(va.metrics.validationTime.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, va.metrics.validationTime, prometheus.Labels{
"type": "dns-01",
"result": "invalid",
"problem_type": "unauthorized",
}))
if samples != 1 {
t.Errorf("Wrong number of samples for invalid validation. Expected 1, got %d", samples)
}
}, 1)
}
func TestPerformValidationValid(t *testing.T) {
@ -266,14 +263,11 @@ func TestPerformValidationValid(t *testing.T) {
res, _ := va.PerformValidation(context.Background(), req)
test.Assert(t, res.Problems == nil, fmt.Sprintf("validation failed: %#v", res.Problems))
samples := test.CountHistogramSamples(va.metrics.validationTime.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, va.metrics.validationTime, prometheus.Labels{
"type": "dns-01",
"result": "valid",
"problem_type": "",
}))
if samples != 1 {
t.Errorf("Wrong number of samples for successful validation. Expected 1, got %d", samples)
}
}, 1)
resultLog := mockLog.GetAllMatching(`Validation result`)
if len(resultLog) != 1 {
t.Fatalf("Wrong number of matching lines for 'Validation result'")
@ -294,14 +288,11 @@ func TestPerformValidationWildcard(t *testing.T) {
res, _ := va.PerformValidation(context.Background(), req)
test.Assert(t, res.Problems == nil, fmt.Sprintf("validation failed: %#v", res.Problems))
samples := test.CountHistogramSamples(va.metrics.validationTime.With(prometheus.Labels{
test.AssertMetricWithLabelsEquals(t, va.metrics.validationTime, prometheus.Labels{
"type": "dns-01",
"result": "valid",
"problem_type": "",
}))
if samples != 1 {
t.Errorf("Wrong number of samples for successful validation. Expected 1, got %d", samples)
}
}, 1)
resultLog := mockLog.GetAllMatching(`Validation result`)
if len(resultLog) != 1 {
t.Fatalf("Wrong number of matching lines for 'Validation result'")

4
wfe/wfe_test.go
View File

@ -41,6 +41,7 @@ import (
"github.com/letsencrypt/boulder/test"
vapb "github.com/letsencrypt/boulder/va/proto"
"github.com/letsencrypt/boulder/web"
"github.com/prometheus/client_golang/prometheus"
"google.golang.org/grpc"
"gopkg.in/square/go-jose.v2"
)
@ -1057,7 +1058,8 @@ func TestIssueCertificate(t *testing.T) {
`{"type":"`+probs.V1ErrorNS+`malformed","detail":"CSR generated using a pre-1.0.2 OpenSSL with a client that doesn't properly specify the CSR version. See https://community.letsencrypt.org/t/openssl-bug-information/19591","status":400}`)
// Test the CSR signature type counter works
test.AssertEquals(t, test.CountCounterVec("type", "SHA256-RSA", wfe.csrSignatureAlgs), 4)
test.AssertMetricWithLabelsEquals(
t, wfe.csrSignatureAlgs, prometheus.Labels{"type": "SHA256-RSA"}, 4)
}
func TestGetChallenge(t *testing.T) {

41
wfe2/verify_test.go
View File

@ -17,6 +17,7 @@ import (
"github.com/letsencrypt/boulder/probs"
"github.com/letsencrypt/boulder/test"
"github.com/letsencrypt/boulder/web"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/square/go-jose.v2"
)
@ -450,8 +451,8 @@ func TestValidPOSTRequest(t *testing.T) {
test.AssertEquals(t, prob.Type, probs.MalformedProblem)
test.AssertEquals(t, prob.HTTPStatus, tc.HTTPStatus)
test.AssertEquals(t, prob.Detail, tc.ProblemDetail)
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.httpErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.httpErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
})
}
}
@ -548,8 +549,8 @@ func TestEnforceJWSAuthType(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedResult)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -618,8 +619,8 @@ func TestValidNonce(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedResult)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -738,8 +739,8 @@ func TestValidPOSTURL(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedResult)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -904,8 +905,8 @@ func TestParseJWSRequest(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -1121,8 +1122,8 @@ func TestLookupJWK(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -1252,8 +1253,8 @@ func TestValidJWSForKey(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -1348,8 +1349,8 @@ func TestValidPOSTForAccount(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -1506,8 +1507,8 @@ func TestValidSelfAuthenticatedPOST(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}
@ -1589,8 +1590,8 @@ func TestMatchJWSURLs(t *testing.T) {
test.AssertMarshaledEquals(t, prob, tc.ExpectedProblem)
}
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}

5
wfe2/wfe_test.go
View File

@ -25,6 +25,7 @@ import (
"time"
"github.com/jmhodges/clock"
"github.com/prometheus/client_golang/prometheus"
jose "gopkg.in/square/go-jose.v2"
"github.com/letsencrypt/boulder/core"
@ -2712,8 +2713,8 @@ func TestKeyRollover(t *testing.T) {
wfe.KeyRollover(ctx, newRequestEvent(), responseWriter, makePostRequestWithPath("key-change", outer))
test.AssertUnmarshaledEquals(t, responseWriter.Body.String(), tc.ExpectedResponse)
if tc.ErrorStatType != "" {
test.AssertEquals(t, test.CountCounterVec(
"type", tc.ErrorStatType, wfe.stats.joseErrorCount), 1)
test.AssertMetricWithLabelsEquals(
t, wfe.stats.joseErrorCount, prometheus.Labels{"type": tc.ErrorStatType}, 1)
}
})
}