FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

⬆️ Upgrade min gRPC version to 1.6 by ryandens · Pull Request #338 · hypertrace/javaagent · GitHub

/ javaagent Public

⬆️ Upgrade min gRPC version to 1.6 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryandens merged 5 commits into from
Jul 15, 2021
Conversation 0 Commits 5 Checks 0 Files changed
Merged

⬆️ Upgrade min gRPC version to 1.6 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9e490b
:arrow_up" update GRPC version
ryandens Jul 14, 2021
e7d22a6
:truck: rename grpc package to end in v1_6
ryandens Jul 14, 2021
4338cbd
:truck: rename grpc-1.5 directory to grpc-1.6
ryandens Jul 14, 2021
94aeedc
:arrow_up: upgrade proto-gen-grpc-java version
ryandens Jul 14, 2021
25ca050
:pencil: update docs to reflect gRPC min version
ryandens Jul 14, 2021
File filter

Filter by extension

Filter by extension .java  (13) .kts  (3) .md  (1) .proto  (1) .yaml  (1) All 5 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion README.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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+ |
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/build.gradle.kts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
10 changes: 5 additions & 5 deletions instrumentation/grpc-1.5/build.gradle.kts → instrumentation/grpc-1.6/build.gradle.kts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand All @@ -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 {
Expand All @@ -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"]}")
Expand Down
2 changes: 1 addition & 1 deletion ...ce/grpc/v1_5/GrpcInstrumentationName.java → ...ce/grpc/v1_6/GrpcInstrumentationName.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ace/grpc/v1_5/GrpcSemanticAttributes.java → ...ace/grpc/v1_6/GrpcSemanticAttributes.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...pertrace/grpc/v1_5/GrpcSpanDecorator.java → ...pertrace/grpc/v1_6/GrpcSpanDecorator.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ttyHttp2HeadersInstrumentationModule.java → ...ttyHttp2HeadersInstrumentationModule.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...client/GrpcClientBodyInstrumentation.java → ...client/GrpcClientBodyInstrumentation.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../GrpcClientBodyInstrumentationModule.java → .../GrpcClientBodyInstrumentationModule.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...pc/v1_5/client/GrpcClientInterceptor.java → ...pc/v1_6/client/GrpcClientInterceptor.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...server/GrpcServerBodyInstrumentation.java → ...server/GrpcServerBodyInstrumentation.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../GrpcServerBodyInstrumentationModule.java → .../GrpcServerBodyInstrumentationModule.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...pc/v1_5/server/GrpcServerInterceptor.java → ...pc/v1_6/server/GrpcServerInterceptor.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...c/v1_5/server/NoopServerCallListener.java → ...c/v1_6/server/NoopServerCallListener.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ce/grpc/v1_5/GrpcInstrumentationTest.java → ...ce/grpc/v1_6/GrpcInstrumentationTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ertrace/grpc/v1_5/NoopGreeterService.java → ...ertrace/grpc/v1_6/NoopGreeterService.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 .../grpc-1.5/src/test/proto/helloworld.proto → .../grpc-1.6/src/test/proto/helloworld.proto
Show comments
View file
Open in desktop
File renamed without changes.
0 ...est/resources/ht-config-all-disabled.yaml → ...est/resources/ht-config-all-disabled.yaml
Show comments
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions settings.gradle.kts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Back | FazBrowse Home | New Git URL