diff options
26 files changed, 507 insertions, 1086 deletions
diff --git a/kamon-akka-remote/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java b/kamon-akka-remote/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java index 1190cb10..36a01f25 100644 --- a/kamon-akka-remote/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java +++ b/kamon-akka-remote/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java @@ -10,196 +10,72 @@ public final class TraceContextAwareWireFormats { } public interface AckAndTraceContextAwareEnvelopeContainerOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .AcknowledgementInfo ack = 1; - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ boolean hasAck(); - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ akka.remote.WireFormats.AcknowledgementInfo getAck(); - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder(); - + // optional .TraceContextAwareRemoteEnvelope envelope = 2; - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ boolean hasEnvelope(); - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope(); - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder(); } - /** - * Protobuf type {@code AckAndTraceContextAwareEnvelopeContainer} - */ public static final class AckAndTraceContextAwareEnvelopeContainer extends com.google.protobuf.GeneratedMessage implements AckAndTraceContextAwareEnvelopeContainerOrBuilder { // Use AckAndTraceContextAwareEnvelopeContainer.newBuilder() to construct. - private AckAndTraceContextAwareEnvelopeContainer(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + private AckAndTraceContextAwareEnvelopeContainer(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private AckAndTraceContextAwareEnvelopeContainer(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private AckAndTraceContextAwareEnvelopeContainer(boolean noInit) {} + private static final AckAndTraceContextAwareEnvelopeContainer defaultInstance; public static AckAndTraceContextAwareEnvelopeContainer getDefaultInstance() { return defaultInstance; } - + public AckAndTraceContextAwareEnvelopeContainer getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AckAndTraceContextAwareEnvelopeContainer( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - 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; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - akka.remote.WireFormats.AcknowledgementInfo.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = ack_.toBuilder(); - } - ack_ = input.readMessage(akka.remote.WireFormats.AcknowledgementInfo.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(ack_); - ack_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = envelope_.toBuilder(); - } - envelope_ = input.readMessage(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(envelope_); - envelope_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.class, akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable; } - - public static com.google.protobuf.Parser<AckAndTraceContextAwareEnvelopeContainer> PARSER = - new com.google.protobuf.AbstractParser<AckAndTraceContextAwareEnvelopeContainer>() { - public AckAndTraceContextAwareEnvelopeContainer parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new AckAndTraceContextAwareEnvelopeContainer(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<AckAndTraceContextAwareEnvelopeContainer> getParserForType() { - return PARSER; - } - + private int bitField0_; // optional .AcknowledgementInfo ack = 1; public static final int ACK_FIELD_NUMBER = 1; private akka.remote.WireFormats.AcknowledgementInfo ack_; - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public boolean hasAck() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public akka.remote.WireFormats.AcknowledgementInfo getAck() { return ack_; } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() { return ack_; } - + // optional .TraceContextAwareRemoteEnvelope envelope = 2; public static final int ENVELOPE_FIELD_NUMBER = 2; private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope envelope_; - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public boolean hasEnvelope() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope() { return envelope_; } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder() { return envelope_; } - + private void initFields() { ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance(); envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance(); @@ -208,7 +84,7 @@ public final class TraceContextAwareWireFormats { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (hasAck()) { if (!getAck().isInitialized()) { memoizedIsInitialized = 0; @@ -224,7 +100,7 @@ public final class TraceContextAwareWireFormats { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -236,12 +112,12 @@ public final class TraceContextAwareWireFormats { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -255,83 +131,94 @@ public final class TraceContextAwareWireFormats { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code AckAndTraceContextAwareEnvelopeContainer} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainerOrBuilder { @@ -339,21 +226,18 @@ public final class TraceContextAwareWireFormats { getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.class, akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable; } - + // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -366,7 +250,7 @@ public final class TraceContextAwareWireFormats { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); if (ackBuilder_ == null) { @@ -383,20 +267,20 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor; + return akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDescriptor(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer getDefaultInstanceForType() { return akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDefaultInstance(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer build() { akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = buildPartial(); if (!result.isInitialized()) { @@ -404,7 +288,17 @@ public final class TraceContextAwareWireFormats { } return result; } - + + private akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer buildPartial() { akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = new akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer(this); int from_bitField0_ = bitField0_; @@ -429,7 +323,7 @@ public final class TraceContextAwareWireFormats { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer) { return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer)other); @@ -438,7 +332,7 @@ public final class TraceContextAwareWireFormats { return this; } } - + public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer other) { if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDefaultInstance()) return this; if (other.hasAck()) { @@ -450,7 +344,7 @@ public final class TraceContextAwareWireFormats { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (hasAck()) { if (!getAck().isInitialized()) { @@ -466,39 +360,61 @@ public final class TraceContextAwareWireFormats { } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + akka.remote.WireFormats.AcknowledgementInfo.Builder subBuilder = akka.remote.WireFormats.AcknowledgementInfo.newBuilder(); + if (hasAck()) { + subBuilder.mergeFrom(getAck()); + } + input.readMessage(subBuilder, extensionRegistry); + setAck(subBuilder.buildPartial()); + break; + } + case 18: { + akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder subBuilder = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.newBuilder(); + if (hasEnvelope()) { + subBuilder.mergeFrom(getEnvelope()); + } + input.readMessage(subBuilder, extensionRegistry); + setEnvelope(subBuilder.buildPartial()); + break; + } } } - return this; } + private int bitField0_; - + // optional .AcknowledgementInfo ack = 1; private akka.remote.WireFormats.AcknowledgementInfo ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> ackBuilder_; - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public boolean hasAck() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public akka.remote.WireFormats.AcknowledgementInfo getAck() { if (ackBuilder_ == null) { return ack_; @@ -506,9 +422,6 @@ public final class TraceContextAwareWireFormats { return ackBuilder_.getMessage(); } } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public Builder setAck(akka.remote.WireFormats.AcknowledgementInfo value) { if (ackBuilder_ == null) { if (value == null) { @@ -522,9 +435,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public Builder setAck( akka.remote.WireFormats.AcknowledgementInfo.Builder builderForValue) { if (ackBuilder_ == null) { @@ -536,9 +446,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public Builder mergeAck(akka.remote.WireFormats.AcknowledgementInfo value) { if (ackBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && @@ -555,9 +462,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public Builder clearAck() { if (ackBuilder_ == null) { ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance(); @@ -568,17 +472,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000001); return this; } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public akka.remote.WireFormats.AcknowledgementInfo.Builder getAckBuilder() { bitField0_ |= 0x00000001; onChanged(); return getAckFieldBuilder().getBuilder(); } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() { if (ackBuilder_ != null) { return ackBuilder_.getMessageOrBuilder(); @@ -586,9 +484,6 @@ public final class TraceContextAwareWireFormats { return ack_; } } - /** - * <code>optional .AcknowledgementInfo ack = 1;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> getAckFieldBuilder() { @@ -602,20 +497,14 @@ public final class TraceContextAwareWireFormats { } return ackBuilder_; } - + // optional .TraceContextAwareRemoteEnvelope envelope = 2; private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder> envelopeBuilder_; - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public boolean hasEnvelope() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope() { if (envelopeBuilder_ == null) { return envelope_; @@ -623,9 +512,6 @@ public final class TraceContextAwareWireFormats { return envelopeBuilder_.getMessage(); } } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public Builder setEnvelope(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope value) { if (envelopeBuilder_ == null) { if (value == null) { @@ -639,9 +525,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public Builder setEnvelope( akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder builderForValue) { if (envelopeBuilder_ == null) { @@ -653,9 +536,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public Builder mergeEnvelope(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope value) { if (envelopeBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -672,9 +552,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public Builder clearEnvelope() { if (envelopeBuilder_ == null) { envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance(); @@ -685,17 +562,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder getEnvelopeBuilder() { bitField0_ |= 0x00000002; onChanged(); return getEnvelopeFieldBuilder().getBuilder(); } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder() { if (envelopeBuilder_ != null) { return envelopeBuilder_.getMessageOrBuilder(); @@ -703,9 +574,6 @@ public final class TraceContextAwareWireFormats { return envelope_; } } - /** - * <code>optional .TraceContextAwareRemoteEnvelope envelope = 2;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder> getEnvelopeFieldBuilder() { @@ -719,339 +587,136 @@ public final class TraceContextAwareWireFormats { } return envelopeBuilder_; } - + // @@protoc_insertion_point(builder_scope:AckAndTraceContextAwareEnvelopeContainer) } - + static { defaultInstance = new AckAndTraceContextAwareEnvelopeContainer(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:AckAndTraceContextAwareEnvelopeContainer) } - + public interface TraceContextAwareRemoteEnvelopeOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required .ActorRefData recipient = 1; - /** - * <code>required .ActorRefData recipient = 1;</code> - */ boolean hasRecipient(); - /** - * <code>required .ActorRefData recipient = 1;</code> - */ akka.remote.WireFormats.ActorRefData getRecipient(); - /** - * <code>required .ActorRefData recipient = 1;</code> - */ akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder(); - + // required .SerializedMessage message = 2; - /** - * <code>required .SerializedMessage message = 2;</code> - */ boolean hasMessage(); - /** - * <code>required .SerializedMessage message = 2;</code> - */ akka.remote.WireFormats.SerializedMessage getMessage(); - /** - * <code>required .SerializedMessage message = 2;</code> - */ akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder(); - + // optional .ActorRefData sender = 4; - /** - * <code>optional .ActorRefData sender = 4;</code> - */ boolean hasSender(); - /** - * <code>optional .ActorRefData sender = 4;</code> - */ akka.remote.WireFormats.ActorRefData getSender(); - /** - * <code>optional .ActorRefData sender = 4;</code> - */ akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder(); - + // optional fixed64 seq = 5; - /** - * <code>optional fixed64 seq = 5;</code> - */ boolean hasSeq(); - /** - * <code>optional fixed64 seq = 5;</code> - */ long getSeq(); - + // optional .RemoteTraceContext traceContext = 15; - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ boolean hasTraceContext(); - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext(); - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder(); } - /** - * Protobuf type {@code TraceContextAwareRemoteEnvelope} - */ public static final class TraceContextAwareRemoteEnvelope extends com.google.protobuf.GeneratedMessage implements TraceContextAwareRemoteEnvelopeOrBuilder { // Use TraceContextAwareRemoteEnvelope.newBuilder() to construct. - private TraceContextAwareRemoteEnvelope(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + private TraceContextAwareRemoteEnvelope(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private TraceContextAwareRemoteEnvelope(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private TraceContextAwareRemoteEnvelope(boolean noInit) {} + private static final TraceContextAwareRemoteEnvelope defaultInstance; public static TraceContextAwareRemoteEnvelope getDefaultInstance() { return defaultInstance; } - + public TraceContextAwareRemoteEnvelope getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private TraceContextAwareRemoteEnvelope( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - 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; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - akka.remote.WireFormats.ActorRefData.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = recipient_.toBuilder(); - } - recipient_ = input.readMessage(akka.remote.WireFormats.ActorRefData.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(recipient_); - recipient_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - akka.remote.WireFormats.SerializedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = message_.toBuilder(); - } - message_ = input.readMessage(akka.remote.WireFormats.SerializedMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(message_); - message_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 34: { - akka.remote.WireFormats.ActorRefData.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = sender_.toBuilder(); - } - sender_ = input.readMessage(akka.remote.WireFormats.ActorRefData.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(sender_); - sender_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 41: { - bitField0_ |= 0x00000008; - seq_ = input.readFixed64(); - break; - } - case 122: { - akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = traceContext_.toBuilder(); - } - traceContext_ = input.readMessage(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(traceContext_); - traceContext_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.class, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable; } - - public static com.google.protobuf.Parser<TraceContextAwareRemoteEnvelope> PARSER = - new com.google.protobuf.AbstractParser<TraceContextAwareRemoteEnvelope>() { - public TraceContextAwareRemoteEnvelope parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new TraceContextAwareRemoteEnvelope(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<TraceContextAwareRemoteEnvelope> getParserForType() { - return PARSER; - } - + private int bitField0_; // required .ActorRefData recipient = 1; public static final int RECIPIENT_FIELD_NUMBER = 1; private akka.remote.WireFormats.ActorRefData recipient_; - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public akka.remote.WireFormats.ActorRefData getRecipient() { return recipient_; } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() { return recipient_; } - + // required .SerializedMessage message = 2; public static final int MESSAGE_FIELD_NUMBER = 2; private akka.remote.WireFormats.SerializedMessage message_; - /** - * <code>required .SerializedMessage message = 2;</code> - */ public boolean hasMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public akka.remote.WireFormats.SerializedMessage getMessage() { return message_; } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() { return message_; } - + // optional .ActorRefData sender = 4; public static final int SENDER_FIELD_NUMBER = 4; private akka.remote.WireFormats.ActorRefData sender_; - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public boolean hasSender() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public akka.remote.WireFormats.ActorRefData getSender() { return sender_; } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() { return sender_; } - + // optional fixed64 seq = 5; public static final int SEQ_FIELD_NUMBER = 5; private long seq_; - /** - * <code>optional fixed64 seq = 5;</code> - */ public boolean hasSeq() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * <code>optional fixed64 seq = 5;</code> - */ public long getSeq() { return seq_; } - + // optional .RemoteTraceContext traceContext = 15; public static final int TRACECONTEXT_FIELD_NUMBER = 15; private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext traceContext_; - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public boolean hasTraceContext() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext() { return traceContext_; } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder() { return traceContext_; } - + private void initFields() { recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance(); message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance(); @@ -1063,7 +728,7 @@ public final class TraceContextAwareWireFormats { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasRecipient()) { memoizedIsInitialized = 0; return false; @@ -1095,7 +760,7 @@ public final class TraceContextAwareWireFormats { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -1116,12 +781,12 @@ public final class TraceContextAwareWireFormats { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -1147,83 +812,94 @@ public final class TraceContextAwareWireFormats { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code TraceContextAwareRemoteEnvelope} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder { @@ -1231,21 +907,18 @@ public final class TraceContextAwareWireFormats { getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.class, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable; } - + // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -1260,7 +933,7 @@ public final class TraceContextAwareWireFormats { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); if (recipientBuilder_ == null) { @@ -1291,20 +964,20 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000010); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_descriptor; + return akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDescriptor(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getDefaultInstanceForType() { return akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope build() { akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = buildPartial(); if (!result.isInitialized()) { @@ -1312,7 +985,17 @@ public final class TraceContextAwareWireFormats { } return result; } - + + private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope buildPartial() { akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = new akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope(this); int from_bitField0_ = bitField0_; @@ -1357,7 +1040,7 @@ public final class TraceContextAwareWireFormats { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope) { return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope)other); @@ -1366,7 +1049,7 @@ public final class TraceContextAwareWireFormats { return this; } } - + public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope other) { if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance()) return this; if (other.hasRecipient()) { @@ -1387,7 +1070,7 @@ public final class TraceContextAwareWireFormats { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasRecipient()) { @@ -1419,39 +1102,84 @@ public final class TraceContextAwareWireFormats { } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder(); + if (hasRecipient()) { + subBuilder.mergeFrom(getRecipient()); + } + input.readMessage(subBuilder, extensionRegistry); + setRecipient(subBuilder.buildPartial()); + break; + } + case 18: { + akka.remote.WireFormats.SerializedMessage.Builder subBuilder = akka.remote.WireFormats.SerializedMessage.newBuilder(); + if (hasMessage()) { + subBuilder.mergeFrom(getMessage()); + } + input.readMessage(subBuilder, extensionRegistry); + setMessage(subBuilder.buildPartial()); + break; + } + case 34: { + akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder(); + if (hasSender()) { + subBuilder.mergeFrom(getSender()); + } + input.readMessage(subBuilder, extensionRegistry); + setSender(subBuilder.buildPartial()); + break; + } + case 41: { + bitField0_ |= 0x00000008; + seq_ = input.readFixed64(); + break; + } + case 122: { + akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder subBuilder = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.newBuilder(); + if (hasTraceContext()) { + subBuilder.mergeFrom(getTraceContext()); + } + input.readMessage(subBuilder, extensionRegistry); + setTraceContext(subBuilder.buildPartial()); + break; + } } } - return this; } + private int bitField0_; - + // required .ActorRefData recipient = 1; private akka.remote.WireFormats.ActorRefData recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> recipientBuilder_; - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public akka.remote.WireFormats.ActorRefData getRecipient() { if (recipientBuilder_ == null) { return recipient_; @@ -1459,9 +1187,6 @@ public final class TraceContextAwareWireFormats { return recipientBuilder_.getMessage(); } } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public Builder setRecipient(akka.remote.WireFormats.ActorRefData value) { if (recipientBuilder_ == null) { if (value == null) { @@ -1475,9 +1200,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public Builder setRecipient( akka.remote.WireFormats.ActorRefData.Builder builderForValue) { if (recipientBuilder_ == null) { @@ -1489,9 +1211,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public Builder mergeRecipient(akka.remote.WireFormats.ActorRefData value) { if (recipientBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && @@ -1508,9 +1227,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000001; return this; } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public Builder clearRecipient() { if (recipientBuilder_ == null) { recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance(); @@ -1521,17 +1237,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000001); return this; } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public akka.remote.WireFormats.ActorRefData.Builder getRecipientBuilder() { bitField0_ |= 0x00000001; onChanged(); return getRecipientFieldBuilder().getBuilder(); } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() { if (recipientBuilder_ != null) { return recipientBuilder_.getMessageOrBuilder(); @@ -1539,9 +1249,6 @@ public final class TraceContextAwareWireFormats { return recipient_; } } - /** - * <code>required .ActorRefData recipient = 1;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> getRecipientFieldBuilder() { @@ -1555,20 +1262,14 @@ public final class TraceContextAwareWireFormats { } return recipientBuilder_; } - + // required .SerializedMessage message = 2; private akka.remote.WireFormats.SerializedMessage message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> messageBuilder_; - /** - * <code>required .SerializedMessage message = 2;</code> - */ public boolean hasMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public akka.remote.WireFormats.SerializedMessage getMessage() { if (messageBuilder_ == null) { return message_; @@ -1576,9 +1277,6 @@ public final class TraceContextAwareWireFormats { return messageBuilder_.getMessage(); } } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public Builder setMessage(akka.remote.WireFormats.SerializedMessage value) { if (messageBuilder_ == null) { if (value == null) { @@ -1592,9 +1290,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public Builder setMessage( akka.remote.WireFormats.SerializedMessage.Builder builderForValue) { if (messageBuilder_ == null) { @@ -1606,9 +1301,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public Builder mergeMessage(akka.remote.WireFormats.SerializedMessage value) { if (messageBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -1625,9 +1317,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000002; return this; } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public Builder clearMessage() { if (messageBuilder_ == null) { message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance(); @@ -1638,17 +1327,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public akka.remote.WireFormats.SerializedMessage.Builder getMessageBuilder() { bitField0_ |= 0x00000002; onChanged(); return getMessageFieldBuilder().getBuilder(); } - /** - * <code>required .SerializedMessage message = 2;</code> - */ public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() { if (messageBuilder_ != null) { return messageBuilder_.getMessageOrBuilder(); @@ -1656,9 +1339,6 @@ public final class TraceContextAwareWireFormats { return message_; } } - /** - * <code>required .SerializedMessage message = 2;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> getMessageFieldBuilder() { @@ -1672,20 +1352,14 @@ public final class TraceContextAwareWireFormats { } return messageBuilder_; } - + // optional .ActorRefData sender = 4; private akka.remote.WireFormats.ActorRefData sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> senderBuilder_; - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public boolean hasSender() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public akka.remote.WireFormats.ActorRefData getSender() { if (senderBuilder_ == null) { return sender_; @@ -1693,9 +1367,6 @@ public final class TraceContextAwareWireFormats { return senderBuilder_.getMessage(); } } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public Builder setSender(akka.remote.WireFormats.ActorRefData value) { if (senderBuilder_ == null) { if (value == null) { @@ -1709,9 +1380,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000004; return this; } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public Builder setSender( akka.remote.WireFormats.ActorRefData.Builder builderForValue) { if (senderBuilder_ == null) { @@ -1723,9 +1391,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000004; return this; } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public Builder mergeSender(akka.remote.WireFormats.ActorRefData value) { if (senderBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -1742,9 +1407,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000004; return this; } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public Builder clearSender() { if (senderBuilder_ == null) { sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance(); @@ -1755,17 +1417,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public akka.remote.WireFormats.ActorRefData.Builder getSenderBuilder() { bitField0_ |= 0x00000004; onChanged(); return getSenderFieldBuilder().getBuilder(); } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() { if (senderBuilder_ != null) { return senderBuilder_.getMessageOrBuilder(); @@ -1773,9 +1429,6 @@ public final class TraceContextAwareWireFormats { return sender_; } } - /** - * <code>optional .ActorRefData sender = 4;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> getSenderFieldBuilder() { @@ -1789,53 +1442,35 @@ public final class TraceContextAwareWireFormats { } return senderBuilder_; } - + // optional fixed64 seq = 5; private long seq_ ; - /** - * <code>optional fixed64 seq = 5;</code> - */ public boolean hasSeq() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * <code>optional fixed64 seq = 5;</code> - */ public long getSeq() { return seq_; } - /** - * <code>optional fixed64 seq = 5;</code> - */ public Builder setSeq(long value) { bitField0_ |= 0x00000008; seq_ = value; onChanged(); return this; } - /** - * <code>optional fixed64 seq = 5;</code> - */ public Builder clearSeq() { bitField0_ = (bitField0_ & ~0x00000008); seq_ = 0L; onChanged(); return this; } - + // optional .RemoteTraceContext traceContext = 15; private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder> traceContextBuilder_; - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public boolean hasTraceContext() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext() { if (traceContextBuilder_ == null) { return traceContext_; @@ -1843,9 +1478,6 @@ public final class TraceContextAwareWireFormats { return traceContextBuilder_.getMessage(); } } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public Builder setTraceContext(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext value) { if (traceContextBuilder_ == null) { if (value == null) { @@ -1859,9 +1491,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000010; return this; } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public Builder setTraceContext( akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder builderForValue) { if (traceContextBuilder_ == null) { @@ -1873,9 +1502,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000010; return this; } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public Builder mergeTraceContext(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext value) { if (traceContextBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && @@ -1892,9 +1518,6 @@ public final class TraceContextAwareWireFormats { bitField0_ |= 0x00000010; return this; } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public Builder clearTraceContext() { if (traceContextBuilder_ == null) { traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance(); @@ -1905,17 +1528,11 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000010); return this; } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder getTraceContextBuilder() { bitField0_ |= 0x00000010; onChanged(); return getTraceContextFieldBuilder().getBuilder(); } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder() { if (traceContextBuilder_ != null) { return traceContextBuilder_.getMessageOrBuilder(); @@ -1923,9 +1540,6 @@ public final class TraceContextAwareWireFormats { return traceContext_; } } - /** - * <code>optional .RemoteTraceContext traceContext = 15;</code> - */ private com.google.protobuf.SingleFieldBuilder< akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder> getTraceContextFieldBuilder() { @@ -1939,300 +1553,150 @@ public final class TraceContextAwareWireFormats { } return traceContextBuilder_; } - + // @@protoc_insertion_point(builder_scope:TraceContextAwareRemoteEnvelope) } - + static { defaultInstance = new TraceContextAwareRemoteEnvelope(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:TraceContextAwareRemoteEnvelope) } - + public interface RemoteTraceContextOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required string traceName = 1; - /** - * <code>required string traceName = 1;</code> - */ boolean hasTraceName(); - /** - * <code>required string traceName = 1;</code> - */ - java.lang.String getTraceName(); - /** - * <code>required string traceName = 1;</code> - */ - com.google.protobuf.ByteString - getTraceNameBytes(); - + String getTraceName(); + // required string traceToken = 2; - /** - * <code>required string traceToken = 2;</code> - */ boolean hasTraceToken(); - /** - * <code>required string traceToken = 2;</code> - */ - java.lang.String getTraceToken(); - /** - * <code>required string traceToken = 2;</code> - */ - com.google.protobuf.ByteString - getTraceTokenBytes(); - + String getTraceToken(); + // required bool isOpen = 3; - /** - * <code>required bool isOpen = 3;</code> - */ boolean hasIsOpen(); - /** - * <code>required bool isOpen = 3;</code> - */ boolean getIsOpen(); - + // required fixed64 startMilliTime = 4; - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ boolean hasStartMilliTime(); - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ long getStartMilliTime(); } - /** - * Protobuf type {@code RemoteTraceContext} - */ public static final class RemoteTraceContext extends com.google.protobuf.GeneratedMessage implements RemoteTraceContextOrBuilder { // Use RemoteTraceContext.newBuilder() to construct. - private RemoteTraceContext(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + private RemoteTraceContext(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private RemoteTraceContext(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private RemoteTraceContext(boolean noInit) {} + private static final RemoteTraceContext defaultInstance; public static RemoteTraceContext getDefaultInstance() { return defaultInstance; } - + public RemoteTraceContext getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private RemoteTraceContext( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - 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; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - traceName_ = input.readBytes(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - traceToken_ = input.readBytes(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - isOpen_ = input.readBool(); - break; - } - case 33: { - bitField0_ |= 0x00000008; - startMilliTime_ = input.readFixed64(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.class, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable; } - - public static com.google.protobuf.Parser<RemoteTraceContext> PARSER = - new com.google.protobuf.AbstractParser<RemoteTraceContext>() { - public RemoteTraceContext parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new RemoteTraceContext(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<RemoteTraceContext> getParserForType() { - return PARSER; - } - + private int bitField0_; // required string traceName = 1; public static final int TRACENAME_FIELD_NUMBER = 1; private java.lang.Object traceName_; - /** - * <code>required string traceName = 1;</code> - */ public boolean hasTraceName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>required string traceName = 1;</code> - */ - public java.lang.String getTraceName() { + public String getTraceName() { java.lang.Object ref = traceName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { traceName_ = s; } return s; } } - /** - * <code>required string traceName = 1;</code> - */ - public com.google.protobuf.ByteString - getTraceNameBytes() { + private com.google.protobuf.ByteString getTraceNameBytes() { java.lang.Object ref = traceName_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); traceName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // required string traceToken = 2; public static final int TRACETOKEN_FIELD_NUMBER = 2; private java.lang.Object traceToken_; - /** - * <code>required string traceToken = 2;</code> - */ public boolean hasTraceToken() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>required string traceToken = 2;</code> - */ - public java.lang.String getTraceToken() { + public String getTraceToken() { java.lang.Object ref = traceToken_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { traceToken_ = s; } return s; } } - /** - * <code>required string traceToken = 2;</code> - */ - public com.google.protobuf.ByteString - getTraceTokenBytes() { + private com.google.protobuf.ByteString getTraceTokenBytes() { java.lang.Object ref = traceToken_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); traceToken_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // required bool isOpen = 3; public static final int ISOPEN_FIELD_NUMBER = 3; private boolean isOpen_; - /** - * <code>required bool isOpen = 3;</code> - */ public boolean hasIsOpen() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * <code>required bool isOpen = 3;</code> - */ public boolean getIsOpen() { return isOpen_; } - + // required fixed64 startMilliTime = 4; public static final int STARTMILLITIME_FIELD_NUMBER = 4; private long startMilliTime_; - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public boolean hasStartMilliTime() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public long getStartMilliTime() { return startMilliTime_; } - + private void initFields() { traceName_ = ""; traceToken_ = ""; @@ -2243,7 +1707,7 @@ public final class TraceContextAwareWireFormats { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasTraceName()) { memoizedIsInitialized = 0; return false; @@ -2263,7 +1727,7 @@ public final class TraceContextAwareWireFormats { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2281,12 +1745,12 @@ public final class TraceContextAwareWireFormats { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -2308,83 +1772,94 @@ public final class TraceContextAwareWireFormats { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code RemoteTraceContext} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder { @@ -2392,21 +1867,18 @@ public final class TraceContextAwareWireFormats { getDescriptor() { return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable - .ensureFieldAccessorsInitialized( - akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.class, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder.class); + return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable; } - + // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -2417,7 +1889,7 @@ public final class TraceContextAwareWireFormats { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); traceName_ = ""; @@ -2430,20 +1902,20 @@ public final class TraceContextAwareWireFormats { bitField0_ = (bitField0_ & ~0x00000008); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_descriptor; + return akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDescriptor(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getDefaultInstanceForType() { return akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance(); } - + public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext build() { akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = buildPartial(); if (!result.isInitialized()) { @@ -2451,7 +1923,17 @@ public final class TraceContextAwareWireFormats { } return result; } - + + private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext buildPartial() { akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = new akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext(this); int from_bitField0_ = bitField0_; @@ -2476,7 +1958,7 @@ public final class TraceContextAwareWireFormats { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext) { return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext)other); @@ -2485,18 +1967,14 @@ public final class TraceContextAwareWireFormats { return this; } } - + public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext other) { if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance()) return this; if (other.hasTraceName()) { - bitField0_ |= 0x00000001; - traceName_ = other.traceName_; - onChanged(); + setTraceName(other.getTraceName()); } if (other.hasTraceToken()) { - bitField0_ |= 0x00000002; - traceToken_ = other.traceToken_; - onChanged(); + setTraceToken(other.getTraceToken()); } if (other.hasIsOpen()) { setIsOpen(other.getIsOpen()); @@ -2507,7 +1985,7 @@ public final class TraceContextAwareWireFormats { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasTraceName()) { @@ -2527,69 +2005,72 @@ public final class TraceContextAwareWireFormats { } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + traceName_ = input.readBytes(); + break; + } + case 18: { + bitField0_ |= 0x00000002; + traceToken_ = input.readBytes(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + isOpen_ = input.readBool(); + break; + } + case 33: { + bitField0_ |= 0x00000008; + startMilliTime_ = input.readFixed64(); + break; + } } } - return this; } + private int bitField0_; - + // required string traceName = 1; private java.lang.Object traceName_ = ""; - /** - * <code>required string traceName = 1;</code> - */ public boolean hasTraceName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * <code>required string traceName = 1;</code> - */ - public java.lang.String getTraceName() { + public String getTraceName() { java.lang.Object ref = traceName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); traceName_ = s; return s; } else { - return (java.lang.String) ref; - } - } - /** - * <code>required string traceName = 1;</code> - */ - public com.google.protobuf.ByteString - getTraceNameBytes() { - java.lang.Object ref = traceName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - traceName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + return (String) ref; } } - /** - * <code>required string traceName = 1;</code> - */ - public Builder setTraceName( - java.lang.String value) { + public Builder setTraceName(String value) { if (value == null) { throw new NullPointerException(); } @@ -2598,72 +2079,34 @@ public final class TraceContextAwareWireFormats { onChanged(); return this; } - /** - * <code>required string traceName = 1;</code> - */ public Builder clearTraceName() { bitField0_ = (bitField0_ & ~0x00000001); traceName_ = getDefaultInstance().getTraceName(); onChanged(); return this; } - /** - * <code>required string traceName = 1;</code> - */ - public Builder setTraceNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + void setTraceName(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000001; traceName_ = value; onChanged(); - return this; } - + // required string traceToken = 2; private java.lang.Object traceToken_ = ""; - /** - * <code>required string traceToken = 2;</code> - */ public boolean hasTraceToken() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * <code>required string traceToken = 2;</code> - */ - public java.lang.String getTraceToken() { + public String getTraceToken() { java.lang.Object ref = traceToken_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); traceToken_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } - /** - * <code>required string traceToken = 2;</code> - */ - public com.google.protobuf.ByteString - getTraceTokenBytes() { - java.lang.Object ref = traceToken_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - traceToken_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * <code>required string traceToken = 2;</code> - */ - public Builder setTraceToken( - java.lang.String value) { + public Builder setTraceToken(String value) { if (value == null) { throw new NullPointerException(); } @@ -2672,106 +2115,71 @@ public final class TraceContextAwareWireFormats { onChanged(); return this; } - /** - * <code>required string traceToken = 2;</code> - */ public Builder clearTraceToken() { bitField0_ = (bitField0_ & ~0x00000002); traceToken_ = getDefaultInstance().getTraceToken(); onChanged(); return this; } - /** - * <code>required string traceToken = 2;</code> - */ - public Builder setTraceTokenBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + void setTraceToken(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000002; traceToken_ = value; onChanged(); - return this; } - + // required bool isOpen = 3; private boolean isOpen_ ; - /** - * <code>required bool isOpen = 3;</code> - */ public boolean hasIsOpen() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * <code>required bool isOpen = 3;</code> - */ public boolean getIsOpen() { return isOpen_; } - /** - * <code>required bool isOpen = 3;</code> - */ public Builder setIsOpen(boolean value) { bitField0_ |= 0x00000004; isOpen_ = value; onChanged(); return this; } - /** - * <code>required bool isOpen = 3;</code> - */ public Builder clearIsOpen() { bitField0_ = (bitField0_ & ~0x00000004); isOpen_ = false; onChanged(); return this; } - + // required fixed64 startMilliTime = 4; private long startMilliTime_ ; - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public boolean hasStartMilliTime() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public long getStartMilliTime() { return startMilliTime_; } - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public Builder setStartMilliTime(long value) { bitField0_ |= 0x00000008; startMilliTime_ = value; onChanged(); return this; } - /** - * <code>required fixed64 startMilliTime = 4;</code> - */ public Builder clearStartMilliTime() { bitField0_ = (bitField0_ & ~0x00000008); startMilliTime_ = 0L; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:RemoteTraceContext) } - + static { defaultInstance = new RemoteTraceContext(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteTraceContext) } - + private static com.google.protobuf.Descriptors.Descriptor internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor; private static @@ -2787,7 +2195,7 @@ public final class TraceContextAwareWireFormats { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_RemoteTraceContext_fieldAccessorTable; - + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; @@ -2820,19 +2228,25 @@ public final class TraceContextAwareWireFormats { internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor, - new java.lang.String[] { "Ack", "Envelope", }); + new java.lang.String[] { "Ack", "Envelope", }, + akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.class, + akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.Builder.class); internal_static_TraceContextAwareRemoteEnvelope_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_TraceContextAwareRemoteEnvelope_descriptor, - new java.lang.String[] { "Recipient", "Message", "Sender", "Seq", "TraceContext", }); + new java.lang.String[] { "Recipient", "Message", "Sender", "Seq", "TraceContext", }, + akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.class, + akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder.class); internal_static_RemoteTraceContext_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_RemoteTraceContext_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_RemoteTraceContext_descriptor, - new java.lang.String[] { "TraceName", "TraceToken", "IsOpen", "StartMilliTime", }); + new java.lang.String[] { "TraceName", "TraceToken", "IsOpen", "StartMilliTime", }, + akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.class, + akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder.class); return null; } }; @@ -2842,6 +2256,6 @@ public final class TraceContextAwareWireFormats { akka.remote.WireFormats.getDescriptor(), }, assigner); } - + // @@protoc_insertion_point(outer_class_scope) } diff --git a/kamon-akka-remote/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala b/kamon-akka-remote/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala index 8a3973ca..63cc9832 100644 --- a/kamon-akka-remote/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala +++ b/kamon-akka-remote/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala @@ -4,7 +4,7 @@ import akka.actor.SupervisorStrategy.Resume import akka.actor._ import akka.pattern.{ ask, pipe } import akka.remote.RemoteScope -import akka.routing.RoundRobinGroup +import akka.routing.RoundRobinRouter import akka.testkit.{ ImplicitSender, TestKitBase } import akka.util.Timeout import com.typesafe.config.ConfigFactory @@ -14,7 +14,9 @@ import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ import scala.util.control.NonFatal -class RemotingInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class RemotingInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor + implicit lazy val system: ActorSystem = ActorSystem("remoting-spec-local-system", ConfigFactory.parseString( """ |akka { @@ -106,7 +108,8 @@ class RemotingInstrumentationSpec extends TestKitBase with WordSpecLike with Mat "propagate the TraceContext when sending messages to remote routees of a router" in { remoteSystem.actorOf(TraceTokenReplier.props(None), "remote-routee") - val router = system.actorOf(RoundRobinGroup(List(RemoteSystemAddress + "/user/actor-selection-target-*")).props(), "router") + val routees = Vector[String](RemoteSystemAddress + "/user/remote-routee") + val router = system.actorOf(Props.empty.withRouter(RoundRobinRouter(routees = routees))) TraceRecorder.withNewTraceContext("remote-routee", Some("remote-routee-1")) { router ! "reply-trace-token" diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala index 3bf13ce2..5e8175fa 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala @@ -30,7 +30,7 @@ class AskPatternInstrumentation { class StackTraceCaptureException extends Throwable - @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *, *)", argNames = "provider") + @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider") def promiseActorRefApply(provider: ActorRefProvider): Unit = {} @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor") diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala index 51cda6b2..05bab175 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala @@ -38,7 +38,7 @@ class MetricsExtension(system: ExtendedActorSystem) extends Kamon.Extension { val gaugeRecordingsDispatcher = system.dispatchers.lookup(metricsExtConfig.getString("dispatchers.gauge-recordings")) /** Configuration Settings */ - val gaugeRecordingInterval = metricsExtConfig.getDuration("gauge-recording-interval", TimeUnit.MILLISECONDS) + val gaugeRecordingInterval: Long = metricsExtConfig.getMilliseconds("gauge-recording-interval") val storage = TrieMap[MetricGroupIdentity, MetricGroupRecorder]() val filters = loadFilters(metricsExtConfig) diff --git a/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala index c6571507..1ba9f312 100644 --- a/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala +++ b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala @@ -99,7 +99,7 @@ class Subscriptions extends Actor { def scheduleFlushMessage(): Cancellable = { val config = context.system.settings.config - val tickInterval = Duration(config.getDuration("kamon.metrics.tick-interval", TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS) + val tickInterval = Duration(config.getMilliseconds("kamon.metrics.tick-interval"), TimeUnit.MILLISECONDS) context.system.scheduler.schedule(tickInterval, tickInterval, self, FlushMetrics)(context.dispatcher) } } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala index efd7d78f..0c1815c3 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala @@ -49,7 +49,7 @@ object Gauge { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt Gauge(Histogram.Precision(significantDigits), highest, scale, refreshInterval.millis, system)(currentValueCollector) } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala index 4882d2aa..61cee02a 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala @@ -57,7 +57,7 @@ object MinMaxCounter { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt apply(highest, Histogram.Precision(significantDigits), Scale.Unit, refreshInterval.millis, system) } diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala index 0f682500..ee3857c3 100644 --- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala +++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. * ========================================================== */ -package kamon.instrumentation.akka +package kamon.trace.instrumentation -import akka.actor.{ Actor, ActorSystem, Props } -import akka.pattern.{ ask, pipe } -import akka.routing.RoundRobinPool -import akka.testkit.{ ImplicitSender, TestKit } -import akka.util.Timeout -import kamon.trace.TraceRecorder import org.scalatest.WordSpecLike +import akka.actor.{ Actor, Props, ActorSystem } +import akka.testkit.{ ImplicitSender, TestKit } +import kamon.trace.TraceRecorder +import akka.pattern.{ pipe, ask } +import akka.util.Timeout import scala.concurrent.duration._ +import akka.routing.{ RoundRobinRouter } class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instrumentation-spec")) with WordSpecLike with ImplicitSender { @@ -75,7 +75,7 @@ class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instr } trait RoutedEchoActorFixture extends EchoActorFixture { - override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinPool(nrOfInstances = 1))) + override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinRouter(nrOfInstances = 1))) } } diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala index 9b85a142..006366ba 100644 --- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala @@ -20,16 +20,15 @@ import java.nio.LongBuffer import akka.instrumentation.ActorCellMetrics import kamon.Kamon import kamon.metric.ActorMetricsTestActor._ -import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ WordSpecLike, Matchers } import akka.testkit.{ ImplicitSender, TestProbe, TestKitBase } import akka.actor._ import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import kamon.metric.Subscriptions.TickMetricSnapshot import kamon.metric.ActorMetrics.{ ActorMetricsRecorder, ActorMetricSnapshot } -class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala index ebc43091..6585a618 100644 --- a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala @@ -18,7 +18,7 @@ package kamon.metric import java.nio.LongBuffer import akka.actor._ -import akka.routing.RoundRobinPool +import akka.routing.RoundRobinRouter import akka.testkit.{ TestProbe, ImplicitSender, TestKitBase } import com.typesafe.config.ConfigFactory import kamon.Kamon @@ -128,7 +128,8 @@ class RouterMetricsSpec extends TestKitBase with WordSpecLike with Matchers with val buffer: LongBuffer = LongBuffer.allocate(10000) } - def createTestRouter(name: String): ActorRef = system.actorOf(RoundRobinPool(5).props(Props[RouterMetricsTestActor]), name) + def createTestRouter(name: String): ActorRef = system.actorOf(Props[RouterMetricsTestActor] + .withRouter(RoundRobinRouter(nrOfInstances = 5)), name) } } diff --git a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala index 9144725e..60923a2b 100644 --- a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala @@ -8,7 +8,8 @@ import kamon.metric.Subscriptions.TickMetricSnapshot import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("subscriptions-protocol-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala index 79c9c63b..27eb64e2 100644 --- a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala @@ -26,7 +26,8 @@ import akka.actor.ActorSystem import scala.concurrent.duration._ import kamon.metric.Subscriptions.TickMetricSnapshot -class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala index 6453dd77..7468f59c 100644 --- a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala @@ -8,7 +8,8 @@ import kamon.metric.TraceMetrics.TraceMetricsSnapshot import kamon.trace.{ SegmentMetricIdentity, TraceRecorder } import org.scalatest.{ Matchers, WordSpecLike } -class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala index 6c4fe3fb..e072d3ef 100644 --- a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala @@ -11,7 +11,8 @@ import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala index e2031a72..206fbd4e 100644 --- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala @@ -1,11 +1,12 @@ package kamon.trace import akka.actor.ActorSystem -import akka.testkit.{ ImplicitSender, TestKitBase } +import akka.testkit.TestKitBase import com.typesafe.config.ConfigFactory import org.scalatest.{ Matchers, WordSpecLike } -class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala index eb88ba4b..22e86b05 100644 --- a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala +++ b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala @@ -16,18 +16,16 @@ package kamon.datadog -import java.net.InetSocketAddress -import java.util.concurrent.TimeUnit.MILLISECONDS - import akka.actor._ -import akka.event.Logging import kamon.Kamon import kamon.metric.UserMetrics.{ UserGauges, UserMinMaxCounters, UserCounters, UserHistograms } import kamon.metric._ import kamon.metrics._ - -import scala.collection.JavaConverters._ +import kamon.metrics.CPUMetrics import scala.concurrent.duration._ +import scala.collection.JavaConverters._ +import akka.event.Logging +import java.net.InetSocketAddress object Datadog extends ExtensionId[DatadogExtension] with ExtensionIdProvider { override def lookup(): ExtensionId[_ <: Extension] = Datadog @@ -45,9 +43,9 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension { private val datadogConfig = system.settings.config.getConfig("kamon.datadog") val datadogHost = new InetSocketAddress(datadogConfig.getString("hostname"), datadogConfig.getInt("port")) - val flushInterval = datadogConfig.getDuration("flush-interval", MILLISECONDS) + val flushInterval = datadogConfig.getMilliseconds("flush-interval") val maxPacketSizeInBytes = datadogConfig.getBytes("max-packet-size") - val tickInterval = system.settings.config.getDuration("kamon.metrics.tick-interval", MILLISECONDS) + val tickInterval = system.settings.config.getMilliseconds("kamon.metrics.tick-interval") val datadogMetricsListener = buildMetricsListener(tickInterval, flushInterval) diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala index 25fbc9db..bca02582 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala @@ -93,7 +93,7 @@ class Agent extends Actor with RequestBuilding with ResponseTransformation with val compressedPipeline: HttpRequest ⇒ Future[HttpResponse] = encode(Deflate) ~> sendReceive val compressedToJsonPipeline: HttpRequest ⇒ Future[JsValue] = compressedPipeline ~> toJson - def toJson(response: HttpResponse): JsValue = response.entity.asString.parseJson + def toJson(response: HttpResponse): JsValue = response.entity.asString.asJson def selectCollector: Future[String] = { val query = ("method" -> "get_redirect_host") +: baseQuery diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala index b270d228..92e673ee 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala @@ -16,9 +16,6 @@ package kamon.newrelic -import java.util.concurrent.TimeUnit.MILLISECONDS - -import akka.actor import akka.actor._ import kamon.Kamon import kamon.metric.Subscriptions.TickMetricSnapshot @@ -32,7 +29,7 @@ class NewRelicExtension(system: ExtendedActorSystem) extends Kamon.Extension { val collectionContext = Kamon(Metrics)(system).buildDefaultCollectionContext val metricsListener = system.actorOf(Props[NewRelicMetricsListener], "kamon-newrelic") - val apdexT: Double = config.getDuration("apdexT", MILLISECONDS) / 1E3 // scale to seconds. + val apdexT: Double = config.getMilliseconds("apdexT") / 1E3 // scale to seconds. Kamon(Metrics)(system).subscribe(TraceMetrics, "*", metricsListener, permanently = true) diff --git a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala index 36eabf8e..0e777fd5 100644 --- a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala +++ b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala @@ -21,7 +21,7 @@ import play.api.mvc._ import scala.concurrent.Future case class TraceName[A](name: String)(action: Action[A]) extends Action[A] { - def apply(request: Request[A]): Future[Result] = { + def apply(request: Request[A]): Future[SimpleResult] = { TraceRecorder.rename(name) action(request) } diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala index ca95781e..1ba871a7 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -20,16 +20,12 @@ import kamon.play.{ Play, PlayExtension } import kamon.trace.{ TraceContextAware, TraceRecorder } import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation._ -import play.api.Routes -import play.api.mvc.Results._ import play.api.mvc._ import play.libs.Akka @Aspect class RequestInstrumentation { - import kamon.play.instrumentation.RequestInstrumentation._ - @DeclareMixin("play.api.mvc.RequestHeader+") def mixinContextAwareNewRequest: TraceContextAware = TraceContextAware.default @@ -38,8 +34,8 @@ class RequestInstrumentation { Kamon(Play)(Akka.system()) } - @Before("call(* play.api.GlobalSettings+.onRouteRequest(..)) && args(requestHeader)") - def beforeRouteRequest(requestHeader: RequestHeader): Unit = { + @Before("execution(* play.api.GlobalSettings+.onRouteRequest(..)) && args(requestHeader)") + def onRouteRequest(requestHeader: RequestHeader): Unit = { val system = Akka.system() val playExtension = Kamon(Play)(system) val defaultTraceName = playExtension.generateTraceName(requestHeader) @@ -82,9 +78,17 @@ class RequestInstrumentation { pjp.proceed(Array(EssentialAction(essentialAction))) } - @Before("execution(* play.api.GlobalSettings+.onError(..)) && args(request, ex)") - def beforeOnError(request: TraceContextAware, ex: Throwable): Unit = TraceRecorder.withTraceContextAndSystem { (ctx, system) ⇒ - recordHttpServerMetrics(InternalServerError.header, ctx.name, Kamon(Play)(system)) + private def recordHttpServerMetrics(result: Result, traceName: String, playExtension: PlayExtension): Unit = + playExtension.httpServerMetrics.recordResponse(traceName, result.header.status.toString, 1L) + + @Around("execution(* play.api.GlobalSettings+.onError(..)) && args(request, ex)") + def aroundOnError(pjp: ProceedingJoinPoint, request: TraceContextAware, ex: Throwable): Any = request.traceContext match { + case None ⇒ pjp.proceed() + case Some(ctx) ⇒ { + val actorSystem = ctx.system + Kamon(Play)(actorSystem).publishErrorMessage(actorSystem, ex.getMessage, ex) + pjp.proceed() + } } private def recordHttpServerMetrics(header: ResponseHeader, traceName: String, playExtension: PlayExtension): Unit = diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala index 125db85e..c58e9f0c 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala @@ -18,17 +18,18 @@ package kamon.play.instrumentation import kamon.Kamon import kamon.play.Play -import kamon.trace.{ SegmentMetricIdentityLabel, SegmentMetricIdentity, TraceRecorder } +import kamon.trace.SegmentMetricIdentityLabel import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut } -import play.api.libs.ws.{ WSRequest, WSResponse } - +import kamon.trace.TraceRecorder +import play.api.libs.ws.WS.WSRequest import scala.concurrent.Future +import play.api.libs.ws.Response @Aspect class WSInstrumentation { - @Pointcut("execution(* play.api.libs.ws.ning.NingWSRequest.execute()) && this(request)") + @Pointcut("execution(* play.api.libs.ws.WS$WSRequest.execute()) && this(request)") def onExecuteRequest(request: WSRequest): Unit = {} @Around("onExecuteRequest(request)") @@ -38,7 +39,7 @@ class WSInstrumentation { val executor = playExtension.defaultDispatcher val segmentName = playExtension.generateHttpClientSegmentName(request) val segment = ctx.startSegment(segmentName, SegmentMetricIdentityLabel.HttpClient) - val response = pjp.proceed().asInstanceOf[Future[WSResponse]] + val response = pjp.proceed().asInstanceOf[Future[Response]] response.map(result ⇒ segment.finish())(executor) response diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index 3feb6246..baa5cd74 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -174,7 +174,7 @@ class RequestInstrumentationSpec extends PlaySpec with OneServerPerSuite { } object TraceLocalFilter extends Filter { - override def apply(next: (RequestHeader) ⇒ Future[Result])(header: RequestHeader): Future[Result] = { + override def apply(next: (RequestHeader) ⇒ Future[SimpleResult])(header: RequestHeader): Future[SimpleResult] = { TraceRecorder.withTraceContext(TraceRecorder.currentContext) { TraceLocal.store(TraceLocalKey)(header.headers.get(traceLocalStorageKey).getOrElse("unknown")) @@ -253,4 +253,4 @@ object controllers { Ok("invoked show with: " + id) } } -}
\ No newline at end of file +} diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala index e92cb546..8b0e7992 100644 --- a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala +++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala @@ -24,6 +24,7 @@ import kamon.metrics._ import scala.concurrent.duration._ import scala.collection.JavaConverters._ import com.typesafe.config.Config +import java.lang.management.ManagementFactory import akka.event.Logging import java.net.InetSocketAddress import java.util.concurrent.TimeUnit.MILLISECONDS @@ -40,9 +41,9 @@ class StatsDExtension(system: ExtendedActorSystem) extends Kamon.Extension { private val config = system.settings.config private val statsDConfig = config.getConfig("kamon.statsd") - val tickInterval = config.getDuration("kamon.metrics.tick-interval", MILLISECONDS) + val tickInterval = config.getMilliseconds("kamon.metrics.tick-interval") val statsDHost = new InetSocketAddress(statsDConfig.getString("hostname"), statsDConfig.getInt("port")) - val flushInterval = statsDConfig.getDuration("flush-interval", MILLISECONDS) + val flushInterval = statsDConfig.getMilliseconds("flush-interval") val maxPacketSizeInBytes = statsDConfig.getBytes("max-packet-size") val keyGeneratorFQCN = statsDConfig.getString("metric-key-generator") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a266bba8..a23eaf24 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,15 +3,15 @@ import sbt._ object Dependencies { val resolutionRepos = Seq( - "spray repo" at "http://repo.spray.io/", + "spray repo" at "http://repo.spray.io/", "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) - val sprayVersion = "1.3.2" - val akkaVersion = "2.3.6" + val sprayVersion = "1.2.2" + val akkaVersion = "2.2.4" val aspectjVersion = "1.8.1" val slf4jVersion = "1.7.6" - val playVersion = "2.3.5" + val playVersion = "2.2.5" val sprayJson = "io.spray" %% "spray-json" % "1.3.0" val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.4" @@ -21,18 +21,16 @@ object Dependencies { val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.11.0" val snakeYaml = "org.yaml" % "snakeyaml" % "1.13" val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.2.1" - val sprayCan = "io.spray" %% "spray-can" % sprayVersion - val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion - val sprayTestkit = "io.spray" %% "spray-testkit" % sprayVersion - val sprayClient = "io.spray" %% "spray-client" % sprayVersion + val sprayCan = "io.spray" % "spray-can" % sprayVersion + val sprayRouting = "io.spray" % "spray-routing" % sprayVersion + val sprayTestkit = "io.spray" % "spray-testkit" % sprayVersion + val sprayClient = "io.spray" % "spray-client" % sprayVersion val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion val akkaRemote = "com.typesafe.akka" %% "akka-remote" % akkaVersion val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion - val play = "com.typesafe.play" %% "play" % playVersion - val playWS = "com.typesafe.play" %% "play-ws" % playVersion - val playTest = "org.scalatestplus" %% "play" % "1.2.0" + val playTest = "org.scalatestplus" %% "play" % "1.3.0" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion diff --git a/project/Projects.scala b/project/Projects.scala index 6ab6ae71..bf57f2be 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -93,7 +93,7 @@ object Projects extends Build { .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) - .settings(libraryDependencies ++= compile(play, playWS, aspectJ) ++ test(playTest, akkaTestKit, slf4Api)) + .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, akkaTestKit, slf4Api)) .dependsOn(kamonCore) lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd")) @@ -102,7 +102,7 @@ object Projects extends Build { .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) .dependsOn(kamonSystemMetrics % "provided") - + lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog")) .settings(basicSettings: _*) .settings(formatSettings: _*) diff --git a/version.sbt b/version.sbt index 743b23a3..0ed919ee 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.3.5-SNAPSHOT"
\ No newline at end of file +version in ThisBuild := "0.2.5-SNAPSHOT"
\ No newline at end of file |