diff --git a/README.md b/README.md index a6362009b..929b22831 100644 --- 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 index a5f4a8fef..dda7e4527 100644 --- 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 b/instrumentation/grpc-1.6/build.gradle.kts similarity index 91% rename from instrumentation/grpc-1.5/build.gradle.kts rename to instrumentation/grpc-1.6/build.gradle.kts index e30d2ec62..87d1dfeb7 100644 --- a/instrumentation/grpc-1.5/build.gradle.kts +++ b/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 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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationName.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcInstrumentationName.java similarity index 98% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationName.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcInstrumentationName.java index cf7547b0f..19337f0e5 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationName.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSemanticAttributes.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcSemanticAttributes.java similarity index 99% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSemanticAttributes.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcSemanticAttributes.java index 9c1628562..e5caa1fcb 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSemanticAttributes.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcSpanDecorator.java similarity index 99% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcSpanDecorator.java index 947abf4f9..b91cd314e 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NettyHttp2HeadersInstrumentationModule.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/NettyHttp2HeadersInstrumentationModule.java similarity index 99% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NettyHttp2HeadersInstrumentationModule.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/NettyHttp2HeadersInstrumentationModule.java index 27bfd5ed6..56aabae15 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NettyHttp2HeadersInstrumentationModule.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/NettyHttp2HeadersInstrumentationModule.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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentation.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientBodyInstrumentation.java similarity index 99% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentation.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientBodyInstrumentation.java index 5bf7884a8..07c05a747 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentation.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentationModule.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientBodyInstrumentationModule.java similarity index 96% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentationModule.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientBodyInstrumentationModule.java index 0a32bb1da..3da34d90c 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientBodyInstrumentationModule.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientInterceptor.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientInterceptor.java similarity index 98% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientInterceptor.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientInterceptor.java index cb823a0e6..eaf91e627 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientInterceptor.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentation.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerBodyInstrumentation.java similarity index 99% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentation.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerBodyInstrumentation.java index 614703a44..f3307126f 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentation.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentationModule.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerBodyInstrumentationModule.java similarity index 96% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentationModule.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerBodyInstrumentationModule.java index 43f55e71d..8386528cd 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerBodyInstrumentationModule.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerInterceptor.java similarity index 98% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/GrpcServerInterceptor.java index 23d1b0bc5..ee1630a2a 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/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/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/NoopServerCallListener.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/NoopServerCallListener.java similarity index 98% rename from instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/NoopServerCallListener.java rename to instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/server/NoopServerCallListener.java index 40600bddc..68e01be29 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/NoopServerCallListener.java +++ b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/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/instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationTest.java b/instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcInstrumentationTest.java similarity index 99% rename from instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationTest.java rename to instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcInstrumentationTest.java index 441e05028..924f95399 100644 --- a/instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationTest.java +++ b/instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/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/instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NoopGreeterService.java b/instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/NoopGreeterService.java similarity index 99% rename from instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NoopGreeterService.java rename to instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/NoopGreeterService.java index 1fa605257..6dc5001d7 100644 --- a/instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NoopGreeterService.java +++ b/instrumentation/grpc-1.6/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/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/instrumentation/grpc-1.5/src/test/proto/helloworld.proto b/instrumentation/grpc-1.6/src/test/proto/helloworld.proto similarity index 100% rename from instrumentation/grpc-1.5/src/test/proto/helloworld.proto rename to instrumentation/grpc-1.6/src/test/proto/helloworld.proto diff --git a/instrumentation/grpc-1.5/src/test/resources/ht-config-all-disabled.yaml b/instrumentation/grpc-1.6/src/test/resources/ht-config-all-disabled.yaml similarity index 100% rename from instrumentation/grpc-1.5/src/test/resources/ht-config-all-disabled.yaml rename to instrumentation/grpc-1.6/src/test/resources/ht-config-all-disabled.yaml diff --git a/settings.gradle.kts b/settings.gradle.kts index c80e6cf04..02955dcea 100644 --- 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")