From cb1c8de6b1414a6b3d0729a6ede4a5570fb86068 Mon Sep 17 00:00:00 2001 From: Lee Avital Date: Thu, 29 Aug 2024 15:32:18 -0400 Subject: [PATCH] Avoid re-downloading and rebuilding gogo every time we run codegen Adds a `rake setup_gogo` task which will clone gogo into a new toolchains directory (which is git ignored). On every run of codegen, we'll checkout a pinned version of gogo and rebuild it. This should be pretty fast as long as gogo is already checked out. --- .Rakefile.swo | Bin 0 -> 24576 bytes .github/workflows/test.yml | 2 +- .gitignore | 6 +- Rakefile | 112 +- autoscaling/kubernetes/autoscaling.pb.go | 18 +- contimage/contimage.pb.go | 26 +- contlcycle/contlcycle.pb.go | 2 +- cws/dumpsv1/activity_dump.pb.go | 2 +- cyclonedx_v1_4/bom-1.4.pb.go | 30 +- java/com/dd/cws/adv1/pb/SecDumpProto.java | 1373 +++++---------------- sbom/sbom.pb.go | 42 +- 11 files changed, 477 insertions(+), 1136 deletions(-) create mode 100644 .Rakefile.swo diff --git a/.Rakefile.swo b/.Rakefile.swo new file mode 100644 index 0000000000000000000000000000000000000000..25d2ecdeb986f1b1184f9c0680a4b909333383c2 GIT binary patch literal 24576 zcmeI4eT*Ds9mfX>lvg!i_(KwTy4QHuqchXpqfoA0+R}q-!^_pSw8ggU&CNc$JH6SN z&AjaOS`HD!NPs^||L_lE_(T6NO2SJd8a2jXFup`FNYbc5sGvp?|AB}JFXH!ko0;9c zz24C)8l6c#w>vY>JkRg>JumY-zu)h6YTe!)x04%;bsCOOXj*XLi?#UehgaTv)j66= zsbRI9$a2}u{>Qe7+jr{w_wF6Jt5hr%$NMI{H_gzj`(_x}X5EPz@swfvO>@kOtTDfC zT6OA0ddr%1eXDBjvZiUxacSR7^BcJaat)kb194Q-H(aKTl!|<)4-{6BD=xqD^v~rf zat-7f$Tg5_AlE>yfm{Q*267GL8u*{lK-4-<`#frMuB_2v`FT#)=Xvt{O8Gh6b^m;M zJ|aKw@4CN2o_|Vyey8icJk39H4dfcgHIQo{*Fdg;Tm!iVat-7f$Tg5_AlE>yfwQ0i ztEy>i&;AzM@WcPF_W!SaT+>d0SHaK0GvE$rov>$>W zfbWBEfD<4FyTEPWR&X_V?@~?s8KB@G7zPEf3cP-araccDU=n-|+y(Z7Pl7AJ$%{4Z zF;D>$;5u+Ic zKnYw0R)BNC>oCx~27U~#2A>A3&E8aon#K1G!VhXUd{P*v9u2I>@#>^WqrkC4(hB^@ zCqs3AO#w~HkDXihY%dQSi+ta;8v;HvMV(!j4FN{WfSApVXJNN%j}ED+;shVD1t&N>?_LPks$^zQ3}{o8J1E! zpHzY#Y574!#wUu!;_VY-ciwh$*@`1y)iI9WO-8j9U@c2G^27WFEIFtm1=*NR^jKy(%6S ze+dqjS&~1yP;)f)A&zF7IG*jsRca2CY)i+ zPsvi=`GnG4$BU2XM>bqnx$fF70jV3(jJ*Fb5&f`_fKH7ZAcfUKv1c_Y(Ze+bQYM8l zE0}S-0y#uBlBhwwOcm@ZF{5U-5k!X>liFj`N7C*+4VZQ*UhpcSvwkU)p>J5hESkBu z+<8YHA=$A8NhYlue)?f<94p! zsGVE3F}u7{{Z|arxkU`pWg4Oj4p1q_nGH{#$-IMeM7*GFze*8hI@&#Slb17pxcfam z-^;yHVz2kEd`1QjVKp}241l?-z!y`i+22t%QxU94ZrX9j{L3q`lES@Y6-Al|h$S{& zUmjKje4U}1j%AK`T4Fb-J&m;$X%~$Vqa<#RIe}p}@ID_ZWOD0{!DYoHqph$;E>+T+ zV785;5XB%JvD|=K)maGRd$bB^ux!laEy~Tj3={cS`uSeh9iG*NixqG3=NPBwT>jJ z+)UpUjf~YIdrgNe%cf*h_FVCfk#D}kq3?xg^rod&P36M%Bh~fSmqrSjOoQHzsXH`$&&Y5xlk$^Mf4r{yn0QS<;$|5ae;9eONX9)0l9`0OqM`L0$p`O{)Akw zvIR$WiOBTApWwTMzIU>VJC4$WlJXrf{3s%A-Dx%{tYFHjCQJsf zfmLY;>-w(PgQ>_Bc6#;@OGjXM;EqS%GuW1#`_PnegE`SgyK_YrJz36^ld!#en1*4Hdq_Q?@H(|g8_BUHzK0yK0yqqHj}!^gvTC#2dM!SBG;*4> zTv~^_?2HT=!-E8SbuKZ#!u)w>RBWb1l`)q98K){_SFrn6CC!ErZ4R-DHT^1yoa$_0 zjTDNt9WxM#XLmE#Bf&L@NIl!3X(mi)w*Q}lfBf%&?f+GL|9-ijzZsubf-hj7ejm6K z`~>!b=Rh5tf}j2w@H999)`KVDm;W}nAG`}+{5#-zz{(f~FM#b}9IOV%;Di4ceCzLn zlVBPg2AjY?;a7hd{0Mvn>;oUbzy4J)3QobN{vg-~_JVC-1Q_5mfPkyP`|zQ^0{#eo z4}J%J0iFU+f`@?%-Z)p&ehIz>9s-BKyYR7}1P_7xzz(npFpDE>qeoz_ip z$Hb$siBkN$0SyT6%LE+_%>|3utRDx2xysS?*<%?SsW7j`A@iuYzHPa@J1W2XT4nN; zIl|x?hZG)bj~QT*xpH8sY+>CTnw)7kb^~`OHK8$!7ar&2{WZ)D%9jJN6zJWX5mU zOv@yoA*P)0z{nvf4Zl4;v1?*tPe+1MSAwm(wsq!E>`E}PyW{zF>b5KqWltL9UK3Vk zOkO7S+9Ax3%-oz*!@xyyBQdMAZF;fmZY134iRgxj-RXBGNP5QPR%fh|lSbHbooJ|V z(8KT~{9tBZ(IGmDOU%(pgE7gv+l=Rt3d!cSq5)Iw4Qk>LIjboN$(v9xe!_#rD6m_3#~D%_j$? zbjy|ZE%+&tvzGBzshT_3KwNIgrB=>r8M~=HhE`oj_8PUK7=w^E?KMp+2pg7rP3);} zp>wo<-Miw2I#tvYPL#df8Caz5a93Q`*&q${Dz2&2Kd{M2D%lfzv~AyRqSQ>7K0)xiCEnB0>e#c8>gN23rg0&2>E!Qxl2tPvg$TY7NRsM*q92Y0|a z+3N?$4&fq{K@wewl}P>7AfM~fLsnxQ@kgT~ysM`r_<%OUDg4S0`_nP%`xnlivX`f9 zwkFCtkG9QnujSZ&Gi*`YsW~=+;C#;%el!z8>P6$)4nYY&mMrd)m4zs{)S<^hu^T}g zMzh)3BJDKY^GJGUOAV_ZG6F+Tt(RF_d^AlfdsFie| zxl7Gih&IG)A5#Q-)r(w{vtbm-l*VpJSx?u>{U`da5CpU{($@VjLhwVA27Tr_CD?FB zBQHi{>D-TBOB27oCaR~VdQ~!;>Wl1m+ZH#fJ8L-4tR%Xztgal~bFy2DfZZk5wr4y_ zrHKA~CK1MqmtOV^72AwB<=Lo#uu?X!im$>SzPPAjl?^JwLZn3oX_&OAa23%lYPWO7 z-7aZ|zExf@qM8e8O0i`Sb!YrE+y75uPd$dcHrxNJ|KI-rd;XJPCzt?h!2{U)UjWVr zuVC*Vf&h$x53uk5Gx#ZZ98|zc@O9V#ZUTS9{{KSr!Czq$ z_zUdGhQ ['install_protoc'] do + if ! Dir.exist?(gogo_dir) then + sh "mkdir -p #{gogo_dir}/src/github.com/gogo" + sh "git clone https://github.com/gogo/protobuf.git #{gogo_dir}/src/github.com/gogo/protobuf" + else + puts "gogo already cloned into #{gogo_dir}" + end + + Dir.chdir("#{gogo_dir}/src/github.com/gogo/protobuf") do + sh "git checkout v1.3.2" + sh "PATH=$PATH:/tmp GOBIN=#{toolchain_bin_dir} GOPATH=#{gogo_dir} make clean install" + end + end + - task :install_protoc do + task 'install_protoc' => ['install_protoc_2', 'install_protoc_3'] + + task :install_protoc_3 => ['codegen:install_protoc_2'] do if `bash -c "protoc --version"` != "libprotoc ${protoc_version}" protoc_binary="/tmp/protoc#{protoc_version}" sh <<-EOF @@ -26,12 +52,22 @@ namespace :codegen do else curl -OL https://github.com/google/protobuf/releases/download/v#{protoc_version}/protoc-#{protoc_version}-linux-x86_64.zip fi - unzip protoc-#{protoc_version}*.zip - mv bin/protoc #{protoc_binary} + unzip -o protoc-#{protoc_version}*.zip + mkir -p #{toolchain_bin_dir} + mv bin/protoc #{toolchain_bin_dir}/ + + + mkdir -p #{toolchain_include_dir} + rm -rf #{toolchain_include_dir}/** + mv include/* #{toolchain_include_dir}/ fi BASH EOF end + end + + + task :install_protoc_2 do if `bash -c "protoc --version"` != "libprotoc ${protoc_version_2}" protoc_binary_2="/tmp/protoc#{protoc_version_2}" sh <<-EOF @@ -44,72 +80,70 @@ BASH else curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v#{protoc_version_2}/protoc-#{protoc_version_2}-linux-x86_64.zip fi - unzip protoc-#{protoc_version_2}*.zip - mv bin/protoc #{protoc_binary_2} + unzip -o protoc-#{protoc_version_2}*.zip + mkdir -p #{toolchain_bin_dir} + mv bin/protoc #{toolchain_bin_dir}/protoc2 + + mkdir -p #{toolchain_include2_dir} + echo "here" + rm -rf #{toolchain_include2_dir}/** + mv include/* #{toolchain_include2_dir} fi BASH EOF - end end + end + + task :protoc => ['install_protoc', 'setup_gogo'] do - task :protoc => ['install_protoc'] do + puts "Generating logs proto" + sh "PATH=#{toolchain_bin_dir} protoc --proto_path=$GOPATH/src:#{gogo_dir}/src:. --gogofast_out=$GOPATH/src --java_out=java proto/logs/agent_logs_payload.proto" sh <<-EOF /bin/bash < datadog.autoscaling.kubernetes.WorkloadValues diff --git a/contimage/contimage.pb.go b/contimage/contimage.pb.go index 93b04de4..f787fbfb 100644 --- a/contimage/contimage.pb.go +++ b/contimage/contimage.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc v4.22.5 // source: proto/contimage/contimage.proto package contimage import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -110,8 +110,8 @@ type ContainerImage struct { RepoDigests []string `protobuf:"bytes,8,rep,name=repo_digests,json=repoDigests,proto3" json:"repo_digests,omitempty"` Os *ContainerImage_OperatingSystem `protobuf:"bytes,9,opt,name=os,proto3" json:"os,omitempty"` Layers []*ContainerImage_ContainerImageLayer `protobuf:"bytes,10,rep,name=layers,proto3" json:"layers,omitempty"` - BuiltAt *timestamp.Timestamp `protobuf:"bytes,11,opt,name=builtAt,proto3" json:"builtAt,omitempty"` - PublishedAt *timestamp.Timestamp `protobuf:"bytes,13,opt,name=publishedAt,proto3,oneof" json:"publishedAt,omitempty"` + BuiltAt *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=builtAt,proto3" json:"builtAt,omitempty"` + PublishedAt *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=publishedAt,proto3,oneof" json:"publishedAt,omitempty"` } func (x *ContainerImage) Reset() { @@ -223,14 +223,14 @@ func (x *ContainerImage) GetLayers() []*ContainerImage_ContainerImageLayer { return nil } -func (x *ContainerImage) GetBuiltAt() *timestamp.Timestamp { +func (x *ContainerImage) GetBuiltAt() *timestamppb.Timestamp { if x != nil { return x.BuiltAt } return nil } -func (x *ContainerImage) GetPublishedAt() *timestamp.Timestamp { +func (x *ContainerImage) GetPublishedAt() *timestamppb.Timestamp { if x != nil { return x.PublishedAt } @@ -385,11 +385,11 @@ type ContainerImage_ContainerImageLayer_History struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Created *timestamp.Timestamp `protobuf:"bytes,1,opt,name=created,proto3" json:"created,omitempty"` - CreatedBy string `protobuf:"bytes,2,opt,name=createdBy,proto3" json:"createdBy,omitempty"` - Author string `protobuf:"bytes,3,opt,name=author,proto3" json:"author,omitempty"` - Comment string `protobuf:"bytes,4,opt,name=comment,proto3" json:"comment,omitempty"` - EmptyLayer bool `protobuf:"varint,5,opt,name=emptyLayer,proto3" json:"emptyLayer,omitempty"` + Created *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=created,proto3" json:"created,omitempty"` + CreatedBy string `protobuf:"bytes,2,opt,name=createdBy,proto3" json:"createdBy,omitempty"` + Author string `protobuf:"bytes,3,opt,name=author,proto3" json:"author,omitempty"` + Comment string `protobuf:"bytes,4,opt,name=comment,proto3" json:"comment,omitempty"` + EmptyLayer bool `protobuf:"varint,5,opt,name=emptyLayer,proto3" json:"emptyLayer,omitempty"` } func (x *ContainerImage_ContainerImageLayer_History) Reset() { @@ -424,7 +424,7 @@ func (*ContainerImage_ContainerImageLayer_History) Descriptor() ([]byte, []int) return file_proto_contimage_contimage_proto_rawDescGZIP(), []int{1, 1, 0} } -func (x *ContainerImage_ContainerImageLayer_History) GetCreated() *timestamp.Timestamp { +func (x *ContainerImage_ContainerImageLayer_History) GetCreated() *timestamppb.Timestamp { if x != nil { return x.Created } @@ -567,7 +567,7 @@ var file_proto_contimage_contimage_proto_goTypes = []interface{}{ (*ContainerImage_OperatingSystem)(nil), // 2: datadog.contimage.ContainerImage.OperatingSystem (*ContainerImage_ContainerImageLayer)(nil), // 3: datadog.contimage.ContainerImage.ContainerImageLayer (*ContainerImage_ContainerImageLayer_History)(nil), // 4: datadog.contimage.ContainerImage.ContainerImageLayer.History - (*timestamp.Timestamp)(nil), // 5: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp } var file_proto_contimage_contimage_proto_depIdxs = []int32{ 1, // 0: datadog.contimage.ContainerImagePayload.images:type_name -> datadog.contimage.ContainerImage diff --git a/contlcycle/contlcycle.pb.go b/contlcycle/contlcycle.pb.go index 6ef7cb90..5a021a04 100644 --- a/contlcycle/contlcycle.pb.go +++ b/contlcycle/contlcycle.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc v4.22.5 // source: proto/contlcycle/contlcycle.proto package contlcycle diff --git a/cws/dumpsv1/activity_dump.pb.go b/cws/dumpsv1/activity_dump.pb.go index 6a0f6010..d7a0fbb3 100644 --- a/cws/dumpsv1/activity_dump.pb.go +++ b/cws/dumpsv1/activity_dump.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc v4.22.5 // source: proto/cws/dumpsv1/activity_dump.proto package dumpsv1 diff --git a/cyclonedx_v1_4/bom-1.4.pb.go b/cyclonedx_v1_4/bom-1.4.pb.go index f9913740..dc374fb7 100644 --- a/cyclonedx_v1_4/bom-1.4.pb.go +++ b/cyclonedx_v1_4/bom-1.4.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc v4.22.5 // source: proto/deps/github.com/CycloneDX/specification/schema/bom-1.4.proto package cyclonedx_v1_4 import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -1789,7 +1789,7 @@ type IdentifiableAction struct { unknownFields protoimpl.UnknownFields // The timestamp in which the action occurred - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` // The name of the individual who performed the action Name *string `protobuf:"bytes,2,opt,name=name,proto3,oneof" json:"name,omitempty"` // The email address of the individual who performed the action @@ -1828,7 +1828,7 @@ func (*IdentifiableAction) Descriptor() ([]byte, []int) { return file_proto_deps_github_com_CycloneDX_specification_schema_bom_1_4_proto_rawDescGZIP(), []int{9} } -func (x *IdentifiableAction) GetTimestamp() *timestamp.Timestamp { +func (x *IdentifiableAction) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -2186,7 +2186,7 @@ type Metadata struct { unknownFields protoimpl.UnknownFields // The date and time (timestamp) when the document was created. - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` // The tool(s) used in the creation of the BOM. Tools []*Tool `protobuf:"bytes,2,rep,name=tools,proto3" json:"tools,omitempty"` // The person(s) who created the BOM. Authors are common in BOMs created through manual processes. BOMs created through automated means may not have authors. @@ -2235,7 +2235,7 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_proto_deps_github_com_CycloneDX_specification_schema_bom_1_4_proto_rawDescGZIP(), []int{14} } -func (x *Metadata) GetTimestamp() *timestamp.Timestamp { +func (x *Metadata) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -3237,7 +3237,7 @@ type ReleaseNotes struct { // A short description of the release. Description *string `protobuf:"bytes,5,opt,name=description,proto3,oneof" json:"description,omitempty"` // The date and time (timestamp) when the release note was created. - Timestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` // Optional alternate names the release may be referred to. This may include unofficial terms used by development and marketing teams (e.g. code names). Aliases []string `protobuf:"bytes,7,rep,name=aliases,proto3" json:"aliases,omitempty"` // Optional tags that may aid in search or retrieval of the release note. @@ -3317,7 +3317,7 @@ func (x *ReleaseNotes) GetDescription() string { return "" } -func (x *ReleaseNotes) GetTimestamp() *timestamp.Timestamp { +func (x *ReleaseNotes) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -3385,11 +3385,11 @@ type Vulnerability struct { // Published advisories of the vulnerability if provided. Advisories []*Advisory `protobuf:"bytes,10,rep,name=advisories,proto3" json:"advisories,omitempty"` // The date and time (timestamp) when the vulnerability record was created in the vulnerability database. - Created *timestamp.Timestamp `protobuf:"bytes,11,opt,name=created,proto3,oneof" json:"created,omitempty"` + Created *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=created,proto3,oneof" json:"created,omitempty"` // The date and time (timestamp) when the vulnerability record was first published. - Published *timestamp.Timestamp `protobuf:"bytes,12,opt,name=published,proto3,oneof" json:"published,omitempty"` + Published *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=published,proto3,oneof" json:"published,omitempty"` // The date and time (timestamp) when the vulnerability record was last updated. - Updated *timestamp.Timestamp `protobuf:"bytes,13,opt,name=updated,proto3,oneof" json:"updated,omitempty"` + Updated *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=updated,proto3,oneof" json:"updated,omitempty"` // Individuals or organizations credited with the discovery of the vulnerability. Credits *VulnerabilityCredits `protobuf:"bytes,14,opt,name=credits,proto3,oneof" json:"credits,omitempty"` // The tool(s) used to identify, confirm, or score the vulnerability. @@ -3504,21 +3504,21 @@ func (x *Vulnerability) GetAdvisories() []*Advisory { return nil } -func (x *Vulnerability) GetCreated() *timestamp.Timestamp { +func (x *Vulnerability) GetCreated() *timestamppb.Timestamp { if x != nil { return x.Created } return nil } -func (x *Vulnerability) GetPublished() *timestamp.Timestamp { +func (x *Vulnerability) GetPublished() *timestamppb.Timestamp { if x != nil { return x.Published } return nil } -func (x *Vulnerability) GetUpdated() *timestamp.Timestamp { +func (x *Vulnerability) GetUpdated() *timestamppb.Timestamp { if x != nil { return x.Updated } @@ -4969,7 +4969,7 @@ var file_proto_deps_github_com_CycloneDX_specification_schema_bom_1_4_proto_goTy (*VulnerabilityAnalysis)(nil), // 47: cyclonedx.v1_4.VulnerabilityAnalysis (*VulnerabilityAffects)(nil), // 48: cyclonedx.v1_4.VulnerabilityAffects (*VulnerabilityAffectedVersions)(nil), // 49: cyclonedx.v1_4.VulnerabilityAffectedVersions - (*timestamp.Timestamp)(nil), // 50: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 50: google.protobuf.Timestamp } var file_proto_deps_github_com_CycloneDX_specification_schema_bom_1_4_proto_depIdxs = []int32{ 28, // 0: cyclonedx.v1_4.Bom.metadata:type_name -> cyclonedx.v1_4.Metadata diff --git a/java/com/dd/cws/adv1/pb/SecDumpProto.java b/java/com/dd/cws/adv1/pb/SecDumpProto.java index 7ba957ad..fb2955a4 100644 --- a/java/com/dd/cws/adv1/pb/SecDumpProto.java +++ b/java/com/dd/cws/adv1/pb/SecDumpProto.java @@ -557,7 +557,8 @@ private SecDump() { host_ = ""; service_ = ""; source_ = ""; - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); tree_ = java.util.Collections.emptyList(); } @@ -568,11 +569,6 @@ protected java.lang.Object newInstance( return new SecDump(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_SecDump_descriptor; @@ -731,7 +727,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MetadataOrBuilder getMetadataOrBuilder() public static final int TAGS_FIELD_NUMBER = 5; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList tags_; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string tags = 5; * @return A list containing the tags. @@ -1068,8 +1065,8 @@ public Builder clear() { metadataBuilder_.dispose(); metadataBuilder_ = null; } - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000010); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); if (treeBuilder_ == null) { tree_ = java.util.Collections.emptyList(); } else { @@ -1110,11 +1107,6 @@ public com.dd.cws.adv1.pb.SecDumpProto.SecDump buildPartial() { } private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.SecDump result) { - if (((bitField0_ & 0x00000010) != 0)) { - tags_ = tags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.tags_ = tags_; if (treeBuilder_ == null) { if (((bitField0_ & 0x00000020) != 0)) { tree_ = java.util.Collections.unmodifiableList(tree_); @@ -1142,40 +1134,12 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.SecDump result) { ? metadata_ : metadataBuilder_.build(); } + if (((from_bitField0_ & 0x00000010) != 0)) { + tags_.makeImmutable(); + result.tags_ = tags_; + } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.SecDump) { @@ -1209,7 +1173,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.SecDump other) { if (!other.tags_.isEmpty()) { if (tags_.isEmpty()) { tags_ = other.tags_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ |= 0x00000010; } else { ensureTagsIsMutable(); tags_.addAll(other.tags_); @@ -1661,12 +1625,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MetadataOrBuilder getMetadataOrBuilder() return metadataBuilder_; } - private com.google.protobuf.LazyStringList tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureTagsIsMutable() { - if (!((bitField0_ & 0x00000010) != 0)) { + if (!tags_.isModifiable()) { tags_ = new com.google.protobuf.LazyStringArrayList(tags_); - bitField0_ |= 0x00000010; - } + } + bitField0_ |= 0x00000010; } /** * repeated string tags = 5; @@ -1674,7 +1639,8 @@ private void ensureTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getTagsList() { - return tags_.getUnmodifiableView(); + tags_.makeImmutable(); + return tags_; } /** * repeated string tags = 5; @@ -1711,6 +1677,7 @@ public Builder setTags( if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.set(index, value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1724,6 +1691,7 @@ public Builder addTags( if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1737,6 +1705,7 @@ public Builder addAllTags( ensureTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, tags_); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1745,8 +1714,9 @@ public Builder addAllTags( * @return This builder for chaining. */ public Builder clearTags() { - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000010); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010);; onChanged(); return this; } @@ -1761,6 +1731,7 @@ public Builder addTagsBytes( checkByteStringIsUtf8(value); ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2248,11 +2219,6 @@ protected java.lang.Object newInstance( return new Metadata(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_Metadata_descriptor; @@ -3117,38 +3083,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.Metadata result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.Metadata) { @@ -3855,7 +3789,7 @@ public boolean getDifferentiateArgs() { * @return This builder for chaining. */ public Builder setDifferentiateArgs(boolean value) { - + differentiateArgs_ = value; bitField0_ |= 0x00000080; onChanged(); @@ -4031,7 +3965,7 @@ public long getStart() { * @return This builder for chaining. */ public Builder setStart(long value) { - + start_ = value; bitField0_ |= 0x00000400; onChanged(); @@ -4063,7 +3997,7 @@ public long getEnd() { * @return This builder for chaining. */ public Builder setEnd(long value) { - + end_ = value; bitField0_ |= 0x00000800; onChanged(); @@ -4095,7 +4029,7 @@ public long getSize() { * @return This builder for chaining. */ public Builder setSize(long value) { - + size_ = value; bitField0_ |= 0x00001000; onChanged(); @@ -4299,11 +4233,6 @@ protected java.lang.Object newInstance( return new ProfileSelector(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_ProfileSelector_descriptor; @@ -4636,38 +4565,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProfileSelector resul } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.ProfileSelector) { @@ -5056,7 +4953,8 @@ private ProfileContext(com.google.protobuf.GeneratedMessageV3.Builder builder } private ProfileContext() { syscalls_ = emptyIntList(); - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); } @java.lang.Override @@ -5066,11 +4964,6 @@ protected java.lang.Object newInstance( return new ProfileContext(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_ProfileContext_descriptor; @@ -5150,7 +5043,7 @@ public int getEventTypeStateCount() { @java.lang.Override public boolean containsEventTypeState( int key) { - + return internalGetEventTypeState().getMap().containsKey(key); } /** @@ -5177,7 +5070,7 @@ com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrDefault( int key, /* nullable */ com.dd.cws.adv1.pb.SecDumpProto.event_type_state defaultValue) { - + java.util.Map map = internalGetEventTypeState().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -5188,7 +5081,7 @@ com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrDefault( @java.lang.Override public com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrThrow( int key) { - + java.util.Map map = internalGetEventTypeState().getMap(); if (!map.containsKey(key)) { @@ -5228,7 +5121,8 @@ public int getSyscalls(int index) { public static final int TAGS_FIELD_NUMBER = 5; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList tags_; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string tags = 5; * @return A list containing the tags. @@ -5557,8 +5451,8 @@ public Builder clear() { lastSeen_ = 0L; internalGetMutableEventTypeState().clear(); syscalls_ = emptyIntList(); - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000010); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); return this; } @@ -5597,11 +5491,6 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.ProfileC bitField0_ = (bitField0_ & ~0x00000008); } result.syscalls_ = syscalls_; - if (((bitField0_ & 0x00000010) != 0)) { - tags_ = tags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.tags_ = tags_; } private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProfileContext result) { @@ -5616,40 +5505,12 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProfileContext result result.eventTypeState_ = internalGetEventTypeState(); result.eventTypeState_.makeImmutable(); } + if (((from_bitField0_ & 0x00000010) != 0)) { + tags_.makeImmutable(); + result.tags_ = tags_; + } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.ProfileContext) { @@ -5684,7 +5545,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.ProfileContext other) { if (!other.tags_.isEmpty()) { if (tags_.isEmpty()) { tags_ = other.tags_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ |= 0x00000010; } else { ensureTagsIsMutable(); tags_.addAll(other.tags_); @@ -5790,7 +5651,7 @@ public long getFirstSeen() { * @return This builder for chaining. */ public Builder setFirstSeen(long value) { - + firstSeen_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -5822,7 +5683,7 @@ public long getLastSeen() { * @return This builder for chaining. */ public Builder setLastSeen(long value) { - + lastSeen_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -5871,7 +5732,7 @@ public int getEventTypeStateCount() { @java.lang.Override public boolean containsEventTypeState( int key) { - + return internalGetEventTypeState().getMap().containsKey(key); } /** @@ -5898,7 +5759,7 @@ com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrDefault( int key, /* nullable */ com.dd.cws.adv1.pb.SecDumpProto.event_type_state defaultValue) { - + java.util.Map map = internalGetEventTypeState().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -5909,7 +5770,7 @@ com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrDefault( @java.lang.Override public com.dd.cws.adv1.pb.SecDumpProto.event_type_state getEventTypeStateOrThrow( int key) { - + java.util.Map map = internalGetEventTypeState().getMap(); if (!map.containsKey(key)) { @@ -5928,7 +5789,7 @@ public Builder clearEventTypeState() { */ public Builder removeEventTypeState( int key) { - + internalGetMutableEventTypeState().getMutableMap() .remove(key); return this; @@ -5948,7 +5809,7 @@ public Builder removeEventTypeState( public Builder putEventTypeState( int key, com.dd.cws.adv1.pb.SecDumpProto.event_type_state value) { - + if (value == null) { throw new NullPointerException("map value"); } internalGetMutableEventTypeState().getMutableMap() .put(key, value); @@ -6005,7 +5866,7 @@ public int getSyscalls(int index) { */ public Builder setSyscalls( int index, int value) { - + ensureSyscallsIsMutable(); syscalls_.setInt(index, value); onChanged(); @@ -6017,7 +5878,7 @@ public Builder setSyscalls( * @return This builder for chaining. */ public Builder addSyscalls(int value) { - + ensureSyscallsIsMutable(); syscalls_.addInt(value); onChanged(); @@ -6047,12 +5908,13 @@ public Builder clearSyscalls() { return this; } - private com.google.protobuf.LazyStringList tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureTagsIsMutable() { - if (!((bitField0_ & 0x00000010) != 0)) { + if (!tags_.isModifiable()) { tags_ = new com.google.protobuf.LazyStringArrayList(tags_); - bitField0_ |= 0x00000010; - } + } + bitField0_ |= 0x00000010; } /** * repeated string tags = 5; @@ -6060,7 +5922,8 @@ private void ensureTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getTagsList() { - return tags_.getUnmodifiableView(); + tags_.makeImmutable(); + return tags_; } /** * repeated string tags = 5; @@ -6097,6 +5960,7 @@ public Builder setTags( if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.set(index, value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -6110,6 +5974,7 @@ public Builder addTags( if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -6123,6 +5988,7 @@ public Builder addAllTags( ensureTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, tags_); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -6131,8 +5997,9 @@ public Builder addAllTags( * @return This builder for chaining. */ public Builder clearTags() { - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000010); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010);; onChanged(); return this; } @@ -6147,6 +6014,7 @@ public Builder addTagsBytes( checkByteStringIsUtf8(value); ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -6400,7 +6268,8 @@ private SecurityProfile(com.google.protobuf.GeneratedMessageV3.Builder builde } private SecurityProfile() { version_ = ""; - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); syscalls_ = emptyIntList(); tree_ = java.util.Collections.emptyList(); } @@ -6412,11 +6281,6 @@ protected java.lang.Object newInstance( return new SecurityProfile(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_SecurityProfile_descriptor; @@ -6526,7 +6390,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MetadataOrBuilder getMetadataOrBuilder() public static final int TAGS_FIELD_NUMBER = 4; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList tags_; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string tags = 4 [deprecated = true]; * @deprecated datadog.cws.dumpsv1.SecurityProfile.tags is deprecated. @@ -7089,8 +6954,8 @@ public Builder clear() { metadataBuilder_.dispose(); metadataBuilder_ = null; } - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); syscalls_ = emptyIntList(); if (treeBuilder_ == null) { tree_ = java.util.Collections.emptyList(); @@ -7138,11 +7003,6 @@ public com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile buildPartial() { } private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile result) { - if (((bitField0_ & 0x00000008) != 0)) { - tags_ = tags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.tags_ = tags_; if (((bitField0_ & 0x00000010) != 0)) { syscalls_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000010); @@ -7172,6 +7032,10 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile resul ? metadata_ : metadataBuilder_.build(); } + if (((from_bitField0_ & 0x00000008) != 0)) { + tags_.makeImmutable(); + result.tags_ = tags_; + } if (((from_bitField0_ & 0x00000040) != 0)) { result.profileContexts_ = internalGetProfileContexts(); result.profileContexts_.makeImmutable(); @@ -7183,38 +7047,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile resul } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile) { @@ -7241,7 +7073,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.SecurityProfile other) if (!other.tags_.isEmpty()) { if (tags_.isEmpty()) { tags_ = other.tags_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ |= 0x00000008; } else { ensureTagsIsMutable(); tags_.addAll(other.tags_); @@ -7420,7 +7252,7 @@ public Builder mergeFrom( * @return This builder for chaining. */ @java.lang.Deprecated public Builder setStatus(int value) { - + status_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -7640,12 +7472,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MetadataOrBuilder getMetadataOrBuilder() return metadataBuilder_; } - private com.google.protobuf.LazyStringList tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureTagsIsMutable() { - if (!((bitField0_ & 0x00000008) != 0)) { + if (!tags_.isModifiable()) { tags_ = new com.google.protobuf.LazyStringArrayList(tags_); - bitField0_ |= 0x00000008; - } + } + bitField0_ |= 0x00000008; } /** * repeated string tags = 4 [deprecated = true]; @@ -7655,7 +7488,8 @@ private void ensureTagsIsMutable() { */ @java.lang.Deprecated public com.google.protobuf.ProtocolStringList getTagsList() { - return tags_.getUnmodifiableView(); + tags_.makeImmutable(); + return tags_; } /** * repeated string tags = 4 [deprecated = true]; @@ -7700,6 +7534,7 @@ private void ensureTagsIsMutable() { if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.set(index, value); + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7715,6 +7550,7 @@ private void ensureTagsIsMutable() { if (value == null) { throw new NullPointerException(); } ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7730,6 +7566,7 @@ private void ensureTagsIsMutable() { ensureTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, tags_); + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7740,8 +7577,9 @@ private void ensureTagsIsMutable() { * @return This builder for chaining. */ @java.lang.Deprecated public Builder clearTags() { - tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + tags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008);; onChanged(); return this; } @@ -7758,6 +7596,7 @@ private void ensureTagsIsMutable() { checkByteStringIsUtf8(value); ensureTagsIsMutable(); tags_.add(value); + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7809,7 +7648,7 @@ private void ensureSyscallsIsMutable() { */ @java.lang.Deprecated public Builder setSyscalls( int index, int value) { - + ensureSyscallsIsMutable(); syscalls_.setInt(index, value); onChanged(); @@ -7823,7 +7662,7 @@ private void ensureSyscallsIsMutable() { * @return This builder for chaining. */ @java.lang.Deprecated public Builder addSyscalls(int value) { - + ensureSyscallsIsMutable(); syscalls_.addInt(value); onChanged(); @@ -8642,7 +8481,8 @@ private ProcessActivityNode() { dnsNames_ = java.util.Collections.emptyList(); sockets_ = java.util.Collections.emptyList(); syscalls_ = emptyIntList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); imdsEvents_ = java.util.Collections.emptyList(); } @@ -8653,11 +8493,6 @@ protected java.lang.Object newInstance( return new ProcessActivityNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_ProcessActivityNode_descriptor; @@ -8951,7 +8786,8 @@ public int getSyscalls(int index) { public static final int IMAGE_TAGS_FIELD_NUMBER = 10; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList imageTags_; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string image_tags = 10; * @return A list containing the imageTags. @@ -9395,8 +9231,8 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000040); syscalls_ = emptyIntList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000100); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); if (imdsEventsBuilder_ == null) { imdsEvents_ = java.util.Collections.emptyList(); } else { @@ -9487,11 +9323,6 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.ProcessA bitField0_ = (bitField0_ & ~0x00000080); } result.syscalls_ = syscalls_; - if (((bitField0_ & 0x00000100) != 0)) { - imageTags_ = imageTags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000100); - } - result.imageTags_ = imageTags_; if (imdsEventsBuilder_ == null) { if (((bitField0_ & 0x00000200) != 0)) { imdsEvents_ = java.util.Collections.unmodifiableList(imdsEvents_); @@ -9513,40 +9344,12 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProcessActivityNode r if (((from_bitField0_ & 0x00000002) != 0)) { result.generationType_ = generationType_; } + if (((from_bitField0_ & 0x00000100) != 0)) { + imageTags_.makeImmutable(); + result.imageTags_ = imageTags_; + } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.ProcessActivityNode) { @@ -9708,7 +9511,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.ProcessActivityNode oth if (!other.imageTags_.isEmpty()) { if (imageTags_.isEmpty()) { imageTags_ = other.imageTags_; - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ |= 0x00000100; } else { ensureImageTagsIsMutable(); imageTags_.addAll(other.imageTags_); @@ -11307,7 +11110,7 @@ public int getSyscalls(int index) { */ public Builder setSyscalls( int index, int value) { - + ensureSyscallsIsMutable(); syscalls_.setInt(index, value); onChanged(); @@ -11319,7 +11122,7 @@ public Builder setSyscalls( * @return This builder for chaining. */ public Builder addSyscalls(int value) { - + ensureSyscallsIsMutable(); syscalls_.addInt(value); onChanged(); @@ -11349,12 +11152,13 @@ public Builder clearSyscalls() { return this; } - private com.google.protobuf.LazyStringList imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureImageTagsIsMutable() { - if (!((bitField0_ & 0x00000100) != 0)) { + if (!imageTags_.isModifiable()) { imageTags_ = new com.google.protobuf.LazyStringArrayList(imageTags_); - bitField0_ |= 0x00000100; - } + } + bitField0_ |= 0x00000100; } /** * repeated string image_tags = 10; @@ -11362,7 +11166,8 @@ private void ensureImageTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getImageTagsList() { - return imageTags_.getUnmodifiableView(); + imageTags_.makeImmutable(); + return imageTags_; } /** * repeated string image_tags = 10; @@ -11399,6 +11204,7 @@ public Builder setImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.set(index, value); + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -11412,6 +11218,7 @@ public Builder addImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -11425,6 +11232,7 @@ public Builder addAllImageTags( ensureImageTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, imageTags_); + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -11433,8 +11241,9 @@ public Builder addAllImageTags( * @return This builder for chaining. */ public Builder clearImageTags() { - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000100); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000100);; onChanged(); return this; } @@ -11449,6 +11258,7 @@ public Builder addImageTagsBytes( checkByteStringIsUtf8(value); ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -11994,9 +11804,11 @@ private ProcessInfo() { containerId_ = ""; tty_ = ""; comm_ = ""; - args_ = com.google.protobuf.LazyStringArrayList.EMPTY; + args_ = + com.google.protobuf.LazyStringArrayList.emptyList(); argv0_ = ""; - envs_ = com.google.protobuf.LazyStringArrayList.EMPTY; + envs_ = + com.google.protobuf.LazyStringArrayList.emptyList(); } @java.lang.Override @@ -12006,11 +11818,6 @@ protected java.lang.Object newInstance( return new ProcessInfo(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_ProcessInfo_descriptor; @@ -12311,7 +12118,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.CredentialsOrBuilder getCredentialsOrBuil public static final int ARGS_FIELD_NUMBER = 16; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList args_; + private com.google.protobuf.LazyStringArrayList args_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string args = 16; * @return A list containing the args. @@ -12397,7 +12205,8 @@ public boolean getArgsTruncated() { public static final int ENVS_FIELD_NUMBER = 19; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList envs_; + private com.google.protobuf.LazyStringArrayList envs_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string envs = 19; * @return A list containing the envs. @@ -12935,12 +12744,12 @@ public Builder clear() { credentialsBuilder_.dispose(); credentialsBuilder_ = null; } - args_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00008000); + args_ = + com.google.protobuf.LazyStringArrayList.emptyList(); argv0_ = ""; argsTruncated_ = false; - envs_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00040000); + envs_ = + com.google.protobuf.LazyStringArrayList.emptyList(); envsTruncated_ = false; isExecChild_ = false; cookie64_ = 0L; @@ -12970,25 +12779,11 @@ public com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo build() { @java.lang.Override public com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo buildPartial() { com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo result = new com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo(this); - buildPartialRepeatedFields(result); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo result) { - if (((bitField0_ & 0x00008000) != 0)) { - args_ = args_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00008000); - } - result.args_ = args_; - if (((bitField0_ & 0x00040000) != 0)) { - envs_ = envs_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00040000); - } - result.envs_ = envs_; - } - private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -13040,12 +12835,20 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo result) { ? credentials_ : credentialsBuilder_.build(); } + if (((from_bitField0_ & 0x00008000) != 0)) { + args_.makeImmutable(); + result.args_ = args_; + } if (((from_bitField0_ & 0x00010000) != 0)) { result.argv0_ = argv0_; } if (((from_bitField0_ & 0x00020000) != 0)) { result.argsTruncated_ = argsTruncated_; } + if (((from_bitField0_ & 0x00040000) != 0)) { + envs_.makeImmutable(); + result.envs_ = envs_; + } if (((from_bitField0_ & 0x00080000) != 0)) { result.envsTruncated_ = envsTruncated_; } @@ -13057,38 +12860,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo) { @@ -13155,7 +12926,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo other) { if (!other.args_.isEmpty()) { if (args_.isEmpty()) { args_ = other.args_; - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ |= 0x00008000; } else { ensureArgsIsMutable(); args_.addAll(other.args_); @@ -13173,7 +12944,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.ProcessInfo other) { if (!other.envs_.isEmpty()) { if (envs_.isEmpty()) { envs_ = other.envs_; - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ |= 0x00040000; } else { ensureEnvsIsMutable(); envs_.addAll(other.envs_); @@ -13363,7 +13134,7 @@ public int getPid() { * @return This builder for chaining. */ public Builder setPid(int value) { - + pid_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -13395,7 +13166,7 @@ public int getTid() { * @return This builder for chaining. */ public Builder setTid(int value) { - + tid_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -13427,7 +13198,7 @@ public int getPpid() { * @return This builder for chaining. */ public Builder setPpid(int value) { - + ppid_ = value; bitField0_ |= 0x00000004; onChanged(); @@ -13463,7 +13234,7 @@ public Builder clearPpid() { * @return This builder for chaining. */ @java.lang.Deprecated public Builder setCookie(int value) { - + cookie_ = value; bitField0_ |= 0x00000008; onChanged(); @@ -13497,7 +13268,7 @@ public boolean getIsThread() { * @return This builder for chaining. */ public Builder setIsThread(boolean value) { - + isThread_ = value; bitField0_ |= 0x00000010; onChanged(); @@ -13724,7 +13495,7 @@ public Builder setContainerIdBytes( * @return This builder for chaining. */ @java.lang.Deprecated public Builder setSpanId(long value) { - + spanId_ = value; bitField0_ |= 0x00000080; onChanged(); @@ -13762,7 +13533,7 @@ public Builder setContainerIdBytes( * @return This builder for chaining. */ @java.lang.Deprecated public Builder setTraceId(long value) { - + traceId_ = value; bitField0_ |= 0x00000100; onChanged(); @@ -13940,7 +13711,7 @@ public long getForkTime() { * @return This builder for chaining. */ public Builder setForkTime(long value) { - + forkTime_ = value; bitField0_ |= 0x00000800; onChanged(); @@ -13972,7 +13743,7 @@ public long getExitTime() { * @return This builder for chaining. */ public Builder setExitTime(long value) { - + exitTime_ = value; bitField0_ |= 0x00001000; onChanged(); @@ -14004,7 +13775,7 @@ public long getExecTime() { * @return This builder for chaining. */ public Builder setExecTime(long value) { - + execTime_ = value; bitField0_ |= 0x00002000; onChanged(); @@ -14140,12 +13911,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.CredentialsOrBuilder getCredentialsOrBuil return credentialsBuilder_; } - private com.google.protobuf.LazyStringList args_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList args_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureArgsIsMutable() { - if (!((bitField0_ & 0x00008000) != 0)) { + if (!args_.isModifiable()) { args_ = new com.google.protobuf.LazyStringArrayList(args_); - bitField0_ |= 0x00008000; - } + } + bitField0_ |= 0x00008000; } /** * repeated string args = 16; @@ -14153,7 +13925,8 @@ private void ensureArgsIsMutable() { */ public com.google.protobuf.ProtocolStringList getArgsList() { - return args_.getUnmodifiableView(); + args_.makeImmutable(); + return args_; } /** * repeated string args = 16; @@ -14190,6 +13963,7 @@ public Builder setArgs( if (value == null) { throw new NullPointerException(); } ensureArgsIsMutable(); args_.set(index, value); + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -14203,6 +13977,7 @@ public Builder addArgs( if (value == null) { throw new NullPointerException(); } ensureArgsIsMutable(); args_.add(value); + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -14216,6 +13991,7 @@ public Builder addAllArgs( ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, args_); + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -14224,8 +14000,9 @@ public Builder addAllArgs( * @return This builder for chaining. */ public Builder clearArgs() { - args_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00008000); + args_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00008000);; onChanged(); return this; } @@ -14240,6 +14017,7 @@ public Builder addArgsBytes( checkByteStringIsUtf8(value); ensureArgsIsMutable(); args_.add(value); + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -14331,7 +14109,7 @@ public boolean getArgsTruncated() { * @return This builder for chaining. */ public Builder setArgsTruncated(boolean value) { - + argsTruncated_ = value; bitField0_ |= 0x00020000; onChanged(); @@ -14348,12 +14126,13 @@ public Builder clearArgsTruncated() { return this; } - private com.google.protobuf.LazyStringList envs_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList envs_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureEnvsIsMutable() { - if (!((bitField0_ & 0x00040000) != 0)) { + if (!envs_.isModifiable()) { envs_ = new com.google.protobuf.LazyStringArrayList(envs_); - bitField0_ |= 0x00040000; - } + } + bitField0_ |= 0x00040000; } /** * repeated string envs = 19; @@ -14361,7 +14140,8 @@ private void ensureEnvsIsMutable() { */ public com.google.protobuf.ProtocolStringList getEnvsList() { - return envs_.getUnmodifiableView(); + envs_.makeImmutable(); + return envs_; } /** * repeated string envs = 19; @@ -14398,6 +14178,7 @@ public Builder setEnvs( if (value == null) { throw new NullPointerException(); } ensureEnvsIsMutable(); envs_.set(index, value); + bitField0_ |= 0x00040000; onChanged(); return this; } @@ -14411,6 +14192,7 @@ public Builder addEnvs( if (value == null) { throw new NullPointerException(); } ensureEnvsIsMutable(); envs_.add(value); + bitField0_ |= 0x00040000; onChanged(); return this; } @@ -14424,6 +14206,7 @@ public Builder addAllEnvs( ensureEnvsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, envs_); + bitField0_ |= 0x00040000; onChanged(); return this; } @@ -14432,8 +14215,9 @@ public Builder addAllEnvs( * @return This builder for chaining. */ public Builder clearEnvs() { - envs_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00040000); + envs_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00040000);; onChanged(); return this; } @@ -14448,6 +14232,7 @@ public Builder addEnvsBytes( checkByteStringIsUtf8(value); ensureEnvsIsMutable(); envs_.add(value); + bitField0_ |= 0x00040000; onChanged(); return this; } @@ -14467,7 +14252,7 @@ public boolean getEnvsTruncated() { * @return This builder for chaining. */ public Builder setEnvsTruncated(boolean value) { - + envsTruncated_ = value; bitField0_ |= 0x00080000; onChanged(); @@ -14499,7 +14284,7 @@ public boolean getIsExecChild() { * @return This builder for chaining. */ public Builder setIsExecChild(boolean value) { - + isExecChild_ = value; bitField0_ |= 0x00100000; onChanged(); @@ -14531,7 +14316,7 @@ public long getCookie64() { * @return This builder for chaining. */ public Builder setCookie64(long value) { - + cookie64_ = value; bitField0_ |= 0x00200000; onChanged(); @@ -14767,7 +14552,8 @@ private FileActivityNode(com.google.protobuf.GeneratedMessageV3.Builder build } private FileActivityNode() { matchedRules_ = java.util.Collections.emptyList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); name_ = ""; generationType_ = 0; children_ = java.util.Collections.emptyList(); @@ -14780,11 +14566,6 @@ protected java.lang.Object newInstance( return new FileActivityNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_FileActivityNode_descriptor; @@ -14841,7 +14622,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRuleOrBuilder getMatchedRulesOrBui public static final int IMAGE_TAGS_FIELD_NUMBER = 10; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList imageTags_; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string image_tags = 10; * @return A list containing the imageTags. @@ -15351,8 +15133,8 @@ public Builder clear() { matchedRulesBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); name_ = ""; isPattern_ = false; file_ = null; @@ -15416,11 +15198,6 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.FileActi } else { result.matchedRules_ = matchedRulesBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - imageTags_ = imageTags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.imageTags_ = imageTags_; if (childrenBuilder_ == null) { if (((bitField0_ & 0x00000100) != 0)) { children_ = java.util.Collections.unmodifiableList(children_); @@ -15434,6 +15211,10 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.FileActi private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.FileActivityNode result) { int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + imageTags_.makeImmutable(); + result.imageTags_ = imageTags_; + } if (((from_bitField0_ & 0x00000004) != 0)) { result.name_ = name_; } @@ -15458,38 +15239,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.FileActivityNode resu } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.FileActivityNode) { @@ -15531,7 +15280,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.FileActivityNode other) if (!other.imageTags_.isEmpty()) { if (imageTags_.isEmpty()) { imageTags_ = other.imageTags_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ |= 0x00000002; } else { ensureImageTagsIsMutable(); imageTags_.addAll(other.imageTags_); @@ -15933,12 +15682,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRule.Builder addMatchedRulesBuilde return matchedRulesBuilder_; } - private com.google.protobuf.LazyStringList imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureImageTagsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!imageTags_.isModifiable()) { imageTags_ = new com.google.protobuf.LazyStringArrayList(imageTags_); - bitField0_ |= 0x00000002; - } + } + bitField0_ |= 0x00000002; } /** * repeated string image_tags = 10; @@ -15946,7 +15696,8 @@ private void ensureImageTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getImageTagsList() { - return imageTags_.getUnmodifiableView(); + imageTags_.makeImmutable(); + return imageTags_; } /** * repeated string image_tags = 10; @@ -15983,6 +15734,7 @@ public Builder setImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -15996,6 +15748,7 @@ public Builder addImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -16009,6 +15762,7 @@ public Builder addAllImageTags( ensureImageTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, imageTags_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -16017,8 +15771,9 @@ public Builder addAllImageTags( * @return This builder for chaining. */ public Builder clearImageTags() { - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002);; onChanged(); return this; } @@ -16033,6 +15788,7 @@ public Builder addImageTagsBytes( checkByteStringIsUtf8(value); ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -16124,7 +15880,7 @@ public boolean getIsPattern() { * @return This builder for chaining. */ public Builder setIsPattern(boolean value) { - + isPattern_ = value; bitField0_ |= 0x00000008; onChanged(); @@ -16328,7 +16084,7 @@ public long getFirstSeen() { * @return This builder for chaining. */ public Builder setFirstSeen(long value) { - + firstSeen_ = value; bitField0_ |= 0x00000040; onChanged(); @@ -16811,11 +16567,6 @@ protected java.lang.Object newInstance( return new OpenNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_OpenNode_descriptor; @@ -17121,38 +16872,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.OpenNode result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.OpenNode) { @@ -17247,7 +16966,7 @@ public long getRetval() { * @return This builder for chaining. */ public Builder setRetval(long value) { - + retval_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -17279,7 +16998,7 @@ public int getFlags() { * @return This builder for chaining. */ public Builder setFlags(int value) { - + flags_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -17311,7 +17030,7 @@ public int getMode() { * @return This builder for chaining. */ public Builder setMode(int value) { - + mode_ = value; bitField0_ |= 0x00000004; onChanged(); @@ -17482,7 +17201,8 @@ private DNSNode(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private DNSNode() { matchedRules_ = java.util.Collections.emptyList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); requests_ = java.util.Collections.emptyList(); } @@ -17493,11 +17213,6 @@ protected java.lang.Object newInstance( return new DNSNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_DNSNode_descriptor; @@ -17554,7 +17269,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRuleOrBuilder getMatchedRulesOrBui public static final int IMAGE_TAGS_FIELD_NUMBER = 3; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList imageTags_; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string image_tags = 3; * @return A list containing the imageTags. @@ -17857,8 +17573,8 @@ public Builder clear() { matchedRulesBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); if (requestsBuilder_ == null) { requests_ = java.util.Collections.emptyList(); } else { @@ -17908,11 +17624,6 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.DNSNode } else { result.matchedRules_ = matchedRulesBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - imageTags_ = imageTags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.imageTags_ = imageTags_; if (requestsBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { requests_ = java.util.Collections.unmodifiableList(requests_); @@ -17926,40 +17637,12 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.DNSNode private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.DNSNode result) { int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + imageTags_.makeImmutable(); + result.imageTags_ = imageTags_; + } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.DNSNode) { @@ -18001,7 +17684,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.DNSNode other) { if (!other.imageTags_.isEmpty()) { if (imageTags_.isEmpty()) { imageTags_ = other.imageTags_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ |= 0x00000002; } else { ensureImageTagsIsMutable(); imageTags_.addAll(other.imageTags_); @@ -18349,12 +18032,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRule.Builder addMatchedRulesBuilde return matchedRulesBuilder_; } - private com.google.protobuf.LazyStringList imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureImageTagsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!imageTags_.isModifiable()) { imageTags_ = new com.google.protobuf.LazyStringArrayList(imageTags_); - bitField0_ |= 0x00000002; - } + } + bitField0_ |= 0x00000002; } /** * repeated string image_tags = 3; @@ -18362,7 +18046,8 @@ private void ensureImageTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getImageTagsList() { - return imageTags_.getUnmodifiableView(); + imageTags_.makeImmutable(); + return imageTags_; } /** * repeated string image_tags = 3; @@ -18399,6 +18084,7 @@ public Builder setImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -18412,6 +18098,7 @@ public Builder addImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -18425,6 +18112,7 @@ public Builder addAllImageTags( ensureImageTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, imageTags_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -18433,8 +18121,9 @@ public Builder addAllImageTags( * @return This builder for chaining. */ public Builder clearImageTags() { - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002);; onChanged(); return this; } @@ -18449,6 +18138,7 @@ public Builder addImageTagsBytes( checkByteStringIsUtf8(value); ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -18819,11 +18509,6 @@ protected java.lang.Object newInstance( return new DNSInfo(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_DNSInfo_descriptor; @@ -19207,38 +18892,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.DNSInfo result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.DNSInfo) { @@ -19423,7 +19076,7 @@ public int getType() { * @return This builder for chaining. */ public Builder setType(int value) { - + type_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -19455,7 +19108,7 @@ public int getClass_() { * @return This builder for chaining. */ public Builder setClass_(int value) { - + class__ = value; bitField0_ |= 0x00000004; onChanged(); @@ -19487,7 +19140,7 @@ public int getSize() { * @return This builder for chaining. */ public Builder setSize(int value) { - + size_ = value; bitField0_ |= 0x00000008; onChanged(); @@ -19519,7 +19172,7 @@ public int getCount() { * @return This builder for chaining. */ public Builder setCount(int value) { - + count_ = value; bitField0_ |= 0x00000010; onChanged(); @@ -19681,7 +19334,8 @@ private IMDSNode(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private IMDSNode() { matchedRules_ = java.util.Collections.emptyList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); } @java.lang.Override @@ -19691,11 +19345,6 @@ protected java.lang.Object newInstance( return new IMDSNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_IMDSNode_descriptor; @@ -19752,7 +19401,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRuleOrBuilder getMatchedRulesOrBui public static final int IMAGE_TAGS_FIELD_NUMBER = 2; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList imageTags_; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string image_tags = 2; * @return A list containing the imageTags. @@ -20043,8 +19693,8 @@ public Builder clear() { matchedRulesBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); event_ = null; if (eventBuilder_ != null) { eventBuilder_.dispose(); @@ -20092,15 +19742,14 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.IMDSNode } else { result.matchedRules_ = matchedRulesBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - imageTags_ = imageTags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.imageTags_ = imageTags_; } private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.IMDSNode result) { int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + imageTags_.makeImmutable(); + result.imageTags_ = imageTags_; + } if (((from_bitField0_ & 0x00000004) != 0)) { result.event_ = eventBuilder_ == null ? event_ @@ -20108,38 +19757,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.IMDSNode result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.IMDSNode) { @@ -20181,7 +19798,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.IMDSNode other) { if (!other.imageTags_.isEmpty()) { if (imageTags_.isEmpty()) { imageTags_ = other.imageTags_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ |= 0x00000002; } else { ensureImageTagsIsMutable(); imageTags_.addAll(other.imageTags_); @@ -20500,12 +20117,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRule.Builder addMatchedRulesBuilde return matchedRulesBuilder_; } - private com.google.protobuf.LazyStringList imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureImageTagsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!imageTags_.isModifiable()) { imageTags_ = new com.google.protobuf.LazyStringArrayList(imageTags_); - bitField0_ |= 0x00000002; - } + } + bitField0_ |= 0x00000002; } /** * repeated string image_tags = 2; @@ -20513,7 +20131,8 @@ private void ensureImageTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getImageTagsList() { - return imageTags_.getUnmodifiableView(); + imageTags_.makeImmutable(); + return imageTags_; } /** * repeated string image_tags = 2; @@ -20550,6 +20169,7 @@ public Builder setImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -20563,6 +20183,7 @@ public Builder addImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -20576,6 +20197,7 @@ public Builder addAllImageTags( ensureImageTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, imageTags_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -20584,8 +20206,9 @@ public Builder addAllImageTags( * @return This builder for chaining. */ public Builder clearImageTags() { - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002);; onChanged(); return this; } @@ -20600,6 +20223,7 @@ public Builder addImageTagsBytes( checkByteStringIsUtf8(value); ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -20905,11 +20529,6 @@ protected java.lang.Object newInstance( return new IMDSEvent(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_IMDSEvent_descriptor; @@ -21506,38 +21125,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.IMDSEvent result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.IMDSEvent) { @@ -22324,11 +21911,6 @@ protected java.lang.Object newInstance( return new AWSIMDSEvent(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_AWSIMDSEvent_descriptor; @@ -22634,38 +22216,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.AWSIMDSEvent result) } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.AWSIMDSEvent) { @@ -22754,7 +22304,7 @@ public boolean getIsImdsV2() { * @return This builder for chaining. */ public Builder setIsImdsV2(boolean value) { - + isImdsV2_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -23044,11 +22594,6 @@ protected java.lang.Object newInstance( return new AWSSecurityCredentials(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_AWSSecurityCredentials_descriptor; @@ -23540,38 +23085,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.AWSSecurityCredential } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.AWSSecurityCredentials) { @@ -24309,7 +23822,8 @@ private FileInfo() { packageName_ = ""; packageVersion_ = ""; packageSrcversion_ = ""; - hashes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + hashes_ = + com.google.protobuf.LazyStringArrayList.emptyList(); hashState_ = 0; } @@ -24320,11 +23834,6 @@ protected java.lang.Object newInstance( return new FileInfo(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_FileInfo_descriptor; @@ -24744,7 +24253,8 @@ public java.lang.String getPackageSrcversion() { public static final int HASHES_FIELD_NUMBER = 17; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList hashes_; + private com.google.protobuf.LazyStringArrayList hashes_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string hashes = 17; * @return A list containing the hashes. @@ -25189,8 +24699,8 @@ public Builder clear() { packageName_ = ""; packageVersion_ = ""; packageSrcversion_ = ""; - hashes_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00010000); + hashes_ = + com.google.protobuf.LazyStringArrayList.emptyList(); hashState_ = 0; return this; } @@ -25218,20 +24728,11 @@ public com.dd.cws.adv1.pb.SecDumpProto.FileInfo build() { @java.lang.Override public com.dd.cws.adv1.pb.SecDumpProto.FileInfo buildPartial() { com.dd.cws.adv1.pb.SecDumpProto.FileInfo result = new com.dd.cws.adv1.pb.SecDumpProto.FileInfo(this); - buildPartialRepeatedFields(result); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.FileInfo result) { - if (((bitField0_ & 0x00010000) != 0)) { - hashes_ = hashes_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00010000); - } - result.hashes_ = hashes_; - } - private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.FileInfo result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -25282,43 +24783,15 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.FileInfo result) { if (((from_bitField0_ & 0x00008000) != 0)) { result.packageSrcversion_ = packageSrcversion_; } + if (((from_bitField0_ & 0x00010000) != 0)) { + hashes_.makeImmutable(); + result.hashes_ = hashes_; + } if (((from_bitField0_ & 0x00020000) != 0)) { result.hashState_ = hashState_; } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.FileInfo) { @@ -25398,7 +24871,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.FileInfo other) { if (!other.hashes_.isEmpty()) { if (hashes_.isEmpty()) { hashes_ = other.hashes_; - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ |= 0x00010000; } else { ensureHashesIsMutable(); hashes_.addAll(other.hashes_); @@ -25557,7 +25030,7 @@ public int getUid() { * @return This builder for chaining. */ public Builder setUid(int value) { - + uid_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -25661,7 +25134,7 @@ public int getGid() { * @return This builder for chaining. */ public Builder setGid(int value) { - + gid_ = value; bitField0_ |= 0x00000004; onChanged(); @@ -25773,7 +25246,7 @@ public int getMode() { * @return This builder for chaining. */ public Builder setMode(int value) { - + mode_ = value; bitField0_ |= 0x00000010; onChanged(); @@ -25809,7 +25282,7 @@ public long getCtime() { * @return This builder for chaining. */ public Builder setCtime(long value) { - + ctime_ = value; bitField0_ |= 0x00000020; onChanged(); @@ -25841,7 +25314,7 @@ public long getMtime() { * @return This builder for chaining. */ public Builder setMtime(long value) { - + mtime_ = value; bitField0_ |= 0x00000040; onChanged(); @@ -25873,7 +25346,7 @@ public int getMountId() { * @return This builder for chaining. */ public Builder setMountId(int value) { - + mountId_ = value; bitField0_ |= 0x00000080; onChanged(); @@ -25905,7 +25378,7 @@ public long getInode() { * @return This builder for chaining. */ public Builder setInode(long value) { - + inode_ = value; bitField0_ |= 0x00000100; onChanged(); @@ -25937,7 +25410,7 @@ public boolean getInUpperLayer() { * @return This builder for chaining. */ public Builder setInUpperLayer(boolean value) { - + inUpperLayer_ = value; bitField0_ |= 0x00000200; onChanged(); @@ -26386,12 +25859,13 @@ public Builder setPackageSrcversionBytes( return this; } - private com.google.protobuf.LazyStringList hashes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList hashes_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureHashesIsMutable() { - if (!((bitField0_ & 0x00010000) != 0)) { + if (!hashes_.isModifiable()) { hashes_ = new com.google.protobuf.LazyStringArrayList(hashes_); - bitField0_ |= 0x00010000; - } + } + bitField0_ |= 0x00010000; } /** * repeated string hashes = 17; @@ -26399,7 +25873,8 @@ private void ensureHashesIsMutable() { */ public com.google.protobuf.ProtocolStringList getHashesList() { - return hashes_.getUnmodifiableView(); + hashes_.makeImmutable(); + return hashes_; } /** * repeated string hashes = 17; @@ -26436,6 +25911,7 @@ public Builder setHashes( if (value == null) { throw new NullPointerException(); } ensureHashesIsMutable(); hashes_.set(index, value); + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -26449,6 +25925,7 @@ public Builder addHashes( if (value == null) { throw new NullPointerException(); } ensureHashesIsMutable(); hashes_.add(value); + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -26462,6 +25939,7 @@ public Builder addAllHashes( ensureHashesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, hashes_); + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -26470,8 +25948,9 @@ public Builder addAllHashes( * @return This builder for chaining. */ public Builder clearHashes() { - hashes_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00010000); + hashes_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00010000);; onChanged(); return this; } @@ -26486,6 +25965,7 @@ public Builder addHashesBytes( checkByteStringIsUtf8(value); ensureHashesIsMutable(); hashes_.add(value); + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -26758,11 +26238,6 @@ protected java.lang.Object newInstance( return new Credentials(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_Credentials_descriptor; @@ -27517,38 +26992,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.Credentials result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.Credentials) { @@ -27743,7 +27186,7 @@ public int getUid() { * @return This builder for chaining. */ public Builder setUid(int value) { - + uid_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -27775,7 +27218,7 @@ public int getGid() { * @return This builder for chaining. */ public Builder setGid(int value) { - + gid_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -27951,7 +27394,7 @@ public int getEffectiveUid() { * @return This builder for chaining. */ public Builder setEffectiveUid(int value) { - + effectiveUid_ = value; bitField0_ |= 0x00000010; onChanged(); @@ -27983,7 +27426,7 @@ public int getEffectiveGid() { * @return This builder for chaining. */ public Builder setEffectiveGid(int value) { - + effectiveGid_ = value; bitField0_ |= 0x00000020; onChanged(); @@ -28159,7 +27602,7 @@ public int getFsUid() { * @return This builder for chaining. */ public Builder setFsUid(int value) { - + fsUid_ = value; bitField0_ |= 0x00000100; onChanged(); @@ -28191,7 +27634,7 @@ public int getFsGid() { * @return This builder for chaining. */ public Builder setFsGid(int value) { - + fsGid_ = value; bitField0_ |= 0x00000200; onChanged(); @@ -28367,7 +27810,7 @@ public long getCapEffective() { * @return This builder for chaining. */ public Builder setCapEffective(long value) { - + capEffective_ = value; bitField0_ |= 0x00001000; onChanged(); @@ -28399,7 +27842,7 @@ public long getCapPermitted() { * @return This builder for chaining. */ public Builder setCapPermitted(long value) { - + capPermitted_ = value; bitField0_ |= 0x00002000; onChanged(); @@ -28543,11 +27986,6 @@ protected java.lang.Object newInstance( return new SocketNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_SocketNode_descriptor; @@ -28901,38 +28339,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.SocketNode result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.SocketNode) { @@ -29497,7 +28903,8 @@ private BindNode(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private BindNode() { matchedRules_ = java.util.Collections.emptyList(); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); ip_ = ""; } @@ -29508,11 +28915,6 @@ protected java.lang.Object newInstance( return new BindNode(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_BindNode_descriptor; @@ -29569,7 +28971,8 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRuleOrBuilder getMatchedRulesOrBui public static final int IMAGE_TAGS_FIELD_NUMBER = 4; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringList imageTags_; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** * repeated string image_tags = 4; * @return A list containing the imageTags. @@ -29889,8 +29292,8 @@ public Builder clear() { matchedRulesBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); port_ = 0; ip_ = ""; return this; @@ -29935,15 +29338,14 @@ private void buildPartialRepeatedFields(com.dd.cws.adv1.pb.SecDumpProto.BindNode } else { result.matchedRules_ = matchedRulesBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - imageTags_ = imageTags_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.imageTags_ = imageTags_; } private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.BindNode result) { int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + imageTags_.makeImmutable(); + result.imageTags_ = imageTags_; + } if (((from_bitField0_ & 0x00000004) != 0)) { result.port_ = port_; } @@ -29952,38 +29354,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.BindNode result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.BindNode) { @@ -30025,7 +29395,7 @@ public Builder mergeFrom(com.dd.cws.adv1.pb.SecDumpProto.BindNode other) { if (!other.imageTags_.isEmpty()) { if (imageTags_.isEmpty()) { imageTags_ = other.imageTags_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ |= 0x00000002; } else { ensureImageTagsIsMutable(); imageTags_.addAll(other.imageTags_); @@ -30352,12 +29722,13 @@ public com.dd.cws.adv1.pb.SecDumpProto.MatchedRule.Builder addMatchedRulesBuilde return matchedRulesBuilder_; } - private com.google.protobuf.LazyStringList imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private com.google.protobuf.LazyStringArrayList imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); private void ensureImageTagsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!imageTags_.isModifiable()) { imageTags_ = new com.google.protobuf.LazyStringArrayList(imageTags_); - bitField0_ |= 0x00000002; - } + } + bitField0_ |= 0x00000002; } /** * repeated string image_tags = 4; @@ -30365,7 +29736,8 @@ private void ensureImageTagsIsMutable() { */ public com.google.protobuf.ProtocolStringList getImageTagsList() { - return imageTags_.getUnmodifiableView(); + imageTags_.makeImmutable(); + return imageTags_; } /** * repeated string image_tags = 4; @@ -30402,6 +29774,7 @@ public Builder setImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -30415,6 +29788,7 @@ public Builder addImageTags( if (value == null) { throw new NullPointerException(); } ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -30428,6 +29802,7 @@ public Builder addAllImageTags( ensureImageTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, imageTags_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -30436,8 +29811,9 @@ public Builder addAllImageTags( * @return This builder for chaining. */ public Builder clearImageTags() { - imageTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + imageTags_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002);; onChanged(); return this; } @@ -30452,6 +29828,7 @@ public Builder addImageTagsBytes( checkByteStringIsUtf8(value); ensureImageTagsIsMutable(); imageTags_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -30471,7 +29848,7 @@ public int getPort() { * @return This builder for chaining. */ public Builder setPort(int value) { - + port_ = value; bitField0_ |= 0x00000004; onChanged(); @@ -30735,11 +30112,6 @@ protected java.lang.Object newInstance( return new MatchedRule(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_MatchedRule_descriptor; @@ -31318,38 +30690,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.MatchedRule result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.MatchedRule) { @@ -31979,11 +31319,6 @@ protected java.lang.Object newInstance( return new event_type_state(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.dd.cws.adv1.pb.SecDumpProto.internal_static_datadog_cws_dumpsv1_event_type_state_descriptor; @@ -32269,38 +31604,6 @@ private void buildPartial0(com.dd.cws.adv1.pb.SecDumpProto.event_type_state resu } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.dd.cws.adv1.pb.SecDumpProto.event_type_state) { @@ -32387,7 +31690,7 @@ public long getLastAnomalyNano() { * @return This builder for chaining. */ public Builder setLastAnomalyNano(long value) { - + lastAnomalyNano_ = value; bitField0_ |= 0x00000001; onChanged(); diff --git a/sbom/sbom.pb.go b/sbom/sbom.pb.go index 6912b98f..56310cb8 100644 --- a/sbom/sbom.pb.go +++ b/sbom/sbom.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc v4.22.5 // source: proto/sbom/sbom.proto package sbom import ( cyclonedx_v1_4 "github.com/DataDog/agent-payload/v5/cyclonedx_v1_4" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -215,15 +215,15 @@ type SBOMEntity struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type SBOMSourceType `protobuf:"varint,1,opt,name=type,proto3,enum=datadog.sbom.SBOMSourceType" json:"type,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` // Unique identifier to be able to correlated and "deduplicate" SBOM - GeneratedAt *timestamp.Timestamp `protobuf:"bytes,3,opt,name=generatedAt,proto3,oneof" json:"generatedAt,omitempty"` // the datetime of the SBOM generation - RepoTags []string `protobuf:"bytes,4,rep,name=repo_tags,json=repoTags,proto3" json:"repo_tags,omitempty"` // the tags of the container image - InUse bool `protobuf:"varint,5,opt,name=inUse,proto3" json:"inUse,omitempty"` // Whether the SBOM concerns a running entity (running container) or an inert entity (image not used by any container) - GenerationDuration *duration.Duration `protobuf:"bytes,6,opt,name=generationDuration,proto3,oneof" json:"generationDuration,omitempty"` // SBOM generation duration (how long it took to generate the SBOM report) - DdTags []string `protobuf:"bytes,7,rep,name=dd_tags,json=ddTags,proto3" json:"dd_tags,omitempty"` // datadog tags that will be added by the agent depending of the SBOMSourceType - Heartbeat bool `protobuf:"varint,8,opt,name=heartbeat,proto3" json:"heartbeat,omitempty"` // Whether the SBOM is identical to the previously sent one - Hash string `protobuf:"bytes,9,opt,name=hash,proto3" json:"hash,omitempty"` // Hash of the SBOM + Type SBOMSourceType `protobuf:"varint,1,opt,name=type,proto3,enum=datadog.sbom.SBOMSourceType" json:"type,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` // Unique identifier to be able to correlated and "deduplicate" SBOM + GeneratedAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=generatedAt,proto3,oneof" json:"generatedAt,omitempty"` // the datetime of the SBOM generation + RepoTags []string `protobuf:"bytes,4,rep,name=repo_tags,json=repoTags,proto3" json:"repo_tags,omitempty"` // the tags of the container image + InUse bool `protobuf:"varint,5,opt,name=inUse,proto3" json:"inUse,omitempty"` // Whether the SBOM concerns a running entity (running container) or an inert entity (image not used by any container) + GenerationDuration *durationpb.Duration `protobuf:"bytes,6,opt,name=generationDuration,proto3,oneof" json:"generationDuration,omitempty"` // SBOM generation duration (how long it took to generate the SBOM report) + DdTags []string `protobuf:"bytes,7,rep,name=dd_tags,json=ddTags,proto3" json:"dd_tags,omitempty"` // datadog tags that will be added by the agent depending of the SBOMSourceType + Heartbeat bool `protobuf:"varint,8,opt,name=heartbeat,proto3" json:"heartbeat,omitempty"` // Whether the SBOM is identical to the previously sent one + Hash string `protobuf:"bytes,9,opt,name=hash,proto3" json:"hash,omitempty"` // Hash of the SBOM // Types that are assignable to Sbom: // // *SBOMEntity_Cyclonedx @@ -279,7 +279,7 @@ func (x *SBOMEntity) GetId() string { return "" } -func (x *SBOMEntity) GetGeneratedAt() *timestamp.Timestamp { +func (x *SBOMEntity) GetGeneratedAt() *timestamppb.Timestamp { if x != nil { return x.GeneratedAt } @@ -300,7 +300,7 @@ func (x *SBOMEntity) GetInUse() bool { return false } -func (x *SBOMEntity) GetGenerationDuration() *duration.Duration { +func (x *SBOMEntity) GetGenerationDuration() *durationpb.Duration { if x != nil { return x.GenerationDuration } @@ -474,13 +474,13 @@ func file_proto_sbom_sbom_proto_rawDescGZIP() []byte { var file_proto_sbom_sbom_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_proto_sbom_sbom_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_proto_sbom_sbom_proto_goTypes = []interface{}{ - (SBOMSourceType)(0), // 0: datadog.sbom.SBOMSourceType - (SBOMStatus)(0), // 1: datadog.sbom.SBOMStatus - (*SBOMPayload)(nil), // 2: datadog.sbom.SBOMPayload - (*SBOMEntity)(nil), // 3: datadog.sbom.SBOMEntity - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*duration.Duration)(nil), // 5: google.protobuf.Duration - (*cyclonedx_v1_4.Bom)(nil), // 6: cyclonedx.v1_4.Bom + (SBOMSourceType)(0), // 0: datadog.sbom.SBOMSourceType + (SBOMStatus)(0), // 1: datadog.sbom.SBOMStatus + (*SBOMPayload)(nil), // 2: datadog.sbom.SBOMPayload + (*SBOMEntity)(nil), // 3: datadog.sbom.SBOMEntity + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration + (*cyclonedx_v1_4.Bom)(nil), // 6: cyclonedx.v1_4.Bom } var file_proto_sbom_sbom_proto_depIdxs = []int32{ 3, // 0: datadog.sbom.SBOMPayload.entities:type_name -> datadog.sbom.SBOMEntity