muzzle fix

Author: thugrock7

instrumentation/grpc-1.6/build.gradle.kts

@@ -16,6 +16,7 @@ muzzle {
         module = "grpc-core"
         versions = "[1.6.0,)"
 
+        //extraDependency("com.google.protobuf:protobuf-java:3.3.1")
         extraDependency("io.grpc:grpc-netty:1.6.0")
     }
 }

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

@@ -16,14 +16,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
-import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.DescriptorProtos.FileDescriptorProto;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors.Descriptor;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Descriptors.FileDescriptor;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.DynamicMessage;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.Message;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.util.JsonFormat;
 
 public class ProtobufRoundTripConverter {
@@ -49,8 +49,7 @@ public static DynamicMessage convertToRelocatedDynamicMessage(Object message) th
 
     // 3. Get the unrelocated file descriptor and its proto representation.
     Descriptors.FileDescriptor unrelocatedFileDescriptor = originalDescriptor.getFile();
-    com.google.protobuf.DescriptorProtos.FileDescriptorProto unrelocatedFileProto =
-        unrelocatedFileDescriptor.toProto();
+    FileDescriptorProto unrelocatedFileProto = unrelocatedFileDescriptor.toProto();
     byte[] fileProtoBytes = unrelocatedFileProto.toByteArray();
 
     // 4. Parse the file descriptor proto using relocated classes.