diff --git a/agent/build.gradle b/agent/build.gradle index 08ed152..43ddfbd 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -6,7 +6,7 @@ plugins { id 'signing' // https://github.com/johnrengelman/shadow - id "com.github.johnrengelman.shadow" version "7.0.0" + id 'com.github.johnrengelman.shadow' version '7.0.0' } sourceCompatibility = JavaVersion.VERSION_1_8 @@ -21,7 +21,7 @@ dependencies { api project(":async-profiler-context") implementation('com.squareup.okhttp3:okhttp:4.12.0') implementation("com.squareup.moshi:moshi:1.14.0") - api 'com.google.protobuf:protobuf-java:4.28.1' + api 'com.google.protobuf:protobuf-java:4.29.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.10.0' diff --git a/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java b/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java index b7e0c91..200be25 100644 --- a/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java +++ b/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java @@ -11,9 +11,9 @@ public final class Snapshot { public final Instant started; public final Instant ended; public final byte[] data; - public final JfrLabels.Snapshot labels; + public final JfrLabels.LabelsSnapshot labels; - Snapshot(Format format, final EventType eventType, final Instant started, final Instant ended,final byte[] data, JfrLabels.Snapshot labels) { + Snapshot(Format format, final EventType eventType, final Instant started, final Instant ended,final byte[] data, JfrLabels.LabelsSnapshot labels) { this.format = format; this.eventType = eventType; this.started = started; diff --git a/async-profiler-context/build.gradle b/async-profiler-context/build.gradle index f92f8d6..595442b 100644 --- a/async-profiler-context/build.gradle +++ b/async-profiler-context/build.gradle @@ -25,7 +25,7 @@ def asyncProfilerVersion = project.properties['async_profiler_version'] def pyroscopeVersion = project.properties['pyroscope_version'] dependencies { api files("$buildDir/async-profiler/async-profiler.jar") - implementation 'com.google.protobuf:protobuf-java:3.21.1' + implementation 'com.google.protobuf:protobuf-java:4.29.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.10.0' @@ -201,3 +201,14 @@ afterEvaluate { } } } + +tasks.register('generate-proto-classes') { + doLast { + exec { + commandLine 'protoc', + '-I', '.', + '--java_out', 'src/main/java', + 'jfr_labels.proto' + } + } +} diff --git a/async-profiler-context/src/main/jfr_labels.proto b/async-profiler-context/jfr_labels.proto similarity index 100% rename from async-profiler-context/src/main/jfr_labels.proto rename to async-profiler-context/jfr_labels.proto diff --git a/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java b/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java index 141a665..3082c6a 100644 --- a/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java +++ b/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java @@ -28,8 +28,8 @@ public static void run(LabelsSet labels, Runnable c) { } } - public static JfrLabels.Snapshot dump() { - JfrLabels.Snapshot.Builder sb = JfrLabels.Snapshot.newBuilder(); + public static JfrLabels.LabelsSnapshot dump() { + JfrLabels.LabelsSnapshot.Builder sb = JfrLabels.LabelsSnapshot.newBuilder(); for (Ref it : RefCounted.strings.valueToRef.values()) { sb.putStrings(it.id, it.val); diff --git a/async-profiler-context/src/main/java/io/pyroscope/labels/pb/JfrLabels.java b/async-profiler-context/src/main/java/io/pyroscope/labels/pb/JfrLabels.java index 6e9156b..d1044e6 100644 --- a/async-profiler-context/src/main/java/io/pyroscope/labels/pb/JfrLabels.java +++ b/async-profiler-context/src/main/java/io/pyroscope/labels/pb/JfrLabels.java @@ -1,10 +1,20 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: jfr_labels.proto +// Protobuf Java Version: 4.26.1 package io.pyroscope.labels.pb; public final class JfrLabels { private JfrLabels() {} + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + JfrLabels.class.getName()); + } public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -41,14 +51,12 @@ boolean containsLabels( /** * map<int64, int64> labels = 1; */ - long getLabelsOrDefault( long key, long defaultValue); /** * map<int64, int64> labels = 1; */ - long getLabelsOrThrow( long key); } @@ -56,80 +64,26 @@ long getLabelsOrThrow( * Protobuf type {@code io.pyroscope.labels.pb.Context} */ public static final class Context extends - com.google.protobuf.GeneratedMessageV3 implements + com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:io.pyroscope.labels.pb.Context) ContextOrBuilder { private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + Context.class.getName()); + } // Use Context.newBuilder() to construct. - private Context(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private Context(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private Context() { } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new Context(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Context( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - labels_ = com.google.protobuf.MapField.newMapField( - LabelsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - labels__ = input.readMessage( - LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - labels_.getMutableMap().put( - labels__.getKey(), labels__.getValue()); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Context_descriptor; @@ -137,7 +91,7 @@ private Context( @SuppressWarnings({"rawtypes"}) @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( int number) { switch (number) { case 1: @@ -148,7 +102,7 @@ protected com.google.protobuf.MapField internalGetMapField( } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Context_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -167,6 +121,7 @@ private static final class LabelsDefaultEntryHolder { com.google.protobuf.WireFormat.FieldType.INT64, 0L); } + @SuppressWarnings("serial") private com.google.protobuf.MapField< java.lang.Long, java.lang.Long> labels_; private com.google.protobuf.MapField @@ -177,18 +132,16 @@ private static final class LabelsDefaultEntryHolder { } return labels_; } - public int getLabelsCount() { return internalGetLabels().getMap().size(); } /** * map<int64, int64> labels = 1; */ - @java.lang.Override public boolean containsLabels( long key) { - + return internalGetLabels().getMap().containsKey(key); } /** @@ -203,7 +156,6 @@ public java.util.Map getLabels() { * map<int64, int64> labels = 1; */ @java.lang.Override - public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } @@ -211,11 +163,10 @@ public java.util.Map getLabelsMap() { * map<int64, int64> labels = 1; */ @java.lang.Override - public long getLabelsOrDefault( long key, long defaultValue) { - + java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -224,10 +175,9 @@ public long getLabelsOrDefault( * map<int64, int64> labels = 1; */ @java.lang.Override - public long getLabelsOrThrow( long key) { - + java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -250,13 +200,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - com.google.protobuf.GeneratedMessageV3 + com.google.protobuf.GeneratedMessage .serializeLongMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 1); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -275,7 +225,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, labels__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -292,7 +242,7 @@ public boolean equals(final java.lang.Object obj) { if (!internalGetLabels().equals( other.internalGetLabels())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -307,7 +257,7 @@ public int hashCode() { hash = (37 * hash) + LABELS_FIELD_NUMBER; hash = (53 * hash) + internalGetLabels().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -346,39 +296,41 @@ public static io.pyroscope.labels.pb.JfrLabels.Context parseFrom( } public static io.pyroscope.labels.pb.JfrLabels.Context parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } public static io.pyroscope.labels.pb.JfrLabels.Context parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } + public static io.pyroscope.labels.pb.JfrLabels.Context parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } + public static io.pyroscope.labels.pb.JfrLabels.Context parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static io.pyroscope.labels.pb.JfrLabels.Context parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } public static io.pyroscope.labels.pb.JfrLabels.Context parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -398,7 +350,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -406,7 +358,7 @@ protected Builder newBuilderForType( * Protobuf type {@code io.pyroscope.labels.pb.Context} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements + com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:io.pyroscope.labels.pb.Context) io.pyroscope.labels.pb.JfrLabels.ContextOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -415,7 +367,7 @@ public static final class Builder extends } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( int number) { switch (number) { case 1: @@ -426,7 +378,7 @@ protected com.google.protobuf.MapField internalGetMapField( } } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection( int number) { switch (number) { case 1: @@ -437,7 +389,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField( } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Context_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -446,22 +398,18 @@ protected com.google.protobuf.MapField internalGetMutableMapField( // Construct using io.pyroscope.labels.pb.JfrLabels.Context.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; internalGetMutableLabels().clear(); return this; } @@ -489,45 +437,19 @@ public io.pyroscope.labels.pb.JfrLabels.Context build() { @java.lang.Override public io.pyroscope.labels.pb.JfrLabels.Context buildPartial() { io.pyroscope.labels.pb.JfrLabels.Context result = new io.pyroscope.labels.pb.JfrLabels.Context(this); - int from_bitField0_ = bitField0_; - result.labels_ = internalGetLabels(); - result.labels_.makeImmutable(); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return 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); + private void buildPartial0(io.pyroscope.labels.pb.JfrLabels.Context result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.labels_ = internalGetLabels(); + result.labels_.makeImmutable(); + } } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof io.pyroscope.labels.pb.JfrLabels.Context) { @@ -542,7 +464,8 @@ public Builder mergeFrom(io.pyroscope.labels.pb.JfrLabels.Context other) { if (other == io.pyroscope.labels.pb.JfrLabels.Context.getDefaultInstance()) return this; internalGetMutableLabels().mergeFrom( other.internalGetLabels()); - this.mergeUnknownFields(other.unknownFields); + bitField0_ |= 0x00000001; + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -557,17 +480,39 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - io.pyroscope.labels.pb.JfrLabels.Context parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + com.google.protobuf.MapEntry + labels__ = input.readMessage( + LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableLabels().getMutableMap().put( + labels__.getKey(), labels__.getValue()); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (io.pyroscope.labels.pb.JfrLabels.Context) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -575,7 +520,7 @@ public Builder mergeFrom( private com.google.protobuf.MapField< java.lang.Long, java.lang.Long> labels_; private com.google.protobuf.MapField - internalGetLabels() { + internalGetLabels() { if (labels_ == null) { return com.google.protobuf.MapField.emptyMapField( LabelsDefaultEntryHolder.defaultEntry); @@ -583,8 +528,7 @@ public Builder mergeFrom( return labels_; } private com.google.protobuf.MapField - internalGetMutableLabels() { - onChanged();; + internalGetMutableLabels() { if (labels_ == null) { labels_ = com.google.protobuf.MapField.newMapField( LabelsDefaultEntryHolder.defaultEntry); @@ -592,20 +536,20 @@ public Builder mergeFrom( if (!labels_.isMutable()) { labels_ = labels_.copy(); } + bitField0_ |= 0x00000001; + onChanged(); return labels_; } - public int getLabelsCount() { return internalGetLabels().getMap().size(); } /** * map<int64, int64> labels = 1; */ - @java.lang.Override public boolean containsLabels( long key) { - + return internalGetLabels().getMap().containsKey(key); } /** @@ -620,7 +564,6 @@ public java.util.Map getLabels() { * map<int64, int64> labels = 1; */ @java.lang.Override - public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } @@ -628,11 +571,10 @@ public java.util.Map getLabelsMap() { * map<int64, int64> labels = 1; */ @java.lang.Override - public long getLabelsOrDefault( long key, long defaultValue) { - + java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -641,10 +583,9 @@ public long getLabelsOrDefault( * map<int64, int64> labels = 1; */ @java.lang.Override - public long getLabelsOrThrow( long key) { - + java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -652,8 +593,8 @@ public long getLabelsOrThrow( } return map.get(key); } - public Builder clearLabels() { + bitField0_ = (bitField0_ & ~0x00000001); internalGetMutableLabels().getMutableMap() .clear(); return this; @@ -661,10 +602,9 @@ public Builder clearLabels() { /** * map<int64, int64> labels = 1; */ - public Builder removeLabels( long key) { - + internalGetMutableLabels().getMutableMap() .remove(key); return this; @@ -674,7 +614,8 @@ public Builder removeLabels( */ @java.lang.Deprecated public java.util.Map - getMutableLabels() { + getMutableLabels() { + bitField0_ |= 0x00000001; return internalGetMutableLabels().getMutableMap(); } /** @@ -683,34 +624,23 @@ public Builder removeLabels( public Builder putLabels( long key, long value) { - - + + internalGetMutableLabels().getMutableMap() .put(key, value); + bitField0_ |= 0x00000001; return this; } /** * map<int64, int64> labels = 1; */ - public Builder putAllLabels( java.util.Map values) { internalGetMutableLabels().getMutableMap() .putAll(values); + bitField0_ |= 0x00000001; return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:io.pyroscope.labels.pb.Context) } @@ -732,7 +662,18 @@ public Context parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Context(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -752,8 +693,8 @@ public io.pyroscope.labels.pb.JfrLabels.Context getDefaultInstanceForType() { } - public interface SnapshotOrBuilder extends - // @@protoc_insertion_point(interface_extends:io.pyroscope.labels.pb.Snapshot) + public interface LabelsSnapshotOrBuilder extends + // @@protoc_insertion_point(interface_extends:io.pyroscope.labels.pb.LabelsSnapshot) com.google.protobuf.MessageOrBuilder { /** @@ -779,14 +720,14 @@ boolean containsContexts( /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - - io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( + /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( long key, - io.pyroscope.labels.pb.JfrLabels.Context defaultValue); + /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context defaultValue); /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - io.pyroscope.labels.pb.JfrLabels.Context getContextsOrThrow( long key); @@ -813,116 +754,49 @@ boolean containsStrings( /** * map<int64, string> strings = 2; */ - - java.lang.String getStringsOrDefault( + /* nullable */ +java.lang.String getStringsOrDefault( long key, - java.lang.String defaultValue); + /* nullable */ +java.lang.String defaultValue); /** * map<int64, string> strings = 2; */ - java.lang.String getStringsOrThrow( long key); } /** - * Protobuf type {@code io.pyroscope.labels.pb.Snapshot} + * Protobuf type {@code io.pyroscope.labels.pb.LabelsSnapshot} */ - public static final class Snapshot extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:io.pyroscope.labels.pb.Snapshot) - SnapshotOrBuilder { + public static final class LabelsSnapshot extends + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:io.pyroscope.labels.pb.LabelsSnapshot) + LabelsSnapshotOrBuilder { private static final long serialVersionUID = 0L; - // Use Snapshot.newBuilder() to construct. - private Snapshot(com.google.protobuf.GeneratedMessageV3.Builder builder) { + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + LabelsSnapshot.class.getName()); + } + // Use LabelsSnapshot.newBuilder() to construct. + private LabelsSnapshot(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } - private Snapshot() { - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new Snapshot(); + private LabelsSnapshot() { } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Snapshot( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - contexts_ = com.google.protobuf.MapField.newMapField( - ContextsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - contexts__ = input.readMessage( - ContextsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - contexts_.getMutableMap().put( - contexts__.getKey(), contexts__.getValue()); - break; - } - case 18: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - strings_ = com.google.protobuf.MapField.newMapField( - StringsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000002; - } - com.google.protobuf.MapEntry - strings__ = input.readMessage( - StringsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - strings_.getMutableMap().put( - strings__.getKey(), strings__.getValue()); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_descriptor; + return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor; } @SuppressWarnings({"rawtypes"}) @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( int number) { switch (number) { case 1: @@ -935,11 +809,11 @@ protected com.google.protobuf.MapField internalGetMapField( } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_fieldAccessorTable + return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.pyroscope.labels.pb.JfrLabels.Snapshot.class, io.pyroscope.labels.pb.JfrLabels.Snapshot.Builder.class); + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.class, io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.Builder.class); } public static final int CONTEXTS_FIELD_NUMBER = 1; @@ -948,12 +822,13 @@ private static final class ContextsDefaultEntryHolder { java.lang.Long, io.pyroscope.labels.pb.JfrLabels.Context> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_descriptor, + io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_descriptor, com.google.protobuf.WireFormat.FieldType.INT64, 0L, com.google.protobuf.WireFormat.FieldType.MESSAGE, io.pyroscope.labels.pb.JfrLabels.Context.getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField< java.lang.Long, io.pyroscope.labels.pb.JfrLabels.Context> contexts_; private com.google.protobuf.MapField @@ -964,18 +839,16 @@ private static final class ContextsDefaultEntryHolder { } return contexts_; } - public int getContextsCount() { return internalGetContexts().getMap().size(); } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - @java.lang.Override public boolean containsContexts( long key) { - + return internalGetContexts().getMap().containsKey(key); } /** @@ -990,7 +863,6 @@ public java.util.Map g * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - public java.util.Map getContextsMap() { return internalGetContexts().getMap(); } @@ -998,11 +870,12 @@ public java.util.Map g * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - - public io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( + public /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( long key, - io.pyroscope.labels.pb.JfrLabels.Context defaultValue) { - + /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context defaultValue) { + java.util.Map map = internalGetContexts().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1011,10 +884,9 @@ public io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Context getContextsOrThrow( long key) { - + java.util.Map map = internalGetContexts().getMap(); if (!map.containsKey(key)) { @@ -1029,12 +901,13 @@ private static final class StringsDefaultEntryHolder { java.lang.Long, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_descriptor, + io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_descriptor, com.google.protobuf.WireFormat.FieldType.INT64, 0L, com.google.protobuf.WireFormat.FieldType.STRING, ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField< java.lang.Long, java.lang.String> strings_; private com.google.protobuf.MapField @@ -1045,18 +918,16 @@ private static final class StringsDefaultEntryHolder { } return strings_; } - public int getStringsCount() { return internalGetStrings().getMap().size(); } /** * map<int64, string> strings = 2; */ - @java.lang.Override public boolean containsStrings( long key) { - + return internalGetStrings().getMap().containsKey(key); } /** @@ -1071,7 +942,6 @@ public java.util.Map getStrings() { * map<int64, string> strings = 2; */ @java.lang.Override - public java.util.Map getStringsMap() { return internalGetStrings().getMap(); } @@ -1079,11 +949,12 @@ public java.util.Map getStringsMap() { * map<int64, string> strings = 2; */ @java.lang.Override - - public java.lang.String getStringsOrDefault( + public /* nullable */ +java.lang.String getStringsOrDefault( long key, - java.lang.String defaultValue) { - + /* nullable */ +java.lang.String defaultValue) { + java.util.Map map = internalGetStrings().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1092,10 +963,9 @@ public java.lang.String getStringsOrDefault( * map<int64, string> strings = 2; */ @java.lang.Override - public java.lang.String getStringsOrThrow( long key) { - + java.util.Map map = internalGetStrings().getMap(); if (!map.containsKey(key)) { @@ -1118,19 +988,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - com.google.protobuf.GeneratedMessageV3 + com.google.protobuf.GeneratedMessage .serializeLongMapTo( output, internalGetContexts(), ContextsDefaultEntryHolder.defaultEntry, 1); - com.google.protobuf.GeneratedMessageV3 + com.google.protobuf.GeneratedMessage .serializeLongMapTo( output, internalGetStrings(), StringsDefaultEntryHolder.defaultEntry, 2); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1159,7 +1029,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, strings__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1169,16 +1039,16 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof io.pyroscope.labels.pb.JfrLabels.Snapshot)) { + if (!(obj instanceof io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot)) { return super.equals(obj); } - io.pyroscope.labels.pb.JfrLabels.Snapshot other = (io.pyroscope.labels.pb.JfrLabels.Snapshot) obj; + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot other = (io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot) obj; if (!internalGetContexts().equals( other.internalGetContexts())) return false; if (!internalGetStrings().equals( other.internalGetStrings())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1197,78 +1067,80 @@ public int hashCode() { hash = (37 * hash) + STRINGS_FIELD_NUMBER; hash = (53 * hash) + internalGetStrings().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom(byte[] data) + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom(java.io.InputStream input) + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseDelimitedFrom(java.io.InputStream input) + + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseDelimitedFrom( + + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -1277,7 +1149,7 @@ public static io.pyroscope.labels.pb.JfrLabels.Snapshot parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(io.pyroscope.labels.pb.JfrLabels.Snapshot prototype) { + public static Builder newBuilder(io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1288,24 +1160,24 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * Protobuf type {@code io.pyroscope.labels.pb.Snapshot} + * Protobuf type {@code io.pyroscope.labels.pb.LabelsSnapshot} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:io.pyroscope.labels.pb.Snapshot) - io.pyroscope.labels.pb.JfrLabels.SnapshotOrBuilder { + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:io.pyroscope.labels.pb.LabelsSnapshot) + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshotOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_descriptor; + return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor; } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( int number) { switch (number) { case 1: @@ -1318,7 +1190,7 @@ protected com.google.protobuf.MapField internalGetMapField( } } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection( int number) { switch (number) { case 1: @@ -1331,31 +1203,27 @@ protected com.google.protobuf.MapField internalGetMutableMapField( } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_fieldAccessorTable + return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.pyroscope.labels.pb.JfrLabels.Snapshot.class, io.pyroscope.labels.pb.JfrLabels.Snapshot.Builder.class); + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.class, io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.Builder.class); } - // Construct using io.pyroscope.labels.pb.JfrLabels.Snapshot.newBuilder() + // Construct using io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; internalGetMutableContexts().clear(); internalGetMutableStrings().clear(); return this; @@ -1364,17 +1232,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_Snapshot_descriptor; + return io.pyroscope.labels.pb.JfrLabels.internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor; } @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstanceForType() { - return io.pyroscope.labels.pb.JfrLabels.Snapshot.getDefaultInstance(); + public io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot getDefaultInstanceForType() { + return io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.getDefaultInstance(); } @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Snapshot build() { - io.pyroscope.labels.pb.JfrLabels.Snapshot result = buildPartial(); + public io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot build() { + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1382,66 +1250,43 @@ public io.pyroscope.labels.pb.JfrLabels.Snapshot build() { } @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Snapshot buildPartial() { - io.pyroscope.labels.pb.JfrLabels.Snapshot result = new io.pyroscope.labels.pb.JfrLabels.Snapshot(this); - int from_bitField0_ = bitField0_; - result.contexts_ = internalGetContexts(); - result.contexts_.makeImmutable(); - result.strings_ = internalGetStrings(); - result.strings_.makeImmutable(); + public io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot buildPartial() { + io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot result = new io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return 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); + private void buildPartial0(io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.contexts_ = internalGetContexts().build(ContextsDefaultEntryHolder.defaultEntry); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.strings_ = internalGetStrings(); + result.strings_.makeImmutable(); + } } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof io.pyroscope.labels.pb.JfrLabels.Snapshot) { - return mergeFrom((io.pyroscope.labels.pb.JfrLabels.Snapshot)other); + if (other instanceof io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot) { + return mergeFrom((io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(io.pyroscope.labels.pb.JfrLabels.Snapshot other) { - if (other == io.pyroscope.labels.pb.JfrLabels.Snapshot.getDefaultInstance()) return this; + public Builder mergeFrom(io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot other) { + if (other == io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot.getDefaultInstance()) return this; internalGetMutableContexts().mergeFrom( other.internalGetContexts()); + bitField0_ |= 0x00000001; internalGetMutableStrings().mergeFrom( other.internalGetStrings()); - this.mergeUnknownFields(other.unknownFields); + bitField0_ |= 0x00000002; + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1456,56 +1301,95 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - io.pyroscope.labels.pb.JfrLabels.Snapshot parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + com.google.protobuf.MapEntry + contexts__ = input.readMessage( + ContextsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableContexts().ensureBuilderMap().put( + contexts__.getKey(), contexts__.getValue()); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + com.google.protobuf.MapEntry + strings__ = input.readMessage( + StringsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableStrings().getMutableMap().put( + strings__.getKey(), strings__.getValue()); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (io.pyroscope.labels.pb.JfrLabels.Snapshot) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private com.google.protobuf.MapField< - java.lang.Long, io.pyroscope.labels.pb.JfrLabels.Context> contexts_; - private com.google.protobuf.MapField - internalGetContexts() { + private static final class ContextsConverter implements com.google.protobuf.MapFieldBuilder.Converter { + @java.lang.Override + public io.pyroscope.labels.pb.JfrLabels.Context build(io.pyroscope.labels.pb.JfrLabels.ContextOrBuilder val) { + if (val instanceof io.pyroscope.labels.pb.JfrLabels.Context) { return (io.pyroscope.labels.pb.JfrLabels.Context) val; } + return ((io.pyroscope.labels.pb.JfrLabels.Context.Builder) val).build(); + } + + @java.lang.Override + public com.google.protobuf.MapEntry defaultEntry() { + return ContextsDefaultEntryHolder.defaultEntry; + } + }; + private static final ContextsConverter contextsConverter = new ContextsConverter(); + + private com.google.protobuf.MapFieldBuilder< + java.lang.Long, io.pyroscope.labels.pb.JfrLabels.ContextOrBuilder, io.pyroscope.labels.pb.JfrLabels.Context, io.pyroscope.labels.pb.JfrLabels.Context.Builder> contexts_; + private com.google.protobuf.MapFieldBuilder + internalGetContexts() { if (contexts_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ContextsDefaultEntryHolder.defaultEntry); + return new com.google.protobuf.MapFieldBuilder<>(contextsConverter); } return contexts_; } - private com.google.protobuf.MapField - internalGetMutableContexts() { - onChanged();; + private com.google.protobuf.MapFieldBuilder + internalGetMutableContexts() { if (contexts_ == null) { - contexts_ = com.google.protobuf.MapField.newMapField( - ContextsDefaultEntryHolder.defaultEntry); - } - if (!contexts_.isMutable()) { - contexts_ = contexts_.copy(); + contexts_ = new com.google.protobuf.MapFieldBuilder<>(contextsConverter); } + bitField0_ |= 0x00000001; + onChanged(); return contexts_; } - public int getContextsCount() { - return internalGetContexts().getMap().size(); + return internalGetContexts().ensureBuilderMap().size(); } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - @java.lang.Override public boolean containsContexts( long key) { - - return internalGetContexts().getMap().containsKey(key); + + return internalGetContexts().ensureBuilderMap().containsKey(key); } /** * Use {@link #getContextsMap()} instead. @@ -1519,52 +1403,47 @@ public java.util.Map g * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - public java.util.Map getContextsMap() { - return internalGetContexts().getMap(); + return internalGetContexts().getImmutableMap(); } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - - public io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( + public /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context getContextsOrDefault( long key, - io.pyroscope.labels.pb.JfrLabels.Context defaultValue) { - - java.util.Map map = - internalGetContexts().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + /* nullable */ +io.pyroscope.labels.pb.JfrLabels.Context defaultValue) { + + java.util.Map map = internalGetMutableContexts().ensureBuilderMap(); + return map.containsKey(key) ? contextsConverter.build(map.get(key)) : defaultValue; } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Context getContextsOrThrow( long key) { - - java.util.Map map = - internalGetContexts().getMap(); + + java.util.Map map = internalGetMutableContexts().ensureBuilderMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } - return map.get(key); + return contextsConverter.build(map.get(key)); } - public Builder clearContexts() { - internalGetMutableContexts().getMutableMap() - .clear(); + bitField0_ = (bitField0_ & ~0x00000001); + internalGetMutableContexts().clear(); return this; } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - public Builder removeContexts( long key) { - - internalGetMutableContexts().getMutableMap() + + internalGetMutableContexts().ensureBuilderMap() .remove(key); return this; } @@ -1573,8 +1452,9 @@ public Builder removeContexts( */ @java.lang.Deprecated public java.util.Map - getMutableContexts() { - return internalGetMutableContexts().getMutableMap(); + getMutableContexts() { + bitField0_ |= 0x00000001; + return internalGetMutableContexts().ensureMessageMap(); } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; @@ -1582,30 +1462,50 @@ public Builder removeContexts( public Builder putContexts( long key, io.pyroscope.labels.pb.JfrLabels.Context value) { - - if (value == null) { - throw new NullPointerException("map value"); -} - internalGetMutableContexts().getMutableMap() + if (value == null) { throw new NullPointerException("map value"); } + internalGetMutableContexts().ensureBuilderMap() .put(key, value); + bitField0_ |= 0x00000001; return this; } /** * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; */ - public Builder putAllContexts( java.util.Map values) { - internalGetMutableContexts().getMutableMap() + for (java.util.Map.Entry e : values.entrySet()) { + if (e.getKey() == null || e.getValue() == null) { + throw new NullPointerException(); + } + } + internalGetMutableContexts().ensureBuilderMap() .putAll(values); + bitField0_ |= 0x00000001; return this; } + /** + * map<int64, .io.pyroscope.labels.pb.Context> contexts = 1; + */ + public io.pyroscope.labels.pb.JfrLabels.Context.Builder putContextsBuilderIfAbsent( + long key) { + java.util.Map builderMap = internalGetMutableContexts().ensureBuilderMap(); + io.pyroscope.labels.pb.JfrLabels.ContextOrBuilder entry = builderMap.get(key); + if (entry == null) { + entry = io.pyroscope.labels.pb.JfrLabels.Context.newBuilder(); + builderMap.put(key, entry); + } + if (entry instanceof io.pyroscope.labels.pb.JfrLabels.Context) { + entry = ((io.pyroscope.labels.pb.JfrLabels.Context) entry).toBuilder(); + builderMap.put(key, entry); + } + return (io.pyroscope.labels.pb.JfrLabels.Context.Builder) entry; + } private com.google.protobuf.MapField< java.lang.Long, java.lang.String> strings_; private com.google.protobuf.MapField - internalGetStrings() { + internalGetStrings() { if (strings_ == null) { return com.google.protobuf.MapField.emptyMapField( StringsDefaultEntryHolder.defaultEntry); @@ -1613,8 +1513,7 @@ public Builder putAllContexts( return strings_; } private com.google.protobuf.MapField - internalGetMutableStrings() { - onChanged();; + internalGetMutableStrings() { if (strings_ == null) { strings_ = com.google.protobuf.MapField.newMapField( StringsDefaultEntryHolder.defaultEntry); @@ -1622,20 +1521,20 @@ public Builder putAllContexts( if (!strings_.isMutable()) { strings_ = strings_.copy(); } + bitField0_ |= 0x00000002; + onChanged(); return strings_; } - public int getStringsCount() { return internalGetStrings().getMap().size(); } /** * map<int64, string> strings = 2; */ - @java.lang.Override public boolean containsStrings( long key) { - + return internalGetStrings().getMap().containsKey(key); } /** @@ -1650,7 +1549,6 @@ public java.util.Map getStrings() { * map<int64, string> strings = 2; */ @java.lang.Override - public java.util.Map getStringsMap() { return internalGetStrings().getMap(); } @@ -1658,11 +1556,12 @@ public java.util.Map getStringsMap() { * map<int64, string> strings = 2; */ @java.lang.Override - - public java.lang.String getStringsOrDefault( + public /* nullable */ +java.lang.String getStringsOrDefault( long key, - java.lang.String defaultValue) { - + /* nullable */ +java.lang.String defaultValue) { + java.util.Map map = internalGetStrings().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1671,10 +1570,9 @@ public java.lang.String getStringsOrDefault( * map<int64, string> strings = 2; */ @java.lang.Override - public java.lang.String getStringsOrThrow( long key) { - + java.util.Map map = internalGetStrings().getMap(); if (!map.containsKey(key)) { @@ -1682,8 +1580,8 @@ public java.lang.String getStringsOrThrow( } return map.get(key); } - public Builder clearStrings() { + bitField0_ = (bitField0_ & ~0x00000002); internalGetMutableStrings().getMutableMap() .clear(); return this; @@ -1691,10 +1589,9 @@ public Builder clearStrings() { /** * map<int64, string> strings = 2; */ - public Builder removeStrings( long key) { - + internalGetMutableStrings().getMutableMap() .remove(key); return this; @@ -1704,7 +1601,8 @@ public Builder removeStrings( */ @java.lang.Deprecated public java.util.Map - getMutableStrings() { + getMutableStrings() { + bitField0_ |= 0x00000002; return internalGetMutableStrings().getMutableMap(); } /** @@ -1713,73 +1611,70 @@ public Builder removeStrings( public Builder putStrings( long key, java.lang.String value) { - - if (value == null) { - throw new NullPointerException("map value"); -} + if (value == null) { throw new NullPointerException("map value"); } internalGetMutableStrings().getMutableMap() .put(key, value); + bitField0_ |= 0x00000002; return this; } /** * map<int64, string> strings = 2; */ - public Builder putAllStrings( java.util.Map values) { internalGetMutableStrings().getMutableMap() .putAll(values); + bitField0_ |= 0x00000002; return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - // @@protoc_insertion_point(builder_scope:io.pyroscope.labels.pb.Snapshot) + // @@protoc_insertion_point(builder_scope:io.pyroscope.labels.pb.LabelsSnapshot) } - // @@protoc_insertion_point(class_scope:io.pyroscope.labels.pb.Snapshot) - private static final io.pyroscope.labels.pb.JfrLabels.Snapshot DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:io.pyroscope.labels.pb.LabelsSnapshot) + private static final io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new io.pyroscope.labels.pb.JfrLabels.Snapshot(); + DEFAULT_INSTANCE = new io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot(); } - public static io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstance() { + public static io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public Snapshot parsePartialFrom( + public LabelsSnapshot parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Snapshot(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstanceForType() { + public io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1788,28 +1683,28 @@ public io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstanceForType() { private static final com.google.protobuf.Descriptors.Descriptor internal_static_io_pyroscope_labels_pb_Context_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_io_pyroscope_labels_pb_Context_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_io_pyroscope_labels_pb_Context_LabelsEntry_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_io_pyroscope_labels_pb_Context_LabelsEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_io_pyroscope_labels_pb_Snapshot_descriptor; + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_io_pyroscope_labels_pb_Snapshot_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_descriptor; + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_descriptor; + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1823,14 +1718,14 @@ public io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstanceForType() { "pb\"u\n\007Context\022;\n\006labels\030\001 \003(\0132+.io.pyros" + "cope.labels.pb.Context.LabelsEntry\032-\n\013La" + "belsEntry\022\013\n\003key\030\001 \001(\003\022\r\n\005value\030\002 \001(\003:\0028" + - "\001\"\216\002\n\010Snapshot\022@\n\010contexts\030\001 \003(\0132..io.py" + - "roscope.labels.pb.Snapshot.ContextsEntry" + - "\022>\n\007strings\030\002 \003(\0132-.io.pyroscope.labels." + - "pb.Snapshot.StringsEntry\032P\n\rContextsEntr" + - "y\022\013\n\003key\030\001 \001(\003\022.\n\005value\030\002 \001(\0132\037.io.pyros" + - "cope.labels.pb.Context:\0028\001\032.\n\014StringsEnt" + - "ry\022\013\n\003key\030\001 \001(\003\022\r\n\005value\030\002 \001(\t:\0028\001b\006prot" + - "o3" + "\001\"\240\002\n\016LabelsSnapshot\022F\n\010contexts\030\001 \003(\01324" + + ".io.pyroscope.labels.pb.LabelsSnapshot.C" + + "ontextsEntry\022D\n\007strings\030\002 \003(\01323.io.pyros" + + "cope.labels.pb.LabelsSnapshot.StringsEnt" + + "ry\032P\n\rContextsEntry\022\013\n\003key\030\001 \001(\003\022.\n\005valu" + + "e\030\002 \001(\0132\037.io.pyroscope.labels.pb.Context" + + ":\0028\001\032.\n\014StringsEntry\022\013\n\003key\030\001 \001(\003\022\r\n\005val" + + "ue\030\002 \001(\t:\0028\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1839,33 +1734,34 @@ public io.pyroscope.labels.pb.JfrLabels.Snapshot getDefaultInstanceForType() { internal_static_io_pyroscope_labels_pb_Context_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_io_pyroscope_labels_pb_Context_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_io_pyroscope_labels_pb_Context_descriptor, new java.lang.String[] { "Labels", }); internal_static_io_pyroscope_labels_pb_Context_LabelsEntry_descriptor = internal_static_io_pyroscope_labels_pb_Context_descriptor.getNestedTypes().get(0); internal_static_io_pyroscope_labels_pb_Context_LabelsEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_io_pyroscope_labels_pb_Context_LabelsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_io_pyroscope_labels_pb_Snapshot_descriptor = + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_io_pyroscope_labels_pb_Snapshot_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_io_pyroscope_labels_pb_Snapshot_descriptor, + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor, new java.lang.String[] { "Contexts", "Strings", }); - internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_descriptor = - internal_static_io_pyroscope_labels_pb_Snapshot_descriptor.getNestedTypes().get(0); - internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_io_pyroscope_labels_pb_Snapshot_ContextsEntry_descriptor, + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_descriptor = + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor.getNestedTypes().get(0); + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_ContextsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_descriptor = - internal_static_io_pyroscope_labels_pb_Snapshot_descriptor.getNestedTypes().get(1); - internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_io_pyroscope_labels_pb_Snapshot_StringsEntry_descriptor, + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_descriptor = + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_descriptor.getNestedTypes().get(1); + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_io_pyroscope_labels_pb_LabelsSnapshot_StringsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); + descriptor.resolveAllFeaturesImmutable(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/async-profiler-context/src/test/java/io/pyroscope/labels/LabelsTest.java b/async-profiler-context/src/test/java/io/pyroscope/labels/LabelsTest.java index 48abe67..096f84f 100644 --- a/async-profiler-context/src/test/java/io/pyroscope/labels/LabelsTest.java +++ b/async-profiler-context/src/test/java/io/pyroscope/labels/LabelsTest.java @@ -2,7 +2,7 @@ import io.pyroscope.labels.io.pyroscope.PyroscopeAsyncProfiler; -import io.pyroscope.labels.pb.JfrLabels.Snapshot; +import io.pyroscope.labels.pb.JfrLabels.LabelsSnapshot; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ void testOneLabelSet() { assertEquals(1, ctxRef.refCount.get()); { - Snapshot snapshot = Pyroscope.LabelsWrapper.dump(); + LabelsSnapshot snapshot = Pyroscope.LabelsWrapper.dump(); assertEquals(1, snapshot.getContextsCount()); assertEquals(2, snapshot.getStringsCount()); assertEquals("k1", snapshot.getStringsMap().get(1L)); @@ -73,7 +73,7 @@ void testOneLabelSet() { assertEquals(1, k1.refCount.get()); assertEquals(1, v1.refCount.get()); { - Snapshot snapshot = Pyroscope.LabelsWrapper.dump(); + LabelsSnapshot snapshot = Pyroscope.LabelsWrapper.dump(); assertEquals(1, snapshot.getContextsCount()); assertEquals(2, snapshot.getStringsCount()); assertEquals("k1", snapshot.getStringsMap().get(1L)); @@ -85,7 +85,7 @@ void testOneLabelSet() { } { - Snapshot snapshot = Pyroscope.LabelsWrapper.dump(); + LabelsSnapshot snapshot = Pyroscope.LabelsWrapper.dump(); assertEquals(0, snapshot.getContextsCount()); assertEquals(0, snapshot.getStringsCount()); assertEquals(-1, k1.refCount.get()); @@ -119,7 +119,7 @@ void testNestedEqualLabelSets() { assertEquals(2, ctxRef.refCount.get()); { - Snapshot snapshot = Pyroscope.LabelsWrapper.dump(); + LabelsSnapshot snapshot = Pyroscope.LabelsWrapper.dump(); assertEquals(1, snapshot.getContextsCount()); assertEquals(2, snapshot.getStringsCount()); assertEquals("k1", snapshot.getStringsMap().get(1L)); @@ -176,7 +176,7 @@ void testLabelsSetMerge() { assertEquals(1, ctxRef.refCount.get()); { - Snapshot snapshot = Pyroscope.LabelsWrapper.dump(); + LabelsSnapshot snapshot = Pyroscope.LabelsWrapper.dump(); assertEquals(3, snapshot.getContextsCount()); assertEquals(5, snapshot.getStringsCount()); assertEquals("k1", snapshot.getStringsMap().get(1L));