Skip to content

Commit 0b094c4

Browse files
committed
nit fix
1 parent 394626e commit 0b094c4

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

instrumentation/grpc-1.6/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ muzzle {
1616
module = "grpc-core"
1717
versions = "[1.6.0,)"
1818

19-
//extraDependency("com.google.protobuf:protobuf-java:3.3.1")
19+
extraDependency("com.google.protobuf:protobuf-java:3.3.1")
2020
extraDependency("io.grpc:grpc-netty:1.6.0")
2121
}
2222
}

instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/ProtobufRoundTripConverter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import io.opentelemetry.api.common.AttributeKey;
2020
import io.opentelemetry.api.trace.Span;
2121
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.DescriptorProtos.FileDescriptorProto;
22-
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors;
22+
import com.google.protobuf.Descriptors;
2323
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors.Descriptor;
2424
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors.FileDescriptor;
2525
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.DynamicMessage;
26-
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Message;
26+
import com.google.protobuf.Message;
2727
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.util.JsonFormat;
2828

2929
public class ProtobufRoundTripConverter {
@@ -49,7 +49,8 @@ public static DynamicMessage convertToRelocatedDynamicMessage(Object message) th
4949

5050
// 3. Get the unrelocated file descriptor and its proto representation.
5151
Descriptors.FileDescriptor unrelocatedFileDescriptor = originalDescriptor.getFile();
52-
FileDescriptorProto unrelocatedFileProto = unrelocatedFileDescriptor.toProto();
52+
com.google.protobuf.DescriptorProtos.FileDescriptorProto unrelocatedFileProto =
53+
unrelocatedFileDescriptor.toProto();
5354
byte[] fileProtoBytes = unrelocatedFileProto.toByteArray();
5455

5556
// 4. Parse the file descriptor proto using relocated classes.

0 commit comments

Comments
 (0)