From a448afcc2c218a85e05b50c6d1b7c2a442d9438d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= <raul@protocol.ai>
Date: Fri, 7 Feb 2020 14:53:11 +0000
Subject: [PATCH] introspection: rename package, rm ListenAddr() from
 interface. (#111)

---
 go.mod                                        |   1 -
 go.sum                                        |  17 --
 host/host.go                                  |   8 +-
 {introspect => introspection}/doc.go          |   4 +-
 {introspect => introspection}/introspect.go   |  15 +-
 {introspect => introspection}/pb/Makefile     |   0
 .../pb/introspection.pb.go                    | 278 +++++++++---------
 .../pb/introspection.proto                    |   3 +-
 {introspect => introspection}/providers.go    |  12 +-
 9 files changed, 160 insertions(+), 178 deletions(-)
 rename {introspect => introspection}/doc.go (79%)
 rename {introspect => introspection}/introspect.go (63%)
 rename {introspect => introspection}/pb/Makefile (100%)
 rename {introspect => introspection}/pb/introspection.pb.go (92%)
 rename {introspect => introspection}/pb/introspection.proto (99%)
 rename {introspect => introspection}/providers.go (78%)

diff --git a/go.mod b/go.mod
index b6266720..b560b4e7 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ require (
 	github.com/btcsuite/btcd v0.20.1-beta
 	github.com/coreos/go-semver v0.3.0
 	github.com/gogo/protobuf v1.3.1
-	github.com/golang/protobuf v1.3.2
 	github.com/ipfs/go-cid v0.0.4
 	github.com/jbenet/goprocess v0.1.3
 	github.com/libp2p/go-flow-metrics v0.0.3
diff --git a/go.sum b/go.sum
index 9b911754..e1a3ba05 100644
--- a/go.sum
+++ b/go.sum
@@ -36,17 +36,9 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/gxed/hashland/keccakpg v0.0.1 h1:wrk3uMNaMxbXiHibbPO4S0ymqJMm41WiudyFSs7UnsU=
-github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
-github.com/gxed/hashland/murmur3 v0.0.1 h1:SheiaIt0sda5K+8FLz952/1iWS9zrnKsEJaOJu4ZbSc=
-github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ipfs/go-cid v0.0.3 h1:UIAh32wymBpStoe83YCzwVQQ5Oy/H0FdxvUS6DJDzms=
-github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.4 h1:UlfXKrZx1DjZoBhQHmNHLC1fK1dUJDN20Y28A7s+gJ8=
 github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
@@ -86,8 +78,6 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1f
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
-github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 h1:5W7KhL8HVF3XCFOweFD3BNESdnO8ewyYTFT2R+/b8FQ=
-github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -98,14 +88,10 @@ github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
-github.com/multiformats/go-multiaddr v0.1.2 h1:HWYHNSyyllbQopmVIF5K7JKJugiah+L9/kuZKHbmNdQ=
-github.com/multiformats/go-multiaddr v0.1.2/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.2.0 h1:lR52sFwcTCuQb6bTfnXF6zA2XfyYvyd+5a9qECv/J90=
 github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multibase v0.0.1 h1:PN9/v21eLywrFWdFNsFKaU04kLJzuYzmrJR+ubhT9qA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
-github.com/multiformats/go-multihash v0.0.1 h1:HHwN1K12I+XllBCrqKnhX949Orn4oawPkegHMu2vDqQ=
-github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
 github.com/multiformats/go-multihash v0.0.8 h1:wrYcW5yxSi3dU07n5jnuS5PrNwyHy0zRHGVoUugWvXg=
 github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.0.10 h1:lMoNbh2Ssd9PUF74Nz008KGzGPlfeV6wH3rit5IIGCM=
@@ -143,7 +129,6 @@ go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -170,8 +155,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190219092855-153ac476189d h1:Z0Ahzd7HltpJtjAHHxX8QFP3j1yYgiuvjbjRzDj/KH0=
-golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/host/host.go b/host/host.go
index 71c1d694..990067a1 100644
--- a/host/host.go
+++ b/host/host.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/libp2p/go-libp2p-core/connmgr"
 	"github.com/libp2p/go-libp2p-core/event"
-	"github.com/libp2p/go-libp2p-core/introspect"
+	"github.com/libp2p/go-libp2p-core/introspection"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/peerstore"
@@ -79,9 +79,9 @@ type Host interface {
 // introspectable, that is, that expose an introspection server.
 type IntrospectableHost interface {
 
-	// Introspector returns the Introspector instance, with which the caller
-	// can:
+	// Introspector returns the introspection.Introspector instance, with which
+	// the caller can:
 	//  - register data providers.
 	//  - fetch introspection data.
-	Introspector() introspect.Introspector
+	Introspector() introspection.Introspector
 }
diff --git a/introspect/doc.go b/introspection/doc.go
similarity index 79%
rename from introspect/doc.go
rename to introspection/doc.go
index 104d082a..d075bec4 100644
--- a/introspect/doc.go
+++ b/introspection/doc.go
@@ -1,4 +1,4 @@
-// Package introspect is EXPERIMENTAL. It is subject to heavy change, and it
+// Package introspection is EXPERIMENTAL. It is subject to heavy change, and it
 // WILL change. For now, it is the simplest implementation to power the
 // proof-of-concept of the libp2p introspection framework.
 //
@@ -6,4 +6,4 @@
 // of go-libp2p. It holds the introspection data schema, and the primitives that
 // allow subsystems to register data providers, and clients to fetch the current
 // state of the system.
-package introspect
+package introspection
diff --git a/introspect/introspect.go b/introspection/introspect.go
similarity index 63%
rename from introspect/introspect.go
rename to introspection/introspect.go
index 289a30c8..a6fbf037 100644
--- a/introspect/introspect.go
+++ b/introspection/introspect.go
@@ -1,6 +1,6 @@
-package introspect
+package introspection
 
-import introspect_pb "github.com/libp2p/go-libp2p-core/introspect/pb"
+import introspection_pb "github.com/libp2p/go-libp2p-core/introspection/pb"
 
 // ProtoVersion is the current version of the introspection protocol.
 const ProtoVersion uint32 = 1
@@ -8,8 +8,11 @@ const ProtoVersion uint32 = 1
 // EXPERIMENTAL. Introspector allows other sub-systems/modules to register
 // metrics/data providers AND also enables clients to fetch the current state of
 // the system.
+//
+// Introspector implementations are usually injected in introspection endpoints
+// (e.g. the default WebSocket endpoint) to serve the data to clients, but they
+// can also be used separately for embedding or testing.
 type Introspector interface {
-
 	// EXPERIMENTAL. RegisterDataProviders allows sub-systems/modules to
 	// register callbacks that supply introspection data.
 	RegisterDataProviders(p *DataProviders) error
@@ -17,9 +20,5 @@ type Introspector interface {
 	// EXPERIMENTAL. FetchFullState returns the full state of the system, by
 	// calling all known data providers and returning a merged cross-cut of the
 	// running system.
-	FetchFullState() (*introspect_pb.State, error)
-
-	// EXPERIMENTAL. ListenAddrs returns the addresses on which the
-	// introspection server endpoint is listening for clients.
-	ListenAddrs() []string
+	FetchFullState() (*introspection_pb.State, error)
 }
diff --git a/introspect/pb/Makefile b/introspection/pb/Makefile
similarity index 100%
rename from introspect/pb/Makefile
rename to introspection/pb/Makefile
diff --git a/introspect/pb/introspection.pb.go b/introspection/pb/introspection.pb.go
similarity index 92%
rename from introspect/pb/introspection.pb.go
rename to introspection/pb/introspection.pb.go
index 0b472704..c8cf6be9 100644
--- a/introspect/pb/introspection.pb.go
+++ b/introspection/pb/introspection.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: introspection.proto
 
-package introspect_pb
+package introspection_pb
 
 import (
 	fmt "fmt"
@@ -722,7 +722,7 @@ type Connection struct {
 	// the peer id of the other party.
 	PeerId string `protobuf:"bytes,2,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"`
 	// the status of this connection.
-	Status Status `protobuf:"varint,3,opt,name=status,proto3,enum=introspect.pb.Status" json:"status,omitempty"`
+	Status Status `protobuf:"varint,3,opt,name=status,proto3,enum=introspection.pb.Status" json:"status,omitempty"`
 	// a reference to the transport managing this connection.
 	TransportId []byte `protobuf:"bytes,4,opt,name=transport_id,json=transportId,proto3" json:"transport_id,omitempty"`
 	// the endpoints participating in this connection.
@@ -730,7 +730,7 @@ type Connection struct {
 	// the timeline of the connection, see Connection.Timeline.
 	Timeline *Connection_Timeline `protobuf:"bytes,6,opt,name=timeline,proto3" json:"timeline,omitempty"`
 	// our role in this connection.
-	Role Role `protobuf:"varint,7,opt,name=role,proto3,enum=introspect.pb.Role" json:"role,omitempty"`
+	Role Role `protobuf:"varint,7,opt,name=role,proto3,enum=introspection.pb.Role" json:"role,omitempty"`
 	// traffic statistics.
 	Traffic *Traffic `protobuf:"bytes,8,opt,name=traffic,proto3" json:"traffic,omitempty"`
 	// properties of this connection.
@@ -1101,7 +1101,7 @@ type Stream struct {
 	// the protocol pinned to this stream.
 	Protocol string `protobuf:"bytes,2,opt,name=protocol,proto3" json:"protocol,omitempty"`
 	// our role in this stream.
-	Role Role `protobuf:"varint,3,opt,name=role,proto3,enum=introspect.pb.Role" json:"role,omitempty"`
+	Role Role `protobuf:"varint,3,opt,name=role,proto3,enum=introspection.pb.Role" json:"role,omitempty"`
 	// traffic statistics.
 	Traffic *Traffic `protobuf:"bytes,4,opt,name=traffic,proto3" json:"traffic,omitempty"`
 	// the connection this stream is hosted under.
@@ -1109,7 +1109,7 @@ type Stream struct {
 	// the timeline of the stream, see Stream.Timeline.
 	Timeline *Stream_Timeline `protobuf:"bytes,6,opt,name=timeline,proto3" json:"timeline,omitempty"`
 	// the status of this stream.
-	Status Status `protobuf:"varint,7,opt,name=status,proto3,enum=introspect.pb.Status" json:"status,omitempty"`
+	Status Status `protobuf:"varint,7,opt,name=status,proto3,enum=introspection.pb.Status" json:"status,omitempty"`
 	// the instantaneous latency of this stream in nanoseconds.
 	// TODO: this is hard to calculate.
 	LatencyNs uint64 `protobuf:"varint,16,opt,name=latency_ns,json=latencyNs,proto3" json:"latency_ns,omitempty"`
@@ -1572,11 +1572,11 @@ type DHT_Query struct {
 	// peers queried.
 	PeerIds []string `protobuf:"bytes,5,rep,name=peer_ids,json=peerIds,proto3" json:"peer_ids,omitempty"`
 	// trigger of the query
-	Trigger DHT_Query_Trigger `protobuf:"varint,6,opt,name=trigger,proto3,enum=introspect.pb.DHT_Query_Trigger" json:"trigger,omitempty"`
+	Trigger DHT_Query_Trigger `protobuf:"varint,6,opt,name=trigger,proto3,enum=introspection.pb.DHT_Query_Trigger" json:"trigger,omitempty"`
 	// type of the query.
-	Type DHT_Query_Type `protobuf:"varint,7,opt,name=type,proto3,enum=introspect.pb.DHT_Query_Type" json:"type,omitempty"`
+	Type DHT_Query_Type `protobuf:"varint,7,opt,name=type,proto3,enum=introspection.pb.DHT_Query_Type" json:"type,omitempty"`
 	// status indicating the result of the query
-	Result DHT_Query_Result `protobuf:"varint,8,opt,name=result,proto3,enum=introspect.pb.DHT_Query_Result" json:"result,omitempty"`
+	Result DHT_Query_Result `protobuf:"varint,8,opt,name=result,proto3,enum=introspection.pb.DHT_Query_Result" json:"result,omitempty"`
 	// time query was dispatched
 	SentTs *time.Time `protobuf:"bytes,9,opt,name=sent_ts,json=sentTs,proto3,stdtime" json:"sent_ts,omitempty"`
 }
@@ -1833,142 +1833,142 @@ func (m *State) GetSnapshotDurationMs() uint32 {
 }
 
 func init() {
-	proto.RegisterEnum("introspect.pb.Status", Status_name, Status_value)
-	proto.RegisterEnum("introspect.pb.Role", Role_name, Role_value)
-	proto.RegisterEnum("introspect.pb.DHT_Query_Trigger", DHT_Query_Trigger_name, DHT_Query_Trigger_value)
-	proto.RegisterEnum("introspect.pb.DHT_Query_Type", DHT_Query_Type_name, DHT_Query_Type_value)
-	proto.RegisterEnum("introspect.pb.DHT_Query_Result", DHT_Query_Result_name, DHT_Query_Result_value)
-	proto.RegisterType((*Version)(nil), "introspect.pb.Version")
-	proto.RegisterType((*ResultCounter)(nil), "introspect.pb.ResultCounter")
-	proto.RegisterType((*SlidingCounter)(nil), "introspect.pb.SlidingCounter")
-	proto.RegisterType((*DataGauge)(nil), "introspect.pb.DataGauge")
-	proto.RegisterType((*Runtime)(nil), "introspect.pb.Runtime")
-	proto.RegisterType((*EndpointPair)(nil), "introspect.pb.EndpointPair")
-	proto.RegisterType((*Traffic)(nil), "introspect.pb.Traffic")
-	proto.RegisterType((*StreamList)(nil), "introspect.pb.StreamList")
-	proto.RegisterType((*Connection)(nil), "introspect.pb.Connection")
-	proto.RegisterType((*Connection_Timeline)(nil), "introspect.pb.Connection.Timeline")
-	proto.RegisterType((*Connection_Attributes)(nil), "introspect.pb.Connection.Attributes")
-	proto.RegisterType((*Stream)(nil), "introspect.pb.Stream")
-	proto.RegisterType((*Stream_ConnectionRef)(nil), "introspect.pb.Stream.ConnectionRef")
-	proto.RegisterType((*Stream_Timeline)(nil), "introspect.pb.Stream.Timeline")
-	proto.RegisterType((*DHT)(nil), "introspect.pb.DHT")
-	proto.RegisterType((*DHT_Params)(nil), "introspect.pb.DHT.Params")
-	proto.RegisterType((*DHT_Query)(nil), "introspect.pb.DHT.Query")
-	proto.RegisterType((*Subsystems)(nil), "introspect.pb.Subsystems")
-	proto.RegisterType((*State)(nil), "introspect.pb.State")
+	proto.RegisterEnum("introspection.pb.Status", Status_name, Status_value)
+	proto.RegisterEnum("introspection.pb.Role", Role_name, Role_value)
+	proto.RegisterEnum("introspection.pb.DHT_Query_Trigger", DHT_Query_Trigger_name, DHT_Query_Trigger_value)
+	proto.RegisterEnum("introspection.pb.DHT_Query_Type", DHT_Query_Type_name, DHT_Query_Type_value)
+	proto.RegisterEnum("introspection.pb.DHT_Query_Result", DHT_Query_Result_name, DHT_Query_Result_value)
+	proto.RegisterType((*Version)(nil), "introspection.pb.Version")
+	proto.RegisterType((*ResultCounter)(nil), "introspection.pb.ResultCounter")
+	proto.RegisterType((*SlidingCounter)(nil), "introspection.pb.SlidingCounter")
+	proto.RegisterType((*DataGauge)(nil), "introspection.pb.DataGauge")
+	proto.RegisterType((*Runtime)(nil), "introspection.pb.Runtime")
+	proto.RegisterType((*EndpointPair)(nil), "introspection.pb.EndpointPair")
+	proto.RegisterType((*Traffic)(nil), "introspection.pb.Traffic")
+	proto.RegisterType((*StreamList)(nil), "introspection.pb.StreamList")
+	proto.RegisterType((*Connection)(nil), "introspection.pb.Connection")
+	proto.RegisterType((*Connection_Timeline)(nil), "introspection.pb.Connection.Timeline")
+	proto.RegisterType((*Connection_Attributes)(nil), "introspection.pb.Connection.Attributes")
+	proto.RegisterType((*Stream)(nil), "introspection.pb.Stream")
+	proto.RegisterType((*Stream_ConnectionRef)(nil), "introspection.pb.Stream.ConnectionRef")
+	proto.RegisterType((*Stream_Timeline)(nil), "introspection.pb.Stream.Timeline")
+	proto.RegisterType((*DHT)(nil), "introspection.pb.DHT")
+	proto.RegisterType((*DHT_Params)(nil), "introspection.pb.DHT.Params")
+	proto.RegisterType((*DHT_Query)(nil), "introspection.pb.DHT.Query")
+	proto.RegisterType((*Subsystems)(nil), "introspection.pb.Subsystems")
+	proto.RegisterType((*State)(nil), "introspection.pb.State")
 }
 
 func init() { proto.RegisterFile("introspection.proto", fileDescriptor_53a8bedf9a75e10a) }
 
 var fileDescriptor_53a8bedf9a75e10a = []byte{
-	// 1686 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x8f, 0x1b, 0xc7,
-	0x11, 0xe6, 0x63, 0x96, 0xc3, 0x29, 0x72, 0x09, 0xa6, 0xed, 0x38, 0x14, 0x0d, 0xaf, 0xe4, 0xb1,
-	0x92, 0x08, 0x86, 0x4d, 0xed, 0x52, 0x16, 0xe4, 0x55, 0x00, 0x03, 0xfb, 0x20, 0x24, 0x06, 0x12,
-	0xc9, 0x34, 0x47, 0x8b, 0x04, 0x08, 0x30, 0x18, 0x72, 0x7a, 0xc9, 0xc9, 0xce, 0x2b, 0xdd, 0x3d,
-	0x72, 0xf6, 0x10, 0x20, 0xc8, 0x3d, 0x80, 0xaf, 0xb9, 0xe4, 0xb7, 0xe4, 0x12, 0x20, 0x47, 0x1f,
-	0x73, 0x4b, 0x20, 0xfd, 0x81, 0xfc, 0x80, 0x1c, 0x82, 0xee, 0x9e, 0xd7, 0x72, 0x29, 0x69, 0x15,
-	0xe4, 0x36, 0x55, 0xf5, 0x55, 0x3f, 0xaa, 0xbe, 0xaa, 0xae, 0x81, 0x0f, 0xbc, 0x90, 0xd3, 0x88,
-	0xc5, 0x64, 0xc9, 0xbd, 0x28, 0x1c, 0xc4, 0x34, 0xe2, 0x11, 0xda, 0x2d, 0x94, 0x83, 0x78, 0xd1,
-	0xff, 0x72, 0xe5, 0xf1, 0x75, 0xb2, 0x18, 0x2c, 0xa3, 0xe0, 0xfe, 0x2a, 0x5a, 0x45, 0xf7, 0x25,
-	0x6a, 0x91, 0x9c, 0x4b, 0x49, 0x0a, 0xf2, 0x4b, 0x79, 0xf7, 0x6f, 0xaf, 0xa2, 0x68, 0xe5, 0x93,
-	0x02, 0xc5, 0xbd, 0x80, 0x30, 0xee, 0x04, 0xb1, 0x02, 0x98, 0x9f, 0x82, 0x7e, 0x46, 0x28, 0xf3,
-	0xa2, 0x10, 0x7d, 0x04, 0x8d, 0x30, 0x09, 0x16, 0x84, 0xf6, 0xaa, 0x77, 0xaa, 0xf7, 0x76, 0x71,
-	0x2a, 0x99, 0x4f, 0x60, 0x17, 0x13, 0x96, 0xf8, 0xfc, 0x24, 0x4a, 0x42, 0x4e, 0x28, 0xfa, 0x10,
-	0x76, 0x78, 0xc4, 0x1d, 0x3f, 0xc5, 0x29, 0x01, 0x75, 0xa0, 0x16, 0x5d, 0xf4, 0x6a, 0x52, 0x55,
-	0x8b, 0x2e, 0x50, 0x17, 0xea, 0x84, 0xd2, 0x5e, 0x5d, 0x2a, 0xc4, 0xa7, 0xf9, 0x97, 0x1a, 0x74,
-	0xe6, 0xbe, 0xe7, 0x7a, 0xe1, 0x2a, 0x5b, 0xea, 0x47, 0xa0, 0x47, 0x2f, 0x09, 0xb5, 0x0f, 0x82,
-	0x6c, 0x53, 0x21, 0x1e, 0x04, 0xb9, 0xe1, 0x61, 0x90, 0x2e, 0x29, 0x0d, 0x0f, 0x03, 0x74, 0x0b,
-	0x9a, 0xca, 0xe3, 0x61, 0x90, 0xae, 0x2d, 0x81, 0x07, 0x25, 0xd3, 0x83, 0xfd, 0xa0, 0xa7, 0x15,
-	0xa6, 0x07, 0xfb, 0x25, 0xaf, 0x35, 0xed, 0xed, 0x94, 0xbc, 0xd6, 0x34, 0x37, 0x0d, 0xd7, 0xb4,
-	0xd7, 0x28, 0x4c, 0xc3, 0x92, 0xe9, 0xab, 0x35, 0xed, 0xe9, 0x85, 0xe9, 0xab, 0x92, 0xe9, 0xeb,
-	0x35, 0xed, 0x35, 0x0b, 0xd3, 0xd7, 0x6b, 0x8a, 0x3e, 0x06, 0x43, 0xed, 0x25, 0x56, 0x34, 0xa4,
-	0x4d, 0x62, 0x85, 0x9c, 0x1b, 0x87, 0x62, 0x4d, 0x28, 0x8c, 0x42, 0x36, 0x17, 0x60, 0x9c, 0x3a,
-	0xdc, 0x79, 0xe2, 0x24, 0x2b, 0x22, 0x90, 0xcb, 0x24, 0xb0, 0x17, 0x97, 0x9c, 0x30, 0x19, 0x1c,
-	0x0d, 0x37, 0x97, 0x49, 0x70, 0x2c, 0x64, 0x74, 0x1b, 0x5a, 0xc2, 0x18, 0x3b, 0xcb, 0x0b, 0xc2,
-	0x99, 0x0c, 0x91, 0x86, 0x61, 0x99, 0x04, 0x33, 0xa5, 0x11, 0xf1, 0xf3, 0x42, 0xc6, 0xed, 0xc5,
-	0xb7, 0x32, 0x4a, 0x1a, 0x6e, 0x08, 0xf1, 0xf8, 0x5b, 0xf3, 0x0f, 0x55, 0xd0, 0x71, 0x12, 0x0a,
-	0x1e, 0xa0, 0x9f, 0x40, 0xc7, 0x0b, 0x62, 0x9f, 0x04, 0x24, 0xe4, 0x8e, 0xe0, 0x9c, 0xdc, 0xc7,
-	0xc0, 0x1b, 0x5a, 0xd4, 0x03, 0xfd, 0xa5, 0x22, 0x89, 0xdc, 0xc9, 0xc0, 0x99, 0x88, 0xfa, 0xd0,
-	0x8c, 0x7d, 0x87, 0x9f, 0x47, 0x54, 0x65, 0xc3, 0xc0, 0xb9, 0x2c, 0x8e, 0x10, 0x13, 0x42, 0x6d,
-	0xcf, 0x95, 0xd9, 0x30, 0x70, 0x43, 0x88, 0x63, 0xd7, 0xfc, 0x25, 0xb4, 0x47, 0xa1, 0x1b, 0x47,
-	0x5e, 0xc8, 0x67, 0x8e, 0x47, 0xd1, 0x67, 0xb0, 0xcb, 0xe8, 0xd2, 0x0e, 0x12, 0x9f, 0x7b, 0x8e,
-	0xeb, 0xd2, 0xf4, 0x14, 0x6d, 0x46, 0x97, 0xcf, 0x33, 0x9d, 0x00, 0xb9, 0x8c, 0x97, 0x40, 0xea,
-	0x24, 0x6d, 0x97, 0xf1, 0x1c, 0x64, 0xfe, 0x1e, 0x74, 0x8b, 0x3a, 0xe7, 0xe7, 0xde, 0x12, 0x3d,
-	0x02, 0xe0, 0xea, 0xd3, 0xf6, 0xd4, 0xbd, 0x5a, 0xc3, 0xde, 0xe0, 0x4a, 0x31, 0x0d, 0xf2, 0x60,
-	0x63, 0x23, 0xc5, 0x8e, 0x43, 0x74, 0x08, 0xad, 0xcc, 0x31, 0x4a, 0xb8, 0xdc, 0xe6, 0x6d, 0x9e,
-	0xd9, 0x2e, 0xd3, 0x84, 0x9b, 0xbf, 0x06, 0x98, 0x73, 0x4a, 0x9c, 0xe0, 0x99, 0xc7, 0x38, 0xfa,
-	0x04, 0x80, 0x49, 0xc9, 0xf6, 0x5c, 0x91, 0xc1, 0xfa, 0xbd, 0x36, 0x36, 0x94, 0x66, 0xec, 0x32,
-	0x74, 0x1f, 0x74, 0x25, 0x88, 0xf4, 0xd5, 0xef, 0xb5, 0x86, 0x3f, 0xdc, 0xd8, 0x43, 0x2d, 0x85,
-	0x33, 0x94, 0xf9, 0x67, 0x1d, 0xe0, 0x24, 0x0a, 0x43, 0xd5, 0x1e, 0x44, 0xbd, 0x79, 0x6e, 0x1a,
-	0xaa, 0x9a, 0xe7, 0x96, 0xc3, 0x5d, 0x2b, 0x87, 0x1b, 0x7d, 0x09, 0x0d, 0xc6, 0x1d, 0x9e, 0x30,
-	0x99, 0xa1, 0xce, 0x96, 0x7d, 0x84, 0x11, 0xa7, 0x20, 0xf4, 0x29, 0xb4, 0x39, 0x75, 0x42, 0x16,
-	0x47, 0x94, 0x67, 0xb9, 0x6b, 0xe3, 0x56, 0xae, 0x1b, 0xbb, 0xe8, 0x10, 0x0c, 0x92, 0x26, 0x90,
-	0xc9, 0x72, 0x6a, 0x0d, 0x3f, 0xde, 0x58, 0xb4, 0x9c, 0x60, 0x5c, 0xa0, 0xd1, 0x37, 0xd0, 0x14,
-	0xd4, 0xf3, 0xbd, 0x90, 0xc8, 0x6a, 0x6b, 0x0d, 0xcd, 0x0d, 0xcf, 0xe2, 0x8a, 0x03, 0x2b, 0x45,
-	0xe2, 0xdc, 0x07, 0xfd, 0x14, 0x34, 0x1a, 0xf9, 0x44, 0x96, 0x63, 0x67, 0xf8, 0xc1, 0x86, 0x2f,
-	0x8e, 0x7c, 0x82, 0x25, 0x00, 0xed, 0x83, 0x9e, 0x66, 0x46, 0xd6, 0x67, 0x6b, 0xf8, 0xd1, 0x06,
-	0x36, 0x25, 0x0a, 0xce, 0x60, 0xe8, 0x1b, 0xd0, 0x1d, 0xce, 0xa9, 0xb7, 0x60, 0xb2, 0x6a, 0x5b,
-	0xc3, 0xbb, 0x6f, 0x3e, 0xd9, 0x91, 0x04, 0x26, 0x9c, 0x30, 0x9c, 0x39, 0x89, 0x7c, 0xfb, 0x0e,
-	0x27, 0xe1, 0xf2, 0xd2, 0x0e, 0x99, 0xac, 0x6d, 0x0d, 0x1b, 0xa9, 0x66, 0xc2, 0xd0, 0x83, 0x22,
-	0xdf, 0x2d, 0xb9, 0xfc, 0xad, 0xad, 0xf9, 0x16, 0xd4, 0xc9, 0x73, 0x8e, 0x6e, 0x81, 0xbe, 0x8c,
-	0xc2, 0x50, 0xe4, 0xa1, 0x2b, 0x92, 0xfa, 0xb4, 0x82, 0x1b, 0x42, 0x31, 0x76, 0xd1, 0x7d, 0xd0,
-	0xc4, 0x57, 0xef, 0x07, 0x5b, 0x17, 0x2b, 0xce, 0xfa, 0xb4, 0x82, 0x25, 0x10, 0x7d, 0x01, 0x28,
-	0x61, 0x84, 0xda, 0x31, 0x8d, 0x5e, 0x7a, 0x2e, 0x71, 0x6d, 0xee, 0xac, 0x58, 0x6f, 0x79, 0xa7,
-	0x7e, 0xcf, 0xc0, 0x5d, 0x61, 0x99, 0xa5, 0x06, 0xcb, 0x59, 0xb1, 0xfe, 0xdf, 0xaa, 0xd0, 0xcc,
-	0xe2, 0x8f, 0x0e, 0x41, 0x8f, 0x62, 0x12, 0xda, 0x9c, 0xa5, 0x95, 0xd4, 0x1f, 0xa8, 0x87, 0x65,
-	0x90, 0x3d, 0x2c, 0x32, 0x57, 0xf2, 0x61, 0x39, 0xd6, 0xbe, 0xfb, 0xe7, 0xed, 0x2a, 0x6e, 0x08,
-	0x07, 0x8b, 0xa1, 0x23, 0x68, 0x25, 0xf1, 0x8a, 0x3a, 0x72, 0x43, 0x96, 0x96, 0xd3, 0xbb, 0xdd,
-	0x21, 0x73, 0xb2, 0x18, 0xfa, 0x19, 0x34, 0x97, 0x7e, 0xc4, 0x88, 0xf0, 0xaf, 0xdf, 0xd0, 0x5f,
-	0x97, 0x1e, 0x16, 0xeb, 0x4f, 0x00, 0x8a, 0x64, 0xa1, 0x3b, 0xd0, 0x92, 0x1d, 0x24, 0xf6, 0xc9,
-	0xef, 0x48, 0xd6, 0x68, 0xca, 0x2a, 0xb4, 0x07, 0x40, 0xc2, 0x25, 0xbd, 0x8c, 0x79, 0xd1, 0xee,
-	0x4a, 0x9a, 0xe3, 0x0e, 0xb4, 0x29, 0xf1, 0x9d, 0x4b, 0xe2, 0xda, 0xa2, 0x6f, 0xff, 0x5c, 0x6b,
-	0xb6, 0xbb, 0x5d, 0xf3, 0xdf, 0x1a, 0x34, 0x54, 0xfe, 0xae, 0xd5, 0xa5, 0x68, 0x91, 0xe2, 0x94,
-	0xcb, 0xc8, 0x4f, 0x97, 0xcb, 0xe5, 0x9c, 0xcd, 0xf5, 0xf7, 0x60, 0xb3, 0x76, 0x33, 0x36, 0x3f,
-	0x4a, 0xe9, 0xa1, 0xca, 0xf3, 0xb3, 0xad, 0x5c, 0x2b, 0xb1, 0x04, 0x93, 0xf3, 0x94, 0x26, 0x8f,
-	0xaf, 0x55, 0xe8, 0xde, 0x76, 0xe7, 0x2d, 0xd5, 0x59, 0xb4, 0x1a, 0xfd, 0x26, 0xad, 0xe6, 0x6a,
-	0xc5, 0x74, 0x37, 0x2b, 0xe6, 0xfd, 0x08, 0xeb, 0xc1, 0xee, 0x95, 0xeb, 0xe4, 0x05, 0x52, 0xbd,
-	0x69, 0x81, 0x94, 0x8a, 0xad, 0x76, 0xb5, 0xd8, 0x8e, 0xdb, 0x00, 0xcb, 0xdc, 0xa1, 0xff, 0xc7,
-	0xff, 0x53, 0x6d, 0x94, 0x89, 0x5d, 0x7b, 0x4f, 0x62, 0x9b, 0x7f, 0x6d, 0x40, 0xfd, 0xf4, 0xa9,
-	0x75, 0x85, 0x5f, 0xd5, 0x0d, 0x7e, 0xf5, 0x40, 0x27, 0xa1, 0xb3, 0xf0, 0x89, 0xba, 0x51, 0x13,
-	0x67, 0xa2, 0xd8, 0x9a, 0x71, 0x87, 0xf2, 0xf7, 0xaa, 0x29, 0xe9, 0x61, 0x31, 0x74, 0x00, 0x8d,
-	0xd8, 0xa1, 0xa2, 0x93, 0x69, 0x5b, 0x63, 0x7b, 0xfa, 0xd4, 0x1a, 0xcc, 0x24, 0x00, 0xa7, 0x40,
-	0x34, 0x80, 0x9d, 0xdf, 0x26, 0x84, 0x5e, 0xf6, 0x76, 0xe4, 0x5b, 0xd7, 0xdb, 0xe2, 0xf1, 0x0b,
-	0x61, 0xc7, 0x0a, 0xd6, 0x9f, 0x43, 0x43, 0xad, 0x80, 0xda, 0x50, 0xbd, 0x48, 0xe7, 0x9f, 0xea,
-	0x85, 0x98, 0x3d, 0x1d, 0x3f, 0x5e, 0x3b, 0xe9, 0xc8, 0xa3, 0x04, 0xf4, 0x63, 0xe8, 0xb8, 0x1e,
-	0xfb, 0x8d, 0x78, 0x62, 0xec, 0xd8, 0xe1, 0x6b, 0x96, 0x0e, 0x3d, 0xbb, 0x99, 0x76, 0x26, 0x94,
-	0xfd, 0x3f, 0x69, 0xb0, 0x23, 0x77, 0xb9, 0x56, 0xa4, 0x77, 0xa1, 0xc3, 0x1d, 0xba, 0x22, 0xdc,
-	0xbe, 0xfa, 0x86, 0xb6, 0x95, 0x76, 0xa6, 0x5e, 0x52, 0x13, 0x76, 0xe5, 0xac, 0x6b, 0x0b, 0xc2,
-	0xdb, 0x41, 0xb6, 0x4b, 0x4b, 0x2a, 0x45, 0xb4, 0x9e, 0xcb, 0xc9, 0x4c, 0x61, 0x18, 0x27, 0xb1,
-	0x0a, 0x90, 0x86, 0x41, 0xaa, 0xe6, 0x42, 0x23, 0x26, 0xc7, 0x74, 0x0f, 0x26, 0x83, 0x61, 0x60,
-	0x5d, 0x3d, 0xd4, 0x0c, 0x3d, 0x16, 0x55, 0xee, 0xad, 0x56, 0x44, 0x4d, 0xa2, 0x9d, 0xe1, 0x9d,
-	0x37, 0x85, 0x69, 0x60, 0x29, 0x1c, 0xce, 0x1c, 0xd0, 0x01, 0x68, 0xfc, 0x32, 0xce, 0x1e, 0xc6,
-	0x4f, 0xde, 0xec, 0x78, 0x19, 0x13, 0x2c, 0xa1, 0xe8, 0x11, 0x34, 0xa8, 0x1c, 0xec, 0xe5, 0x0b,
-	0xd9, 0x19, 0xde, 0x7e, 0xa3, 0x93, 0x9a, 0xff, 0x71, 0x0a, 0x17, 0x94, 0x67, 0x24, 0x94, 0xdc,
-	0x31, 0x6e, 0x4a, 0x79, 0xe1, 0x60, 0x31, 0xf1, 0xbf, 0x91, 0x1e, 0x1d, 0xe9, 0x50, 0x3f, 0x9a,
-	0x8d, 0xbb, 0x15, 0xb4, 0x0b, 0xc6, 0xe9, 0x78, 0x7e, 0x32, 0x3d, 0x1b, 0xe1, 0x5f, 0x75, 0xab,
-	0xe6, 0x17, 0xa0, 0x89, 0x43, 0xa2, 0x16, 0xe8, 0x27, 0xd3, 0x89, 0x35, 0x9a, 0x58, 0xdd, 0x0a,
-	0x6a, 0x43, 0x73, 0x86, 0xa7, 0x67, 0xe3, 0xd3, 0x11, 0xee, 0x56, 0x91, 0x01, 0x3b, 0x67, 0x47,
-	0xcf, 0x5e, 0x8c, 0xba, 0x35, 0xf3, 0x31, 0x34, 0xd4, 0xe9, 0x04, 0x7e, 0xfe, 0xe2, 0xe4, 0x64,
-	0x34, 0x9f, 0x77, 0x2b, 0x02, 0x31, 0xc2, 0x78, 0x2a, 0xc0, 0x2d, 0xd0, 0xad, 0xf1, 0xf3, 0xd1,
-	0xf4, 0x85, 0xd5, 0xad, 0x09, 0x61, 0x36, 0x9a, 0x9c, 0x8e, 0x27, 0x4f, 0xba, 0x75, 0x33, 0x02,
-	0x98, 0x27, 0x0b, 0x76, 0xc9, 0x38, 0x09, 0x44, 0x35, 0xb6, 0x8a, 0x1a, 0x57, 0x03, 0xdb, 0xdb,
-	0xda, 0x06, 0x2e, 0xa3, 0xd1, 0x5d, 0xa8, 0xbb, 0xeb, 0x6c, 0x5a, 0x44, 0xd7, 0x03, 0x89, 0x85,
-	0xd9, 0xfc, 0x4f, 0x0d, 0x76, 0x44, 0x0f, 0x94, 0x0d, 0x3d, 0x1b, 0xa9, 0xab, 0x5b, 0x1b, 0x7a,
-	0xfa, 0x57, 0x56, 0x8c, 0xda, 0xfb, 0xa0, 0x53, 0x35, 0xb7, 0xa7, 0xbb, 0x6c, 0x7a, 0xa4, 0x53,
-	0x3d, 0xce, 0x60, 0xe8, 0x10, 0x80, 0xe5, 0xd7, 0x4b, 0xab, 0xfc, 0xda, 0xd0, 0x91, 0x03, 0x70,
-	0x09, 0xfc, 0x3f, 0xbc, 0x37, 0x87, 0x00, 0xe2, 0x0f, 0xc3, 0x51, 0xb4, 0xd8, 0x79, 0x17, 0x2d,
-	0xb0, 0x91, 0xa2, 0x2d, 0x86, 0x1e, 0x96, 0x7a, 0x51, 0xe3, 0x9d, 0x8e, 0x79, 0x17, 0xda, 0x87,
-	0x0f, 0x59, 0xe8, 0xc4, 0x6c, 0x1d, 0x71, 0xdb, 0x4d, 0xa8, 0xfc, 0x55, 0x11, 0x45, 0xa9, 0xfe,
-	0xd4, 0x50, 0x66, 0x3b, 0x4d, 0x4d, 0xcf, 0xd9, 0xe7, 0x23, 0xf1, 0x48, 0xcb, 0x97, 0x07, 0xa0,
-	0x71, 0x74, 0x62, 0x8d, 0xcf, 0x46, 0xdd, 0x8a, 0xf8, 0x3e, 0x79, 0x36, 0x9d, 0x8f, 0x4e, 0x15,
-	0x57, 0xa6, 0xb3, 0xd1, 0x44, 0xd0, 0x43, 0x72, 0x45, 0x18, 0x24, 0x57, 0x0a, 0x42, 0x69, 0x9f,
-	0xdf, 0x05, 0x4d, 0x3c, 0xcd, 0x82, 0xb7, 0xe3, 0xc9, 0xd8, 0x1a, 0x1f, 0x59, 0x53, 0xac, 0x68,
-	0x8c, 0x47, 0xf3, 0xd9, 0x74, 0x22, 0x39, 0x7a, 0xdc, 0xfb, 0xfb, 0xab, 0xbd, 0xea, 0xf7, 0xaf,
-	0xf6, 0xaa, 0xff, 0x7a, 0xb5, 0x57, 0xfd, 0xee, 0xf5, 0x5e, 0xe5, 0xfb, 0xd7, 0x7b, 0x95, 0x7f,
-	0xbc, 0xde, 0xab, 0x2c, 0x1a, 0xf2, 0x56, 0x0f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x30, 0xa8,
-	0xb8, 0x56, 0xf0, 0x0f, 0x00, 0x00,
+	// 1683 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x93, 0x1b, 0x49,
+	0x11, 0xd6, 0xa3, 0xa5, 0x56, 0xa7, 0x34, 0x0a, 0x51, 0x2c, 0x8b, 0x2c, 0xc3, 0xd8, 0xee, 0x7d,
+	0x39, 0x1c, 0x8b, 0xd6, 0xd6, 0xd8, 0xc4, 0xae, 0xf1, 0x12, 0x31, 0x0f, 0x85, 0x2d, 0xc2, 0x96,
+	0x44, 0xa9, 0x3d, 0x01, 0xa7, 0x8e, 0x96, 0xba, 0x46, 0x6a, 0xa6, 0x5f, 0x54, 0x55, 0x7b, 0x99,
+	0x1b, 0xb1, 0x5c, 0x38, 0xee, 0x89, 0x23, 0xff, 0x81, 0x1f, 0x41, 0x04, 0x37, 0xf6, 0xc8, 0x0d,
+	0xc2, 0xfe, 0x23, 0x44, 0x3d, 0x5a, 0xea, 0x79, 0x79, 0x66, 0x08, 0x6e, 0x9d, 0x99, 0x5f, 0x56,
+	0x56, 0x57, 0x7e, 0x99, 0x59, 0x05, 0x3f, 0x0c, 0x62, 0x4e, 0x13, 0x96, 0x92, 0x05, 0x0f, 0x92,
+	0xb8, 0x9f, 0xd2, 0x84, 0x27, 0xa8, 0x73, 0x46, 0x39, 0xef, 0xfd, 0x6c, 0x19, 0xf0, 0x55, 0x36,
+	0xef, 0x2f, 0x92, 0xe8, 0x8b, 0x65, 0xb2, 0x4c, 0xbe, 0x90, 0xc0, 0x79, 0x76, 0x24, 0x25, 0x29,
+	0xc8, 0x2f, 0xb5, 0x40, 0xef, 0xce, 0x32, 0x49, 0x96, 0x21, 0xd9, 0xa0, 0x78, 0x10, 0x11, 0xc6,
+	0xbd, 0x28, 0x55, 0x00, 0xfb, 0x1e, 0x98, 0x87, 0x84, 0xb2, 0x20, 0x89, 0xd1, 0x87, 0x50, 0x8f,
+	0xb3, 0x68, 0x4e, 0x68, 0xb7, 0x7c, 0xb7, 0x7c, 0x7f, 0x0b, 0x6b, 0xc9, 0x7e, 0x0e, 0x5b, 0x98,
+	0xb0, 0x2c, 0xe4, 0xfb, 0x49, 0x16, 0x73, 0x42, 0xd1, 0x07, 0x50, 0xe3, 0x09, 0xf7, 0x42, 0x8d,
+	0x53, 0x02, 0x6a, 0x43, 0x25, 0x39, 0xee, 0x56, 0xa4, 0xaa, 0x92, 0x1c, 0xa3, 0x0e, 0x54, 0x09,
+	0xa5, 0xdd, 0xaa, 0x54, 0x88, 0x4f, 0xfb, 0xaf, 0x15, 0x68, 0xcf, 0xc2, 0xc0, 0x0f, 0xe2, 0x65,
+	0xbe, 0xd4, 0x8f, 0xc1, 0x4c, 0xde, 0x10, 0xea, 0x3e, 0x8a, 0xf2, 0xa0, 0x42, 0x7c, 0x14, 0xad,
+	0x0d, 0x4f, 0x22, 0xbd, 0xa4, 0x34, 0x3c, 0x89, 0xd0, 0x2d, 0x68, 0x28, 0x8f, 0x27, 0x91, 0x5e,
+	0x5b, 0x02, 0x1f, 0x15, 0x4c, 0x3b, 0x0f, 0xa3, 0xae, 0xb1, 0x31, 0xed, 0x3c, 0x2c, 0x78, 0xad,
+	0x68, 0xb7, 0x56, 0xf0, 0x5a, 0xd1, 0xb5, 0x69, 0xb0, 0xa2, 0xdd, 0xfa, 0xc6, 0x34, 0x28, 0x98,
+	0x1e, 0xaf, 0x68, 0xd7, 0xdc, 0x98, 0x1e, 0x17, 0x4c, 0x5f, 0xae, 0x68, 0xb7, 0xb1, 0x31, 0x7d,
+	0xb9, 0xa2, 0xe8, 0x36, 0x58, 0x2a, 0x96, 0x58, 0xd1, 0x92, 0x36, 0x89, 0x15, 0xf2, 0xda, 0x38,
+	0x10, 0x6b, 0xc2, 0xc6, 0x28, 0x64, 0x7b, 0x0e, 0xd6, 0x81, 0xc7, 0xbd, 0xe7, 0x5e, 0xb6, 0x24,
+	0x02, 0xb9, 0xc8, 0x22, 0x77, 0x7e, 0xc2, 0x09, 0x93, 0x87, 0x63, 0xe0, 0xc6, 0x22, 0x8b, 0xf6,
+	0x84, 0x8c, 0xee, 0x40, 0x53, 0x18, 0x53, 0x6f, 0x71, 0x4c, 0x38, 0x93, 0x47, 0x64, 0x60, 0x58,
+	0x64, 0xd1, 0x54, 0x69, 0xc4, 0xf9, 0x05, 0x31, 0xe3, 0xee, 0xfc, 0x1b, 0x79, 0x4a, 0x06, 0xae,
+	0x0b, 0x71, 0xef, 0x1b, 0xfb, 0x8f, 0x65, 0x30, 0x71, 0x16, 0x0b, 0x1e, 0xa0, 0x4f, 0xa1, 0x1d,
+	0x44, 0x69, 0x48, 0x22, 0x12, 0x73, 0x4f, 0x30, 0x4c, 0xc6, 0xb1, 0xf0, 0x19, 0x2d, 0xea, 0x82,
+	0xf9, 0x46, 0x91, 0x44, 0x46, 0xb2, 0x70, 0x2e, 0xa2, 0x1e, 0x34, 0xd2, 0xd0, 0xe3, 0x47, 0x09,
+	0x55, 0xd9, 0xb0, 0xf0, 0x5a, 0x16, 0x5b, 0x48, 0x09, 0xa1, 0x6e, 0xe0, 0xcb, 0x6c, 0x58, 0xb8,
+	0x2e, 0xc4, 0x91, 0x6f, 0xff, 0x06, 0x5a, 0xc3, 0xd8, 0x4f, 0x93, 0x20, 0xe6, 0x53, 0x2f, 0xa0,
+	0xe8, 0x23, 0xd8, 0x62, 0x74, 0xe1, 0x46, 0x59, 0xc8, 0x03, 0xcf, 0xf7, 0xa9, 0xde, 0x45, 0x8b,
+	0xd1, 0xc5, 0xab, 0x5c, 0x27, 0x40, 0x3e, 0xe3, 0x05, 0x90, 0xda, 0x49, 0xcb, 0x67, 0x7c, 0x0d,
+	0xb2, 0xff, 0x54, 0x06, 0xd3, 0xa1, 0xde, 0xd1, 0x51, 0xb0, 0x40, 0x4f, 0x01, 0xb8, 0xfa, 0x74,
+	0x03, 0xf5, 0x63, 0xcd, 0xc1, 0xed, 0xfe, 0xd9, 0x82, 0xea, 0xaf, 0x0f, 0x1c, 0x5b, 0x1a, 0x3e,
+	0x8a, 0xd1, 0x33, 0x68, 0xe6, 0xbe, 0x49, 0xc6, 0x65, 0xa8, 0x2b, 0x9c, 0xf3, 0x58, 0x93, 0x8c,
+	0xdb, 0x2e, 0xc0, 0x8c, 0x53, 0xe2, 0x45, 0x2f, 0x03, 0xc6, 0xd1, 0x4f, 0x01, 0x98, 0x94, 0xdc,
+	0xc0, 0x17, 0x89, 0xac, 0xde, 0x6f, 0x61, 0x4b, 0x69, 0x46, 0x3e, 0x43, 0x03, 0x30, 0x95, 0x20,
+	0xb2, 0x58, 0xbd, 0xdf, 0x1c, 0x74, 0xcf, 0x87, 0x51, 0xab, 0xe1, 0x1c, 0x68, 0xff, 0xcd, 0x04,
+	0xd8, 0x4f, 0xe2, 0x58, 0x21, 0x44, 0xe5, 0x05, 0xbe, 0x3e, 0xb4, 0x4a, 0xe0, 0x17, 0x0f, 0xbe,
+	0x52, 0x3c, 0x78, 0xf4, 0x10, 0xea, 0x8c, 0x7b, 0x3c, 0x63, 0x32, 0x57, 0xed, 0x8b, 0x43, 0x09,
+	0x3b, 0xd6, 0x38, 0x74, 0x0f, 0x5a, 0x9c, 0x7a, 0x31, 0x4b, 0x13, 0xca, 0xf3, 0x44, 0xb6, 0x70,
+	0x73, 0xad, 0x1b, 0xf9, 0xe8, 0x19, 0x58, 0x44, 0x67, 0x93, 0xc9, 0xda, 0x6a, 0x0e, 0xb6, 0xcf,
+	0xaf, 0x5b, 0x4c, 0x38, 0xde, 0x38, 0xa0, 0x5d, 0x68, 0x08, 0x2a, 0x86, 0x41, 0x4c, 0x64, 0xf5,
+	0x35, 0x07, 0x9f, 0x9c, 0x77, 0xde, 0xfc, 0x6b, 0xdf, 0xd1, 0x60, 0xbc, 0x76, 0x43, 0x0f, 0xc0,
+	0xa0, 0x49, 0x48, 0x64, 0x85, 0xb6, 0x07, 0x1f, 0x9e, 0x77, 0xc7, 0x49, 0x48, 0xb0, 0xc4, 0xa0,
+	0x1d, 0x30, 0x75, 0xa2, 0x64, 0xd5, 0x36, 0x07, 0xb7, 0xce, 0xc3, 0x35, 0x81, 0x70, 0x8e, 0x44,
+	0xbb, 0x60, 0x7a, 0x9c, 0xd3, 0x60, 0xce, 0x64, 0x39, 0x37, 0x07, 0x9f, 0xbd, 0x77, 0x8b, 0xbb,
+	0x12, 0x9b, 0x71, 0xc2, 0x70, 0xee, 0x27, 0x48, 0x10, 0x7a, 0x9c, 0xc4, 0x8b, 0x13, 0x37, 0x66,
+	0xb2, 0xee, 0x0d, 0x6c, 0x69, 0xcd, 0x98, 0xa1, 0x9f, 0x6f, 0x48, 0xd0, 0x94, 0x11, 0x7e, 0x72,
+	0x19, 0x09, 0x04, 0xa5, 0xd6, 0x44, 0x40, 0xb7, 0xc0, 0x5c, 0x24, 0x71, 0x2c, 0x32, 0xd3, 0x11,
+	0x99, 0x7e, 0x51, 0xc2, 0x75, 0xa1, 0x18, 0xf9, 0x68, 0x00, 0x86, 0xf8, 0xea, 0xfe, 0xe0, 0xb2,
+	0xf5, 0x36, 0x3b, 0x7e, 0x51, 0xc2, 0x12, 0x8b, 0x3e, 0x07, 0x94, 0x31, 0x42, 0xdd, 0x94, 0x26,
+	0x6f, 0x02, 0x9f, 0xf8, 0x2e, 0xf7, 0x96, 0xac, 0xbb, 0xb8, 0x5b, 0xbd, 0x6f, 0xe1, 0x8e, 0xb0,
+	0x4c, 0xb5, 0xc1, 0xf1, 0x96, 0xac, 0xf7, 0xf7, 0x32, 0x34, 0xf2, 0x74, 0xa0, 0xaf, 0xc0, 0x4c,
+	0x52, 0x12, 0xbb, 0x9c, 0xe9, 0x52, 0xeb, 0xf5, 0xd5, 0xe8, 0xe9, 0xe7, 0xa3, 0x47, 0xa6, 0x4e,
+	0x8e, 0x9e, 0x3d, 0xe3, 0xbb, 0x7f, 0xdf, 0x29, 0xe3, 0xba, 0x70, 0x70, 0x04, 0x05, 0x9a, 0x59,
+	0xba, 0xa4, 0x9e, 0x0c, 0xc8, 0x74, 0xb1, 0x5d, 0xed, 0x0e, 0xb9, 0x93, 0xc3, 0xd0, 0x2f, 0xa0,
+	0xb1, 0x08, 0x13, 0x46, 0x84, 0x7f, 0xf5, 0x9a, 0xfe, 0xa6, 0xf4, 0x70, 0x58, 0x6f, 0x0c, 0xb0,
+	0x49, 0x19, 0xba, 0x0b, 0x4d, 0xd9, 0x63, 0xd2, 0x90, 0xfc, 0x81, 0xe4, 0xad, 0xa8, 0xa8, 0x42,
+	0xdb, 0x00, 0x24, 0x5e, 0xd0, 0x93, 0x94, 0x6f, 0x1a, 0x62, 0x41, 0xb3, 0xd7, 0x86, 0x16, 0x25,
+	0xa1, 0x77, 0x42, 0x7c, 0x57, 0x74, 0xf6, 0x5f, 0x19, 0x8d, 0x56, 0xa7, 0x63, 0x7f, 0x5b, 0x83,
+	0xba, 0x4a, 0xe1, 0xb9, 0x7a, 0x15, 0x4d, 0x54, 0xec, 0x72, 0x91, 0x84, 0x7a, 0xb9, 0xb5, 0xbc,
+	0x26, 0x77, 0xf5, 0x66, 0xe4, 0x36, 0xae, 0x4d, 0xee, 0xa7, 0x9a, 0x27, 0xaa, 0x72, 0x3f, 0xbd,
+	0x8c, 0x77, 0x05, 0xba, 0x60, 0x72, 0xa4, 0xf9, 0xf2, 0xf5, 0xb9, 0xe2, 0xbd, 0x77, 0xa9, 0xff,
+	0x05, 0x85, 0xbb, 0x69, 0x47, 0xe6, 0x35, 0xdb, 0xd1, 0xe9, 0x32, 0xea, 0x9c, 0x2d, 0xa3, 0x9b,
+	0xf1, 0x37, 0x84, 0xad, 0x53, 0x3f, 0xb5, 0x2e, 0x99, 0xf2, 0x0d, 0x4a, 0xa6, 0x50, 0x81, 0x95,
+	0xd3, 0x15, 0xb8, 0xd7, 0x02, 0x58, 0xac, 0x1d, 0x7a, 0xdf, 0xfe, 0x9f, 0xaa, 0xa5, 0x48, 0xf5,
+	0xca, 0x0d, 0xa9, 0x6e, 0xff, 0xb3, 0x0e, 0xd5, 0x83, 0x17, 0xce, 0x29, 0xc6, 0x95, 0xcf, 0x30,
+	0xae, 0x0b, 0x26, 0x89, 0xbd, 0x79, 0x48, 0xd4, 0x1f, 0x35, 0x70, 0x2e, 0x8a, 0xd0, 0x8c, 0x7b,
+	0x94, 0xdf, 0xa8, 0xca, 0xa4, 0x87, 0xc3, 0xd0, 0x63, 0xa8, 0xa7, 0x1e, 0x15, 0x1d, 0xce, 0xb8,
+	0xec, 0x78, 0x0f, 0x5e, 0x38, 0xfd, 0xa9, 0xc4, 0x60, 0x8d, 0x45, 0x8f, 0xa0, 0xf6, 0xfb, 0x8c,
+	0xd0, 0x93, 0x6e, 0x4d, 0xce, 0xc6, 0xdb, 0x17, 0x3b, 0xfd, 0x5a, 0x40, 0xb0, 0x42, 0xf6, 0x66,
+	0x50, 0x57, 0x8b, 0xa0, 0x16, 0x94, 0x8f, 0xf5, 0xcd, 0xa9, 0x7c, 0x2c, 0x6e, 0xad, 0x5e, 0x98,
+	0xae, 0x3c, 0x7d, 0x59, 0x52, 0x02, 0xfa, 0x04, 0xda, 0x7e, 0xc0, 0x7e, 0x27, 0x86, 0x91, 0x9b,
+	0x7a, 0x7c, 0xc5, 0xf4, 0x75, 0x69, 0x2b, 0xd7, 0x4e, 0x85, 0xb2, 0xf7, 0x17, 0x03, 0x6a, 0x32,
+	0xca, 0xb9, 0xe2, 0xfd, 0x18, 0xda, 0xdc, 0xa3, 0x4b, 0xc2, 0xdd, 0xd3, 0x33, 0xb7, 0xa5, 0xb4,
+	0x53, 0x35, 0x79, 0x6d, 0xd8, 0x92, 0xb7, 0x64, 0x57, 0x90, 0xdf, 0x8d, 0xf2, 0x28, 0x4d, 0xa9,
+	0x14, 0x67, 0xf6, 0x4a, 0xde, 0xe9, 0x14, 0x86, 0x71, 0x92, 0xaa, 0x63, 0x32, 0x30, 0x48, 0xd5,
+	0x4c, 0x68, 0xc4, 0x9d, 0x53, 0xc7, 0x60, 0xf2, 0x3c, 0x2c, 0x6c, 0xaa, 0xc1, 0xce, 0xd0, 0xd7,
+	0xa2, 0xf4, 0x83, 0xe5, 0x92, 0xa8, 0x3b, 0x6c, 0x7b, 0xf0, 0xd1, 0x7b, 0x4e, 0xaa, 0xef, 0x28,
+	0x28, 0xce, 0x7d, 0xd0, 0x63, 0x30, 0xf8, 0x49, 0x9a, 0x8f, 0xd0, 0xbb, 0xef, 0xf5, 0x3d, 0x49,
+	0x09, 0x96, 0x68, 0xf4, 0x14, 0xea, 0x54, 0x3e, 0x0c, 0xe4, 0x2c, 0x6d, 0x0f, 0xec, 0xf7, 0xf9,
+	0xa9, 0x27, 0x04, 0xd6, 0x1e, 0xa2, 0x02, 0x18, 0x89, 0x25, 0x95, 0xac, 0xeb, 0x56, 0x80, 0x70,
+	0x70, 0x98, 0x78, 0xb2, 0xe8, 0x1f, 0x40, 0x26, 0x54, 0x77, 0xa7, 0xa3, 0x4e, 0x09, 0x6d, 0x81,
+	0x75, 0x30, 0x9a, 0xed, 0x4f, 0x0e, 0x87, 0xf8, 0xb7, 0x9d, 0xb2, 0xfd, 0x39, 0x18, 0x62, 0x9f,
+	0xa8, 0x09, 0xe6, 0xfe, 0x64, 0xec, 0x0c, 0xc7, 0x4e, 0xa7, 0x84, 0x5a, 0xd0, 0x98, 0xe2, 0xc9,
+	0xe1, 0xe8, 0x60, 0x88, 0x3b, 0x65, 0x64, 0x41, 0xed, 0x70, 0xf7, 0xe5, 0xeb, 0x61, 0xa7, 0x62,
+	0x3f, 0x85, 0xba, 0xda, 0x9d, 0xc0, 0xcf, 0x5e, 0xef, 0xef, 0x0f, 0x67, 0xb3, 0x4e, 0x49, 0x20,
+	0x86, 0x18, 0x4f, 0x04, 0xb8, 0x09, 0xa6, 0x33, 0x7a, 0x35, 0x9c, 0xbc, 0x76, 0x3a, 0x15, 0x21,
+	0x4c, 0x87, 0xe3, 0x83, 0xd1, 0xf8, 0x79, 0xa7, 0x6a, 0x67, 0x00, 0xb3, 0x6c, 0xce, 0x4e, 0x18,
+	0x27, 0x11, 0x43, 0xbf, 0x84, 0xe6, 0xa6, 0xe4, 0xd5, 0x65, 0xef, 0x8a, 0x46, 0x82, 0x8b, 0x0e,
+	0xe8, 0x33, 0xa8, 0xfa, 0xab, 0xfc, 0xbe, 0xf9, 0xa3, 0x0b, 0x8f, 0x13, 0x0b, 0x84, 0xfd, 0xe7,
+	0x2a, 0xd4, 0x44, 0x6f, 0x94, 0x4d, 0x3f, 0xbf, 0x9b, 0x97, 0x2f, 0x6b, 0xfa, 0xfa, 0x85, 0xb7,
+	0xb9, 0xb6, 0xef, 0x80, 0x49, 0xd5, 0x1b, 0x40, 0xc7, 0xba, 0xc0, 0x49, 0x3f, 0x12, 0x70, 0x8e,
+	0x44, 0xcf, 0x00, 0xd8, 0xfa, 0x57, 0x75, 0x03, 0xb8, 0xe8, 0x9e, 0xb2, 0xc6, 0xe0, 0x02, 0xfe,
+	0x7f, 0x1b, 0x4e, 0x5f, 0x01, 0x88, 0x67, 0x8b, 0xa7, 0x88, 0x52, 0xbb, 0x8a, 0x28, 0xd8, 0xd2,
+	0x68, 0x87, 0xa1, 0x27, 0x85, 0x66, 0x55, 0xbf, 0xd2, 0x71, 0xdd, 0xa6, 0x1e, 0xc2, 0x07, 0x2c,
+	0xf6, 0x52, 0xb6, 0x4a, 0xb8, 0xeb, 0x67, 0x54, 0xbe, 0x7f, 0x44, 0xbd, 0xaa, 0xe7, 0x1f, 0xca,
+	0x6d, 0x07, 0xda, 0xf4, 0x8a, 0x3d, 0x18, 0x8a, 0xb9, 0x2e, 0xa7, 0x13, 0x40, 0x7d, 0x77, 0xdf,
+	0x19, 0x1d, 0x0e, 0x3b, 0x25, 0xf1, 0xbd, 0xff, 0x72, 0x32, 0x1b, 0x1e, 0x28, 0xf6, 0x4c, 0xa6,
+	0xc3, 0xb1, 0x20, 0x8c, 0x64, 0x8f, 0x30, 0x48, 0xf6, 0x6c, 0x28, 0x66, 0x3c, 0xf8, 0x18, 0x0c,
+	0x31, 0xca, 0x05, 0x93, 0x47, 0xe3, 0x91, 0x33, 0xda, 0x75, 0x26, 0x58, 0x11, 0x1b, 0x0f, 0x67,
+	0xd3, 0xc9, 0x58, 0xb2, 0x76, 0xaf, 0xfb, 0x8f, 0xb7, 0xdb, 0xe5, 0xef, 0xdf, 0x6e, 0x97, 0xff,
+	0xf3, 0x76, 0xbb, 0xfc, 0xdd, 0xbb, 0xed, 0xd2, 0xf7, 0xef, 0xb6, 0x4b, 0xff, 0x7a, 0xb7, 0x5d,
+	0x9a, 0xd7, 0xe5, 0x5f, 0xed, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x98, 0x28, 0x60, 0xfb, 0x48,
+	0x10, 0x00, 0x00,
 }
 
 func (m *Version) Marshal() (dAtA []byte, err error) {
diff --git a/introspect/pb/introspection.proto b/introspection/pb/introspection.proto
similarity index 99%
rename from introspect/pb/introspection.proto
rename to introspection/pb/introspection.proto
index ceac5c8e..a99d1a2c 100644
--- a/introspect/pb/introspection.proto
+++ b/introspection/pb/introspection.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package introspect.pb;
+package introspection.pb;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
@@ -8,6 +8,7 @@ import "google/protobuf/timestamp.proto";
 message Version {
     uint32 number = 1;
 }
+
 // ResultCounter is a monotonically increasing counter that reports an ok/err breakdown of the total.
 message ResultCounter {
     uint32 total = 1;
diff --git a/introspect/providers.go b/introspection/providers.go
similarity index 78%
rename from introspect/providers.go
rename to introspection/providers.go
index ee2f85bf..599729db 100644
--- a/introspect/providers.go
+++ b/introspection/providers.go
@@ -1,6 +1,6 @@
-package introspect
+package introspection
 
-import introspect_pb "github.com/libp2p/go-libp2p-core/introspect/pb"
+import introspection_pb "github.com/libp2p/go-libp2p-core/introspection/pb"
 
 type (
 	// QueryOutput determines the output form of a query result.
@@ -28,19 +28,19 @@ const (
 // of processing entity queries.
 type DataProviders struct {
 	// Runtime is the provider function that returns system runtime information.
-	Runtime func() (*introspect_pb.Runtime, error)
+	Runtime func() (*introspection_pb.Runtime, error)
 
 	// Connection is the provider that is called when information about
 	// Connections is required.
-	Connection func(ConnectionQueryParams) ([]*introspect_pb.Connection, error)
+	Connection func(ConnectionQueryParams) ([]*introspection_pb.Connection, error)
 
 	// Stream is the provider that is called when information about Streams is
 	// required.
-	Stream func(StreamQueryParams) (*introspect_pb.StreamList, error)
+	Stream func(StreamQueryParams) (*introspection_pb.StreamList, error)
 
 	// Traffic is the provider that is called when information about network
 	// statistics is required.
-	Traffic func() (*introspect_pb.Traffic, error)
+	Traffic func() (*introspection_pb.Traffic, error)
 }
 
 type ConnectionQueryParams struct {