diff --git a/controller/handler_ctrl/accept.go b/controller/handler_ctrl/accept.go index e8871370f..63f524491 100644 --- a/controller/handler_ctrl/accept.go +++ b/controller/handler_ctrl/accept.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/circuit_confirmation.go b/controller/handler_ctrl/circuit_confirmation.go index 77990ed64..ec45c5070 100644 --- a/controller/handler_ctrl/circuit_confirmation.go +++ b/controller/handler_ctrl/circuit_confirmation.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/circuit_request.go b/controller/handler_ctrl/circuit_request.go index ae4f14aca..941790bbb 100644 --- a/controller/handler_ctrl/circuit_request.go +++ b/controller/handler_ctrl/circuit_request.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/create_terminator.go b/controller/handler_ctrl/create_terminator.go index 1b6c260c7..edc9cc963 100644 --- a/controller/handler_ctrl/create_terminator.go +++ b/controller/handler_ctrl/create_terminator.go @@ -18,7 +18,7 @@ package handler_ctrl import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/fault.go b/controller/handler_ctrl/fault.go index 7008b42b8..037882caa 100644 --- a/controller/handler_ctrl/fault.go +++ b/controller/handler_ctrl/fault.go @@ -18,7 +18,7 @@ package handler_ctrl import ( "errors" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" diff --git a/controller/handler_ctrl/inspect.go b/controller/handler_ctrl/inspect.go index 61b38cee7..c0aee3cc7 100644 --- a/controller/handler_ctrl/inspect.go +++ b/controller/handler_ctrl/inspect.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/link_connected.go b/controller/handler_ctrl/link_connected.go index fc028757c..aaba25ca6 100644 --- a/controller/handler_ctrl/link_connected.go +++ b/controller/handler_ctrl/link_connected.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/metrics.go b/controller/handler_ctrl/metrics.go index 43fbc1567..b68d2f7be 100644 --- a/controller/handler_ctrl/metrics.go +++ b/controller/handler_ctrl/metrics.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/network" "github.com/openziti/fabric/metrics" diff --git a/controller/handler_ctrl/remove_terminator.go b/controller/handler_ctrl/remove_terminator.go index 3f05d61f7..0bf8a4b93 100644 --- a/controller/handler_ctrl/remove_terminator.go +++ b/controller/handler_ctrl/remove_terminator.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/route_result.go b/controller/handler_ctrl/route_result.go index 3665fe40b..27659ddef 100644 --- a/controller/handler_ctrl/route_result.go +++ b/controller/handler_ctrl/route_result.go @@ -19,7 +19,7 @@ package handler_ctrl import ( "bytes" "encoding/binary" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" "github.com/openziti/fabric/controller/xt" diff --git a/controller/handler_ctrl/router_link.go b/controller/handler_ctrl/router_link.go index 84b3abaa6..bbd521fbf 100644 --- a/controller/handler_ctrl/router_link.go +++ b/controller/handler_ctrl/router_link.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/trace.go b/controller/handler_ctrl/trace.go index e6e1576d5..4114da581 100644 --- a/controller/handler_ctrl/trace.go +++ b/controller/handler_ctrl/trace.go @@ -1,7 +1,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/trace/pb" diff --git a/controller/handler_ctrl/update_terminator.go b/controller/handler_ctrl/update_terminator.go index 0f56a14d0..48195c761 100644 --- a/controller/handler_ctrl/update_terminator.go +++ b/controller/handler_ctrl/update_terminator.go @@ -18,7 +18,7 @@ package handler_ctrl import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_ctrl/verify_link.go b/controller/handler_ctrl/verify_link.go index 8e0e919a9..964a14be1 100644 --- a/controller/handler_ctrl/verify_link.go +++ b/controller/handler_ctrl/verify_link.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/create_router.go b/controller/handler_mgmt/create_router.go index e17c0403f..b9b375f47 100644 --- a/controller/handler_mgmt/create_router.go +++ b/controller/handler_mgmt/create_router.go @@ -17,7 +17,7 @@ package handler_mgmt import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/inspect.go b/controller/handler_mgmt/inspect.go index dc5b5eb62..25a4fa7ef 100644 --- a/controller/handler_mgmt/inspect.go +++ b/controller/handler_mgmt/inspect.go @@ -18,7 +18,7 @@ package handler_mgmt import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/list_services.go b/controller/handler_mgmt/list_services.go index 69742840e..93f3e5ec7 100644 --- a/controller/handler_mgmt/list_services.go +++ b/controller/handler_mgmt/list_services.go @@ -18,7 +18,7 @@ package handler_mgmt import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/stream_circuits.go b/controller/handler_mgmt/stream_circuits.go index 831a44c00..c6d89f4f0 100644 --- a/controller/handler_mgmt/stream_circuits.go +++ b/controller/handler_mgmt/stream_circuits.go @@ -17,7 +17,7 @@ package handler_mgmt import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/stream_metrics.go b/controller/handler_mgmt/stream_metrics.go index c9fdfd190..b3510c23a 100644 --- a/controller/handler_mgmt/stream_metrics.go +++ b/controller/handler_mgmt/stream_metrics.go @@ -17,8 +17,6 @@ package handler_mgmt import ( - "github.com/golang/protobuf/proto" - "github.com/golang/protobuf/ptypes/timestamp" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" @@ -27,7 +25,10 @@ import ( "github.com/openziti/fabric/pb/mgmt_pb" "github.com/openziti/foundation/metrics" "github.com/openziti/foundation/metrics/metrics_pb" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/timestamppb" "regexp" + "time" ) type streamMetricsHandler struct { @@ -189,9 +190,10 @@ func (handler *MetricsStreamHandler) filter(filters []*metricsFilter, msg *metri Name: name, } intervalMetric.Values = bucket.Values - intervalMetric.IntervalStartUTC = ×tamp.Timestamp{Seconds: bucket.IntervalStartUTC} - intervalEndSeconds := bucket.IntervalStartUTC + int64(interval.IntervalLength) - intervalMetric.IntervalEndUTC = ×tamp.Timestamp{Seconds: intervalEndSeconds} + intervalStart := time.UnixMilli(bucket.IntervalStartUTC * 1000) + intervalMetric.IntervalStartUTC = timestamppb.New(intervalStart) + intervalEnd := intervalStart.Add(time.Second * time.Duration(interval.IntervalLength)) + intervalMetric.IntervalEndUTC = timestamppb.New(intervalEnd) event.IntervalMetrics = append(event.IntervalMetrics, intervalMetric) } diff --git a/controller/handler_mgmt/stream_toggle_pipe_traces.go b/controller/handler_mgmt/stream_toggle_pipe_traces.go index b7cb499e3..9c4a4447c 100644 --- a/controller/handler_mgmt/stream_toggle_pipe_traces.go +++ b/controller/handler_mgmt/stream_toggle_pipe_traces.go @@ -18,7 +18,7 @@ package handler_mgmt import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/channel/trace/pb" "github.com/openziti/fabric/controller/network" diff --git a/controller/handler_mgmt/stream_traces.go b/controller/handler_mgmt/stream_traces.go index b5ea79e16..6e5641ef0 100644 --- a/controller/handler_mgmt/stream_traces.go +++ b/controller/handler_mgmt/stream_traces.go @@ -17,7 +17,7 @@ package handler_mgmt import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/trace/pb" diff --git a/controller/settings.go b/controller/settings.go index 6825f52e7..3f727c6f6 100644 --- a/controller/settings.go +++ b/controller/settings.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/network" diff --git a/events/metrics.go b/events/metrics.go index b4b2d998d..a643bf455 100644 --- a/events/metrics.go +++ b/events/metrics.go @@ -1,12 +1,12 @@ package events import ( - "github.com/golang/protobuf/ptypes/timestamp" "github.com/google/uuid" "github.com/openziti/fabric/controller/network" "github.com/openziti/fabric/metrics" "github.com/openziti/foundation/metrics/metrics_pb" "github.com/pkg/errors" + "google.golang.org/protobuf/types/known/timestamppb" "reflect" "regexp" "strings" @@ -248,7 +248,7 @@ type MetricsEvent struct { SourceAppId string SourceEntityId string Version uint32 - Timestamp *timestamp.Timestamp + Timestamp *timestamppb.Timestamp Metric string Metrics map[string]interface{} Tags map[string]string diff --git a/metrics/channel_reporter.go b/metrics/channel_reporter.go index 220aa5d4a..d340d6b7e 100644 --- a/metrics/channel_reporter.go +++ b/metrics/channel_reporter.go @@ -17,7 +17,7 @@ package metrics import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/foundation/metrics/metrics_pb" diff --git a/pb/ctrl_pb/decoder.go b/pb/ctrl_pb/decoder.go index 264e4be48..d9554d0a0 100644 --- a/pb/ctrl_pb/decoder.go +++ b/pb/ctrl_pb/decoder.go @@ -18,7 +18,7 @@ package ctrl_pb import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/ctrl_msg" diff --git a/pb/mgmt_pb/decoder.go b/pb/mgmt_pb/decoder.go index 6bb22405a..b1089e0ef 100644 --- a/pb/mgmt_pb/decoder.go +++ b/pb/mgmt_pb/decoder.go @@ -18,7 +18,7 @@ package mgmt_pb import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" ) diff --git a/router/handler_ctrl/dial.go b/router/handler_ctrl/dial.go index 41d215072..8c364c58e 100644 --- a/router/handler_ctrl/dial.go +++ b/router/handler_ctrl/dial.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" diff --git a/router/handler_ctrl/fault.go b/router/handler_ctrl/fault.go index 4b6d58944..b2a684219 100644 --- a/router/handler_ctrl/fault.go +++ b/router/handler_ctrl/fault.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/pb/ctrl_pb" diff --git a/router/handler_ctrl/inspect.go b/router/handler_ctrl/inspect.go index 26b6fa346..a765ef10d 100644 --- a/router/handler_ctrl/inspect.go +++ b/router/handler_ctrl/inspect.go @@ -18,7 +18,7 @@ package handler_ctrl import ( "encoding/json" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/inspect" diff --git a/router/handler_ctrl/route.go b/router/handler_ctrl/route.go index aba279cce..d9ec57290 100644 --- a/router/handler_ctrl/route.go +++ b/router/handler_ctrl/route.go @@ -21,7 +21,7 @@ import ( "syscall" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/xt" diff --git a/router/handler_ctrl/settings.go b/router/handler_ctrl/settings.go index bd5f20814..8f20ad806 100644 --- a/router/handler_ctrl/settings.go +++ b/router/handler_ctrl/settings.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/pb/ctrl_pb" diff --git a/router/handler_ctrl/toggle_pipe_traces.go b/router/handler_ctrl/toggle_pipe_traces.go index 779ed3813..cb3ab005f 100644 --- a/router/handler_ctrl/toggle_pipe_traces.go +++ b/router/handler_ctrl/toggle_pipe_traces.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" trace_pb "github.com/openziti/channel/trace/pb" diff --git a/router/handler_ctrl/unroute.go b/router/handler_ctrl/unroute.go index 8baf728c0..7d37e77e5 100644 --- a/router/handler_ctrl/unroute.go +++ b/router/handler_ctrl/unroute.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/pb/ctrl_pb" diff --git a/router/handler_ctrl/validate_terminators.go b/router/handler_ctrl/validate_terminators.go index e7d49eb7f..68a37c86d 100644 --- a/router/handler_ctrl/validate_terminators.go +++ b/router/handler_ctrl/validate_terminators.go @@ -17,7 +17,7 @@ package handler_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/pb/ctrl_pb" diff --git a/router/router.go b/router/router.go index 10ff6ed39..f68809072 100644 --- a/router/router.go +++ b/router/router.go @@ -23,7 +23,7 @@ import ( "fmt" gosundheit "github.com/AppsFlyer/go-sundheit" "github.com/AppsFlyer/go-sundheit/checks" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/xctrl" diff --git a/tests/context.go b/tests/context.go index b6df7f216..0e7d21862 100644 --- a/tests/context.go +++ b/tests/context.go @@ -21,7 +21,7 @@ import ( tls2 "crypto/tls" "fmt" "github.com/go-resty/resty/v2" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" "github.com/openziti/fabric/controller/api_impl" diff --git a/tests/link_test.go b/tests/link_test.go index 6d76dcb0b..ce3651b94 100644 --- a/tests/link_test.go +++ b/tests/link_test.go @@ -3,7 +3,7 @@ package tests import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/google/uuid" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" diff --git a/trace/channel_peekhandler.go b/trace/channel_peekhandler.go index bfe364077..b5f034c84 100644 --- a/trace/channel_peekhandler.go +++ b/trace/channel_peekhandler.go @@ -18,7 +18,7 @@ package trace import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/trace/pb"