Use boms for grpc and opentelemetry in the examples (#1953)
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
		
							parent
							
								
									42952755e8
								
							
						
					
					
						commit
						698e9f4ad6
					
				|  | @ -28,6 +28,11 @@ subprojects { | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |     dependencies { | ||||||
|  |         compile platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}") | ||||||
|  |         compile platform("io.grpc:grpc-bom:${grpcVersion}") | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|     spotless { |     spotless { | ||||||
|         java { |         java { | ||||||
|             googleJavaFormat("1.9") |             googleJavaFormat("1.9") | ||||||
|  | @ -36,7 +41,7 @@ subprojects { | ||||||
| 
 | 
 | ||||||
|     //create a single Jar with all dependencies |     //create a single Jar with all dependencies | ||||||
|     task fatJar(type: Jar) { |     task fatJar(type: Jar) { | ||||||
|         baseName = project.name + '-all' |         archiveBaseName = project.name + '-all' | ||||||
|         from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } |         from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } | ||||||
|         with jar |         with jar | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -6,12 +6,12 @@ description = 'OpenTelemetry Examples for gRPC' | ||||||
| ext.moduleName = "io.opentelemetry.examples.grpc" | ext.moduleName = "io.opentelemetry.examples.grpc" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile "io.opentelemetry:opentelemetry-api:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-api" | ||||||
|     compile "io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-sdk" | ||||||
|     compile "io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-exporters-logging" | ||||||
|     compile "io.grpc:grpc-protobuf:${grpcVersion}" |     compile "io.grpc:grpc-protobuf" | ||||||
|     compile "io.grpc:grpc-stub:${grpcVersion}" |     compile "io.grpc:grpc-stub" | ||||||
|     compile "io.grpc:grpc-netty-shaded:${grpcVersion}" |     compile "io.grpc:grpc-netty-shaded" | ||||||
| 
 | 
 | ||||||
|     if (JavaVersion.current().isJava9Compatible()) { |     if (JavaVersion.current().isJava9Compatible()) { | ||||||
|         // Workaround for @javax.annotation.Generated |         // Workaround for @javax.annotation.Generated | ||||||
|  |  | ||||||
|  | @ -6,9 +6,9 @@ description = 'OpenTelemetry Examples for HTTP' | ||||||
| ext.moduleName = "io.opentelemetry.examples.http" | ext.moduleName = "io.opentelemetry.examples.http" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-logging") | ||||||
|     compile "io.grpc:grpc-context:${grpcVersion}" |     compile "io.grpc:grpc-context" | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,9 +6,9 @@ description = 'OpenTelemetry Examples for Jaeger Exporter' | ||||||
| ext.moduleName = "io.opentelemetry.examples.jaeger" | ext.moduleName = "io.opentelemetry.examples.jaeger" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-jaeger:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-jaeger") | ||||||
|     compile("io.grpc:grpc-protobuf:1.28.0") |     compile("io.grpc:grpc-protobuf:1.28.0") | ||||||
|     compile("io.grpc:grpc-netty-shaded:1.28.0") |     compile("io.grpc:grpc-netty-shaded:1.28.0") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,5 +6,5 @@ description = 'OpenTelemetry Examples for metrics' | ||||||
| ext.moduleName = "io.opentelemetry.examples.metrics" | ext.moduleName = "io.opentelemetry.examples.metrics" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,8 +6,8 @@ description = 'OpenTelemetry Example for OTLP Exporters' | ||||||
| ext.moduleName = "io.opentelemetry.examples.otlp" | ext.moduleName = "io.opentelemetry.examples.otlp" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-otlp:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-otlp") | ||||||
|     compile "io.grpc:grpc-netty-shaded:${grpcVersion}" |     compile "io.grpc:grpc-netty-shaded" | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,9 +6,9 @@ description = 'OpenTelemetry Example for Prometheus Exporter' | ||||||
| ext.moduleName = "io.opentelemetry.examples.prometheus" | ext.moduleName = "io.opentelemetry.examples.prometheus" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-prometheus:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-prometheus") | ||||||
|     compile("io.prometheus:simpleclient:0.8.1") |     compile("io.prometheus:simpleclient:0.8.1") | ||||||
|     compile("io.prometheus:simpleclient_httpserver:0.8.1") |     compile("io.prometheus:simpleclient_httpserver:0.8.1") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,7 +6,7 @@ description = 'OpenTelemetry Examples for SDK Usage' | ||||||
| ext.moduleName = "io.opentelemetry.examples.sdk.usage" | ext.moduleName = "io.opentelemetry.examples.sdk.usage" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile "io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-sdk" | ||||||
|     compile "io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-exporters-logging" | ||||||
|     compile "io.grpc:grpc-context:${grpcVersion}" |     compile "io.grpc:grpc-context" | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -6,7 +6,7 @@ description = 'OpenTelemetry Examples for Zipkin Exporter' | ||||||
| ext.moduleName = "io.opentelemetry.examples.zipkin" | ext.moduleName = "io.opentelemetry.examples.zipkin" | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-zipkin:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-zipkin") | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue