⬆️ Upgrade min gRPC version to 1.6 (#338)

* ⬆️ update GRPC version * 🚚 rename grpc package to end in v1_6 * 🚚 rename grpc-1.5 directory to grpc-1.6 * 📝 update docs to reflect gRPC min version
hypertrace · Jul 15, 2021 · 500fa76 · 500fa76
1 parent b77175d
commit 500fa76
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ List of supported frameworks with additional capabilities:
 |--------------------------------------------------------------------------------------------------------|-----------------|
 | [Apache HttpAsyncClient](https://hc.apache.org/index.html)                                             | 4.1+            |
 | [Apache HttpClient](https://hc.apache.org/index.html)                                                  | 4.0+            |
-| [gRPC](https://github.com/grpc/grpc-java)                                                              | 1.5+            |
+| [gRPC](https://github.com/grpc/grpc-java)                                                              | 1.6+            |
 | [JAX-RS Client](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/client/package-summary.html) | 2.0+            |
 | [Micronaut](https://micronaut.io/)  (basic support via Netty)                                          | 1.0+            |
 | [Netty](https://github.com/netty/netty)                                                                | 4.0+            |

diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies{
     implementation(project(":instrumentation:servlet:servlet-rw"))
     implementation(project(":instrumentation:servlet:servlet-3.0"))
     implementation(project(":instrumentation:spark-2.3"))
-    implementation(project(":instrumentation:grpc-1.5"))
+    implementation(project(":instrumentation:grpc-1.6"))
     implementation(project(":instrumentation:okhttp:okhttp-3.0"))
     implementation(project(":instrumentation:apache-httpclient-4.0"))
     implementation(project(":instrumentation:jaxrs-client-2.0"))

diff --git a/instrumentation/grpc-1.5/build.gradle.kts → instrumentation/grpc-1.6/build.gradle.kts b/instrumentation/grpc-1.5/build.gradle.kts → instrumentation/grpc-1.6/build.gradle.kts
@@ -13,10 +13,10 @@ muzzle {
     pass {
         group = "io.grpc"
         module = "grpc-core"
-        versions = "[1.5.0,)"
+        versions = "[1.6.0,)"
         // for body capture via com.google.protobuf.util.JsonFormat
-        extraDependency("io.grpc:grpc-protobuf:1.5.0")
-        extraDependency("io.grpc:grpc-netty:1.5.0")
+        extraDependency("io.grpc:grpc-protobuf:1.6.0")
+        extraDependency("io.grpc:grpc-netty:1.6.0")
     }
 }
 
@@ -41,7 +41,7 @@ protobuf {
     }
     plugins {
         id("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.5.0"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.6.0"
         }
     }
     generateProtoTasks {
@@ -55,7 +55,7 @@ protobuf {
 }
 
 val versions: Map<String, String> by extra
-val grpcVersion = "1.5.0"
+val grpcVersion = "1.6.0"
 
 dependencies {
     api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.6:${versions["opentelemetry_java_agent"]}")

diff --git a/...ce/grpc/v1_5/GrpcInstrumentationName.java → ...ce/grpc/v1_6/GrpcInstrumentationName.java b/...ce/grpc/v1_5/GrpcInstrumentationName.java → ...ce/grpc/v1_6/GrpcInstrumentationName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 public class GrpcInstrumentationName {
   public static final String PRIMARY = "grpc";

diff --git a/...ace/grpc/v1_5/GrpcSemanticAttributes.java → ...ace/grpc/v1_6/GrpcSemanticAttributes.java b/...ace/grpc/v1_5/GrpcSemanticAttributes.java → ...ace/grpc/v1_6/GrpcSemanticAttributes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 import io.grpc.Metadata;
 

diff --git a/...pertrace/grpc/v1_5/GrpcSpanDecorator.java → ...pertrace/grpc/v1_6/GrpcSpanDecorator.java b/...pertrace/grpc/v1_5/GrpcSpanDecorator.java → ...pertrace/grpc/v1_6/GrpcSpanDecorator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;

diff --git a/...ttyHttp2HeadersInstrumentationModule.java → ...ttyHttp2HeadersInstrumentationModule.java b/...ttyHttp2HeadersInstrumentationModule.java → ...ttyHttp2HeadersInstrumentationModule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 import static net.bytebuddy.matcher.ElementMatchers.failSafe;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;

diff --git a/...client/GrpcClientBodyInstrumentation.java → ...client/GrpcClientBodyInstrumentation.java b/...client/GrpcClientBodyInstrumentation.java → ...client/GrpcClientBodyInstrumentation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.client;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.client;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static java.util.Collections.singletonMap;

diff --git a/.../GrpcClientBodyInstrumentationModule.java → .../GrpcClientBodyInstrumentationModule.java b/.../GrpcClientBodyInstrumentationModule.java → .../GrpcClientBodyInstrumentationModule.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.client;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.client;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcInstrumentationName;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/...pc/v1_5/client/GrpcClientInterceptor.java → ...pc/v1_6/client/GrpcClientInterceptor.java b/...pc/v1_5/client/GrpcClientInterceptor.java → ...pc/v1_6/client/GrpcClientInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.client;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.client;
 
 import io.grpc.CallOptions;
 import io.grpc.Channel;
@@ -26,8 +26,8 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcSpanDecorator;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcInstrumentationName;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcSpanDecorator;
 import org.hypertrace.agent.core.config.InstrumentationConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
 

diff --git a/...server/GrpcServerBodyInstrumentation.java → ...server/GrpcServerBodyInstrumentation.java b/...server/GrpcServerBodyInstrumentation.java → ...server/GrpcServerBodyInstrumentation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.server;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.server;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.safeHasSuperType;
 import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;

diff --git a/.../GrpcServerBodyInstrumentationModule.java → .../GrpcServerBodyInstrumentationModule.java b/.../GrpcServerBodyInstrumentationModule.java → .../GrpcServerBodyInstrumentationModule.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.server;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.server;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcInstrumentationName;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/...pc/v1_5/server/GrpcServerInterceptor.java → ...pc/v1_6/server/GrpcServerInterceptor.java b/...pc/v1_5/server/GrpcServerInterceptor.java → ...pc/v1_6/server/GrpcServerInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.server;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.server;
 
 import io.grpc.ForwardingServerCall;
 import io.grpc.ForwardingServerCallListener;
@@ -25,8 +25,8 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcSpanDecorator;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcInstrumentationName;
+import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcSpanDecorator;
 import java.util.Map;
 import org.hypertrace.agent.core.config.InstrumentationConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;

diff --git a/...c/v1_5/server/NoopServerCallListener.java → ...c/v1_6/server/NoopServerCallListener.java b/...c/v1_5/server/NoopServerCallListener.java → ...c/v1_6/server/NoopServerCallListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.server;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.server;
 
 import io.grpc.ServerCall;
 

diff --git a/...ce/grpc/v1_5/GrpcInstrumentationTest.java → ...ce/grpc/v1_6/GrpcInstrumentationTest.java b/...ce/grpc/v1_5/GrpcInstrumentationTest.java → ...ce/grpc/v1_6/GrpcInstrumentationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 import com.google.protobuf.util.JsonFormat;
 import io.grpc.ForwardingServerCall;

diff --git a/...ertrace/grpc/v1_5/NoopGreeterService.java → ...ertrace/grpc/v1_6/NoopGreeterService.java b/...ertrace/grpc/v1_5/NoopGreeterService.java → ...ertrace/grpc/v1_6/NoopGreeterService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5;
+package io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6;
 
 import io.grpc.stub.StreamObserver;
 import org.hypertrace.example.GreeterGrpc;

diff --git a/.../grpc-1.5/src/test/proto/helloworld.proto → .../grpc-1.6/src/test/proto/helloworld.proto b/.../grpc-1.5/src/test/proto/helloworld.proto → .../grpc-1.6/src/test/proto/helloworld.proto
diff --git a/...est/resources/ht-config-all-disabled.yaml → ...est/resources/ht-config-all-disabled.yaml b/...est/resources/ht-config-all-disabled.yaml → ...est/resources/ht-config-all-disabled.yaml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,8 +24,8 @@ include("javaagent-tooling")
 include("javaagent-bootstrap")
 include("javaagent-core")
 include("testing-common")
-include("instrumentation:grpc-1.5")
-findProject(":instrumentation:grpc-1.5")?.name = "grpc-1.5"
+include("instrumentation:grpc-1.6")
+findProject(":instrumentation:grpc-1.6")?.name = "grpc-1.6"
 include("instrumentation:okhttp:okhttp-3.0")
 findProject(":instrumentation:okhttp:okhttp-3.0")?.name = "okhttp-3.0"
 include("otel-extensions")