diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 68dedf9..3ce1680 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -22,7 +22,8 @@ "https://bcr.bazel.build/modules/apple_support/1.13.0/MODULE.bazel": "7c8cdea7e031b7f9f67f0b497adf6d2c6a2675e9304ca93a9af6ed84eef5a524", "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", "https://bcr.bazel.build/modules/apple_support/1.17.1/MODULE.bazel": "655c922ab1209978a94ef6ca7d9d43e940cd97d9c172fb55f94d91ac53f8610b", - "https://bcr.bazel.build/modules/apple_support/1.17.1/source.json": "6b2b8c74d14e8d485528a938e44bdb72a5ba17632b9e14ef6e68a5ee96c8347f", + "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", + "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "7bee702b4862612f29333590f4b658a5832d433d6f8e4395f090e8f4e85d442f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "6307fec451ba9962c1c969eb516ebfe1e46528f7fa92e1c9ac8646bef4cdaa3f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.40.3/MODULE.bazel": "668e6bcb4d957fc0e284316dba546b705c8d43c857f87119619ee83c4555b859", @@ -40,6 +41,7 @@ "https://bcr.bazel.build/modules/bazel_features/1.19.0/MODULE.bazel": "59adcdf28230d220f0067b1f435b8537dd033bfff8db21335ef9217919c7fb58", "https://bcr.bazel.build/modules/bazel_features/1.21.0/MODULE.bazel": "675642261665d8eea09989aa3b8afb5c37627f1be178382c320d1b46afba5e3b", "https://bcr.bazel.build/modules/bazel_features/1.23.0/MODULE.bazel": "fd1ac84bc4e97a5a0816b7fd7d4d4f6d837b0047cf4cbd81652d616af3a6591a", + "https://bcr.bazel.build/modules/bazel_features/1.27.0/MODULE.bazel": "621eeee06c4458a9121d1f104efb80f39d34deff4984e778359c60eaf1a8cb65", "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9", "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87", "https://bcr.bazel.build/modules/bazel_features/1.30.0/source.json": "b07e17f067fe4f69f90b03b36ef1e08fe0d1f3cac254c1241a1818773e3423bc", @@ -340,37 +342,6 @@ }, "selectedYankedVersions": {}, "moduleExtensions": { - "@@apple_support+//crosstool:setup.bzl%apple_cc_configure_extension": { - "general": { - "bzlTransitiveDigest": "xcBTf2+GaloFpg7YEh/Bv+1yAczRkiCt3DGws4K7kSk=", - "usagesDigest": "ypfdsRT1Lze/3i07sp0fc1st5t9vrHXgYeCPQdYKeDo=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "local_config_apple_cc_toolchains": { - "repoRuleId": "@@apple_support+//crosstool:setup.bzl%_apple_cc_autoconf_toolchains", - "attributes": {} - }, - "local_config_apple_cc": { - "repoRuleId": "@@apple_support+//crosstool:setup.bzl%_apple_cc_autoconf", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [ - [ - "apple_support+", - "bazel_tools", - "bazel_tools" - ], - [ - "bazel_tools", - "rules_cc", - "rules_cc+" - ] - ] - } - }, "@@cel-spec+//:extensions.bzl%non_module_dependencies": { "general": { "bzlTransitiveDigest": "8nZQmgB3HxICOnyv0klog1TNWAs02cNK3ZCw7EjqZMc=", diff --git a/proto/collector/collector.pb.go b/proto/collector/collector.pb.go index ae47616..80195f5 100644 --- a/proto/collector/collector.pb.go +++ b/proto/collector/collector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.8 +// protoc-gen-go v1.36.9 // protoc v6.32.0 // source: github.com/openconfig/gnmi/proto/collector/collector.proto diff --git a/proto/gnmi/gnmi.pb.go b/proto/gnmi/gnmi.pb.go index 0413011..488a20a 100644 --- a/proto/gnmi/gnmi.pb.go +++ b/proto/gnmi/gnmi.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.8 +// protoc-gen-go v1.36.9 // protoc v6.32.0 // source: github.com/openconfig/gnmi/proto/gnmi/gnmi.proto @@ -1376,12 +1376,13 @@ func (x *SubscriptionList) GetUpdatesOnly() bool { } type Subscription struct { - state protoimpl.MessageState `protogen:"open.v1"` - Path *Path `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - Mode SubscriptionMode `protobuf:"varint,2,opt,name=mode,proto3,enum=gnmi.SubscriptionMode" json:"mode,omitempty"` - SampleInterval uint64 `protobuf:"varint,3,opt,name=sample_interval,json=sampleInterval,proto3" json:"sample_interval,omitempty"` - SuppressRedundant bool `protobuf:"varint,4,opt,name=suppress_redundant,json=suppressRedundant,proto3" json:"suppress_redundant,omitempty"` - HeartbeatInterval uint64 `protobuf:"varint,5,opt,name=heartbeat_interval,json=heartbeatInterval,proto3" json:"heartbeat_interval,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Path *Path `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Mode SubscriptionMode `protobuf:"varint,2,opt,name=mode,proto3,enum=gnmi.SubscriptionMode" json:"mode,omitempty"` + SampleInterval uint64 `protobuf:"varint,3,opt,name=sample_interval,json=sampleInterval,proto3" json:"sample_interval,omitempty"` + // Deprecated: Marked as deprecated in github.com/openconfig/gnmi/proto/gnmi/gnmi.proto. + SuppressRedundant bool `protobuf:"varint,4,opt,name=suppress_redundant,json=suppressRedundant,proto3" json:"suppress_redundant,omitempty"` + HeartbeatInterval uint64 `protobuf:"varint,5,opt,name=heartbeat_interval,json=heartbeatInterval,proto3" json:"heartbeat_interval,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -1437,6 +1438,7 @@ func (x *Subscription) GetSampleInterval() uint64 { return 0 } +// Deprecated: Marked as deprecated in github.com/openconfig/gnmi/proto/gnmi/gnmi.proto. func (x *Subscription) GetSuppressRedundant() bool { if x != nil { return x.SuppressRedundant @@ -2159,13 +2161,13 @@ const file_github_com_openconfig_gnmi_proto_gnmi_gnmi_proto_rawDesc = "" + "\n" + "\x06STREAM\x10\x00\x12\b\n" + "\x04ONCE\x10\x01\x12\b\n" + - "\x04POLL\x10\x02J\x04\b\x03\x10\x04R\vuse_aliases\"\xe1\x01\n" + + "\x04POLL\x10\x02J\x04\b\x03\x10\x04R\vuse_aliases\"\xe5\x01\n" + "\fSubscription\x12\x1e\n" + "\x04path\x18\x01 \x01(\v2\n" + ".gnmi.PathR\x04path\x12*\n" + "\x04mode\x18\x02 \x01(\x0e2\x16.gnmi.SubscriptionModeR\x04mode\x12'\n" + - "\x0fsample_interval\x18\x03 \x01(\x04R\x0esampleInterval\x12-\n" + - "\x12suppress_redundant\x18\x04 \x01(\bR\x11suppressRedundant\x12-\n" + + "\x0fsample_interval\x18\x03 \x01(\x04R\x0esampleInterval\x121\n" + + "\x12suppress_redundant\x18\x04 \x01(\bB\x02\x18\x01R\x11suppressRedundant\x12-\n" + "\x12heartbeat_interval\x18\x05 \x01(\x04R\x11heartbeatInterval\"&\n" + "\n" + "QOSMarking\x12\x18\n" + @@ -2249,7 +2251,7 @@ const file_github_com_openconfig_gnmi_proto_gnmi_gnmi_proto_rawDesc = "" + "\x03Get\x12\x10.gnmi.GetRequest\x1a\x11.gnmi.GetResponse\x12*\n" + "\x03Set\x12\x10.gnmi.SetRequest\x1a\x11.gnmi.SetResponse\x12@\n" + "\tSubscribe\x12\x16.gnmi.SubscribeRequest\x1a\x17.gnmi.SubscribeResponse(\x010\x01:@\n" + - "\fgnmi_service\x12\x1c.google.protobuf.FileOptions\x18\xe9\a \x01(\tR\vgnmiServiceBT\xca>\x060.10.0\n" + + "\fgnmi_service\x12\x1c.google.protobuf.FileOptions\x18\xe9\a \x01(\tR\vgnmiServiceBT\xca>\x060.11.0\n" + "\x15com.github.gnmi.protoB\tGnmiProtoP\x01Z%github.com/openconfig/gnmi/proto/gnmib\x06proto3" var ( diff --git a/proto/gnmi/gnmi.proto b/proto/gnmi/gnmi.proto index da0fed3..b8a4435 100644 --- a/proto/gnmi/gnmi.proto +++ b/proto/gnmi/gnmi.proto @@ -38,7 +38,7 @@ extend google.protobuf.FileOptions { // gNMI_service is the current version of the gNMI service, returned through // the Capabilities RPC. -option (gnmi_service) = "0.10.0"; +option (gnmi_service) = "0.11.0"; option go_package = "github.com/openconfig/gnmi/proto/gnmi"; option java_multiple_files = true; @@ -302,17 +302,13 @@ message Subscription { SubscriptionMode mode = 2; // Subscription mode to be used. uint64 sample_interval = 3; // ns between samples in SAMPLE mode. // Indicates whether values that have not changed should be sent in a SAMPLE - // subscription. - bool suppress_redundant = 4; - // 1. A heartbeat interval MAY be specified along with an “on change” + // subscription. NOTE: This field has been deprecated as of gNMI service + // version 0.11.0. + bool suppress_redundant = 4 [deprecated = true]; + // A heartbeat interval MAY be specified along with an “on change” // subscription - in this case, the value of the data item(s) MUST be re-sent // once per heartbeat interval regardless of whether the value has changed or // not. - // 2. A heartbeat_interval MAY be specified to modify the behavior of - // suppress_redundant in a sampled subscription. In this case, the - // target MUST generate one telemetry update per heartbeat interval, - // regardless of whether the suppress_redundant flag is set to true. - // This value is specified as an unsigned 64-bit integer in nanoseconds uint64 heartbeat_interval = 5; } diff --git a/proto/gnmi_ext/gnmi_ext.pb.go b/proto/gnmi_ext/gnmi_ext.pb.go index ae191af..b429c08 100644 --- a/proto/gnmi_ext/gnmi_ext.pb.go +++ b/proto/gnmi_ext/gnmi_ext.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.8 +// protoc-gen-go v1.36.9 // protoc v6.32.0 // source: github.com/openconfig/gnmi/proto/gnmi_ext/gnmi_ext.proto diff --git a/proto/target/target.pb.go b/proto/target/target.pb.go index 6635eb9..3317888 100644 --- a/proto/target/target.pb.go +++ b/proto/target/target.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.8 +// protoc-gen-go v1.36.9 // protoc v6.32.0 // source: github.com/openconfig/gnmi/proto/target/target.proto diff --git a/testing/fake/proto/fake.pb.go b/testing/fake/proto/fake.pb.go index a4a97ad..09e972f 100644 --- a/testing/fake/proto/fake.pb.go +++ b/testing/fake/proto/fake.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.8 +// protoc-gen-go v1.36.9 // protoc v6.32.0 // source: github.com/openconfig/gnmi/testing/fake/proto/fake.proto