suggested changes

Author: AgraVator

opentelemetry/build.gradle

@@ -17,13 +17,10 @@ dependencies {
     testImplementation project(':grpc-testing'),
             project(':grpc-testing-proto'),
             project(':grpc-inprocess'),
-            project(':grpc-stub'),
-            project(':grpc-protobuf'),
             testFixtures(project(':grpc-core')),
             testFixtures(project(':grpc-api')),
             libraries.opentelemetry.sdk.testing,
             libraries.assertj.core // opentelemetry.sdk.testing uses compileOnly for assertj
-            libraries.protobuf.java
 
     annotationProcessor libraries.auto.value
 

opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryMetricsModule.java

@@ -132,7 +132,7 @@ static String recordMethodName(String fullMethodName, boolean isGeneratedMethod)
   }
 
   private static Context otelContextWithBaggage() {
-    Baggage baggage = BAGGAGE_KEY.get(io.grpc.Context.current());
+    Baggage baggage = BAGGAGE_KEY.get();
     if (baggage == null) {
       return Context.current();
     }

opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java

@@ -339,7 +339,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, Re
       }
       Context serverCallContext = Context.current();
       serverCallContext = serverCallContext.with(span);
-      Baggage baggage = BAGGAGE_KEY.get(io.grpc.Context.current());
+      Baggage baggage = BAGGAGE_KEY.get();
       if (baggage != null) {
         serverCallContext = serverCallContext.with(baggage);
       }