open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add comment about keeping grpc version in sync (#4290) 

* Add comment about keeping grpc version in sync

* Remove comment

* Fix
This commit is contained in:
Trask Stalnaker 2021-10-06 01:02:04 -07:00 committed by GitHub
parent c28374615b
commit 441ce3d115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dependencyManagement/build.gradle.kts
View File

@ -11,7 +11,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val dependencyVersions = hashMapOf<String, String>() val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions rootProject.extra["versions"] = dependencyVersions
// IMPORTANT when updating otelVersion, make sure that grpcVersion below is >= the grpc version
// used by that otel version
val otelVersion = "1.6.0" val otelVersion = "1.6.0"
val grpcVersion = "1.40.1"
rootProject.extra["otelVersion"] = otelVersion rootProject.extra["otelVersion"] = otelVersion
// Need both BOM and -all // Need both BOM and -all
@ -111,7 +114,8 @@ val DEPENDENCIES = listOf(
"org.objenesis:objenesis:3.2", "org.objenesis:objenesis:3.2",
"org.spockframework:spock-core:1.3-groovy-2.5", "org.spockframework:spock-core:1.3-groovy-2.5",
"org.scala-lang:scala-library:2.11.12", "org.scala-lang:scala-library:2.11.12",
"org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE" "org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE",
"io.grpc:grpc-netty-shaded:${grpcVersion}"
) )
javaPlatform { javaPlatform {

3
javaagent-exporters/build.gradle.kts
View File

@ -18,6 +18,5 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-exporter-zipkin") implementation("io.opentelemetry:opentelemetry-exporter-zipkin")
// TODO(anuraaga): Move version to dependency management implementation("io.grpc:grpc-netty-shaded")
implementation("io.grpc:grpc-netty-shaded:1.40.1")
} }