Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions cmd/feedwitness/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
w_http "github.com/transparency-dev/witness/client/http"
"github.com/transparency-dev/witness/witness"
"github.com/transparency-dev/witness/monitoring"
"github.com/transparency-dev/witness/monitoring/prometheus"
"github.com/transparency-dev/witness/omniwitness"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/prometheus"
"go.opentelemetry.io/otel/sdk/metric"
"k8s.io/klog/v2"
)

Expand Down Expand Up @@ -70,10 +71,12 @@ func main() {
}

if *metricsAddr != "" {
mf := prometheus.MetricFactory{
Prefix: "omnifeeder_",
exporter, err := prometheus.New(prometheus.WithNamespace("omnifeeder"))
if err != nil {
klog.Fatalf("failed to create prometheus exporter: %v", err)
}
monitoring.SetMetricFactory(mf)
provider := metric.NewMeterProvider(metric.WithReader(exporter))
otel.SetMeterProvider(provider)

http.Handle("/metrics", promhttp.Handler())
go func() {
Expand Down
32 changes: 32 additions & 0 deletions cmd/feedwitness/otel.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright 2026 The Witness authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package main

import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
)

const name = "github.com/transparency-dev/witness/cmd/feedwitness"

var (
meter = otel.Meter(name)
)

var (
witnessKey = attribute.Key("witness.name")
logKey = attribute.Key("witness.log_origin")
statusKey = attribute.Key("witness.status")
)
49 changes: 27 additions & 22 deletions cmd/feedwitness/run_feeders.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"net/http"
"regexp"
"strings"
"sync"

"github.com/cenkalti/backoff/v5"
"github.com/transparency-dev/formats/log"
Expand All @@ -33,32 +32,29 @@ import (
"github.com/transparency-dev/witness/internal/feeder/sumdb"
"github.com/transparency-dev/witness/internal/feeder/tiles"
"github.com/transparency-dev/witness/witness"
"github.com/transparency-dev/witness/monitoring"
"github.com/transparency-dev/witness/omniwitness"
"go.opentelemetry.io/otel/metric"
"golang.org/x/mod/sumdb/note"
"golang.org/x/sync/errgroup"
"golang.org/x/time/rate"
"k8s.io/klog/v2"
)

var (
feederDoOnce sync.Once
counterFeedRequest monitoring.Counter
counterFeedResponse monitoring.Counter
counterFeedRequest metric.Int64Counter
counterFeedResponse metric.Int64Counter
)

func initFeederMetrics() {
feederDoOnce.Do(func() {
mf := monitoring.GetMetricFactory()
const (
witness = "witness"
log = "log"
status = "status"
)

counterFeedRequest = mf.NewCounter("feed_request", "Number of Feed requests sent to witnesses", witness, log)
counterFeedResponse = mf.NewCounter("feed_response", "Witness responses", witness, log, status)
})
func init() {
var err error
counterFeedRequest, err = meter.Int64Counter("feed_request", metric.WithUnit("{call}"), metric.WithDescription("Number of Feed requests sent to witnesses"))
if err != nil {
klog.Errorf("failed to create counter: %v", err)
}
counterFeedResponse, err = meter.Int64Counter("feed_response", metric.WithUnit("{call}"), metric.WithDescription("Witness responses"))
if err != nil {
klog.Errorf("failed to create counter: %v", err)
}
}

type feederConfig struct {
Expand Down Expand Up @@ -99,8 +95,6 @@ type wJob struct {
//
// This is a long-running function which will only return when the context is done.
func runFeeders(ctx context.Context, opts runFeedOpts) error {
initFeederMetrics()

if opts.HTTPClient == nil {
opts.HTTPClient = http.DefaultClient
}
Expand Down Expand Up @@ -133,7 +127,10 @@ func runFeeders(ctx context.Context, opts runFeedOpts) error {
case job := <-wChan:
var err error
sizeHint := logSizes[job.logOrigin]
counterFeedRequest.Inc(wi.Name, job.logOrigin)
counterFeedRequest.Add(ctx, 1, metric.WithAttributes(
witnessKey.String(wi.Name),
logKey.String(job.logOrigin),
))
sizeHint, err = job.f(sizeHint, wi)
if err != nil {
// Log this, but don't return the error as we want to continue
Expand Down Expand Up @@ -250,12 +247,20 @@ func submitToWitness(ctx context.Context, sizeHint uint64, cpRaw []byte, cpSubmi
klog.V(2).Infof("%q: Fetched proof %d -> %d: %x", cpSubmit.Origin, sizeHint, cpSubmit.Size, conP)

_, actualSize, err := w.Update(ctx, sizeHint, cpRaw, conP)
counterFeedResponse.Inc(w.Name, cpSubmit.Origin, statusForError(err))
counterFeedResponse.Add(ctx, 1, metric.WithAttributes(
witnessKey.String(w.Name),
logKey.String(cpSubmit.Origin),
statusKey.String(statusForError(err)),
))
switch {
case errors.Is(err, witness.ErrCheckpointStale):
klog.V(2).Infof("%q: %d is stale, bumping to %d: %x", cpSubmit.Origin, sizeHint, cpSubmit.Size, conP)
sizeHint = actualSize
counterFeedResponse.Inc(w.Name, cpSubmit.Origin, "stale")
counterFeedResponse.Add(ctx, 1, metric.WithAttributes(
witnessKey.String(w.Name),
logKey.String(cpSubmit.Origin),
statusKey.String("stale"),
))
return sizeHint, backoff.RetryAfter(1)
case err != nil:
e := fmt.Errorf("%q: failed to submit checkpoint to witness: %w", cpSubmit.Origin, err)
Expand Down
4 changes: 0 additions & 4 deletions cmd/feedwitness/run_feeders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ import (
"github.com/transparency-dev/serverless-log/testdata"
"github.com/transparency-dev/witness/internal/feeder"
"github.com/transparency-dev/witness/witness"
"github.com/transparency-dev/witness/monitoring"
"golang.org/x/mod/sumdb/note"
)

func TestFeedOnce(t *testing.T) {
monitoring.SetMetricFactory(monitoring.InertMetricFactory{})
initFeederMetrics()

ctx := context.Background()
for _, test := range []struct {
desc string
Expand Down
15 changes: 8 additions & 7 deletions cmd/omniwitness/monolith.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ import (
f_note "github.com/transparency-dev/formats/note"
"github.com/transparency-dev/witness/persistence/inmemory"
psql "github.com/transparency-dev/witness/persistence/sqlite"
"github.com/transparency-dev/witness/monitoring"
"github.com/transparency-dev/witness/monitoring/prometheus"
"github.com/transparency-dev/witness/omniwitness"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/prometheus"
"go.opentelemetry.io/otel/sdk/metric"
"golang.org/x/mod/sumdb/note"
"k8s.io/klog/v2"

Expand Down Expand Up @@ -80,13 +81,13 @@ func main() {

if *metricsAddr == "" {
klog.Info("No metrics_listen address provided so skipping prometheus setup")
mf := monitoring.InertMetricFactory{}
monitoring.SetMetricFactory(mf)
} else {
mf := prometheus.MetricFactory{
Prefix: "omniwitness_",
exporter, err := prometheus.New(prometheus.WithNamespace("omniwitness"))
if err != nil {
klog.Fatalf("failed to create prometheus exporter: %v", err)
}
monitoring.SetMetricFactory(mf)
provider := metric.NewMeterProvider(metric.WithReader(exporter))
otel.SetMeterProvider(provider)

go func() {
http.Handle("/metrics", promhttp.Handler())
Expand Down
13 changes: 8 additions & 5 deletions cmd/omniwitness_gcp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/transparency-dev/witness/monitoring"
"github.com/transparency-dev/witness/monitoring/prometheus"
"github.com/transparency-dev/witness/omniwitness"
"github.com/transparency-dev/witness/persistence/spanner"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/prometheus"
"go.opentelemetry.io/otel/sdk/metric"
"golang.org/x/mod/sumdb/note"
"k8s.io/klog/v2"
)
Expand Down Expand Up @@ -57,10 +58,12 @@ func main() {

ctx := context.Background()

mf := prometheus.MetricFactory{
Prefix: "omniwitness_",
exporter, err := prometheus.New(prometheus.WithNamespace("omniwitness"))
if err != nil {
klog.Fatalf("failed to create prometheus exporter: %v", err)
}
monitoring.SetMetricFactory(mf)
provider := metric.NewMeterProvider(metric.WithReader(exporter))
otel.SetMeterProvider(provider)
mux := &http.ServeMux{}
mux.Handle("/metrics", promhttp.Handler())
klog.Infof("Prometheus configured on %s", *addr)
Expand Down
20 changes: 11 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ require (
github.com/transparency-dev/merkle v0.0.3-0.20240919113952-3c979d16ee14
github.com/transparency-dev/serverless-log v0.0.0-20250425165558-64e1d2007a10
github.com/transparency-dev/tessera v1.0.3-0.20260303172654-b64a6fdf82f4
go.opentelemetry.io/otel v1.44.0
go.opentelemetry.io/otel/exporters/prometheus v0.66.0
go.opentelemetry.io/otel/metric v1.44.0
go.opentelemetry.io/otel/sdk/metric v1.44.0
golang.org/x/mod v0.36.0
golang.org/x/net v0.54.0
golang.org/x/sync v0.20.0
Expand Down Expand Up @@ -52,23 +56,21 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.opentelemetry.io/otel/sdk v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
golang.org/x/crypto v0.51.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/text v0.37.0 // indirect
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
Expand Down
42 changes: 24 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@ github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UH
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc=
github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
Expand Down Expand Up @@ -157,20 +159,24 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/exporters/prometheus v0.66.0 h1:vkrK8PAznv2NKt2r+kdu252ccGzkEqLc2aSXbQIALYQ=
go.opentelemetry.io/otel/exporters/prometheus v0.66.0/go.mod h1:V/UB6D3vMF/UBOL5igAsAYnk1nG/bzYYTzvsB16cy7o=
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=
go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
Expand Down Expand Up @@ -203,8 +209,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
Expand Down
Loading
Loading