Update to current protobuf library

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 = &timestamp.Timestamp{Seconds: bucket.IntervalStartUTC}
-				intervalEndSeconds := bucket.IntervalStartUTC + int64(interval.IntervalLength)
-				intervalMetric.IntervalEndUTC = &timestamp.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)
 			}

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"

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"

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"

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

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"

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"

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"
 )

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"