Skip to content

Commit

Permalink
version bumps (#40)
Browse files Browse the repository at this point in the history
* Uses Parameter in log statement

* Removes unnecessary dependency to gRPC

* Uses current versions of dependencies

* Uses version of lombok from Spring Boot BOM

* Switches to TaskProviders

This is one step to defer task creation.
See https://docs.gradle.org/current/userguide/task_configuration_avoidance.html

* Uses non-deprecated property

* Declares an explicit dependency on Task outputs

This avoids some warning messages while running gradle
  • Loading branch information
quandor committed May 5, 2023
1 parent ba80826 commit 9ebcb9e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 25 deletions.
24 changes: 11 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if (!project.hasProperty("buildVersion") || project.getProperty("buildVersion").

version = "$buildVersion"

task downloadBoomerangjs() {
tasks.register('downloadBoomerangjs') {
logger.info("Downloading Boomerangjs version {}.", boomerangVersion)
ext.dest = new File(buildDir, "boomerang-source-${boomerangVersion}.tgz")
outputs.files(ext.dest)
Expand All @@ -33,17 +33,18 @@ task downloadBoomerangjs() {
}
}

task deleteBoomerangjs(type: Delete) {
tasks.register('deleteBoomerangjs', Delete) {
delete new File(project.buildDir, "boomerangjs-${boomerangVersion}")
}

task downloadAndExtractBoomerang(dependsOn: [deleteBoomerangjs, downloadBoomerangjs], type: Copy) {
tasks.register ('downloadAndExtractBoomerang', Copy) {
dependsOn deleteBoomerangjs, downloadBoomerangjs
from tarTree(downloadBoomerangjs.dest)
into new File(project.buildDir, "boomerangjs-${boomerangVersion}")
filter { line -> line.replaceAll("%boomerang_version%", "${boomerangVersion}") }
}

task generateVersionFile {
tasks.register('generateVersionFile') {
ext.versionFile = new File(project.buildDir, "eum-version.info")
doLast {
def currentDate = new Date().toString()
Expand All @@ -53,7 +54,7 @@ task generateVersionFile {
}
}

task downloadOpenTelemetryPlugin() {
tasks.register('downloadOpenTelemetryPlugin') {
ext.dest = new File(buildDir, "boomerang-opentelemetry.js")
outputs.files(ext.dest)
doLast {
Expand All @@ -70,7 +71,7 @@ bootJar {
dependsOn downloadOpenTelemetryPlugin

archivesBaseName = "inspectit-ocelot-eum-server"
version = "${buildVersion}"
archiveVersion = "${buildVersion}"

manifest {
attributes "Start-Class": "rocks.inspectit.oce.eum.server.EUMServerApplication"
Expand Down Expand Up @@ -126,9 +127,6 @@ dependencies {
"io.opencensus:opencensus-impl:${openCensusVersion}",
"io.opencensus:opencensus-exporter-stats-prometheus:${openCensusVersion}",

"io.grpc:grpc-netty-shaded:${grpcVersion}",
"io.grpc:grpc-protobuf:${grpcVersion}",
"io.grpc:grpc-stub:${grpcVersion}",
platform("io.opentelemetry:opentelemetry-bom-alpha:${openTelemetryAlphaVersion}"),
"io.opentelemetry:opentelemetry-semconv",
platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}"),
Expand All @@ -154,8 +152,8 @@ dependencies {
"rocks.inspectit:opencensus-influxdb-exporter:${opencensusInfluxdbExporterVersion}",
)

compileOnly "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok"

testImplementation(
"org.springframework.boot:spring-boot-starter-test",
Expand All @@ -180,7 +178,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
}

task copyServerJar(type: Copy) {
tasks.register('copyServerJar', Copy) {
dependsOn bootJar
from("${buildDir}/libs/inspectit-ocelot-eum-server-${version}.jar")
into("${buildDir}/docker-jar")
Expand All @@ -193,5 +191,5 @@ docker {
name "inspectit/inspectit-ocelot-eum-server"
tags "${version}"
dockerfile file("docker/Dockerfile")
files "docker/entrypoint.sh", "$buildDir/docker-jar/inspectit-ocelot-eum-server.jar"
files "docker/entrypoint.sh", copyServerJar.outputs
}
13 changes: 6 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ openCensusVersion=0.31.1
# pin Prometheus client to 0.6.0 to prevent auto prefixing counter metrics with "_total"
# see: https://github.com/prometheus/client_java/issues/640, https://github.com/prometheus/client_java/pull/653
prometheusClientVersion = 0.6.0
lombokVersion=1.18.26
openTelemetryVersion=1.24.0
openTelemetryAlphaVersion=1.24.0-alpha
openTelemetryVersion=1.25.0
openTelemetryAlphaVersion=1.25.0-alpha
openTelemetryProtoVersion=1.7.1-alpha
grpcVersion=1.53.0
protobufVersion=3.22.2
protobufVersion=3.22.3
guavaVersion=31.1-jre
# there are newer version, but they are not compatible with Java 8
geoip2Version=2.16.1
Expand All @@ -30,8 +28,8 @@ commonsMath3Version=3.6.1
commonsIoVersion=2.11.0
influxdbJavaVersion=2.23
opencensusInfluxdbExporterVersion=1.2
armeriaVersion=1.22.1
testContainersVersion=1.17.6
armeriaVersion=1.23.1
testContainersVersion=1.18.0

### gradle plugin versions
### Check for newer version at https://plugins.gradle.org/
Expand All @@ -42,4 +40,5 @@ owaspDependencyCheckVersion=8.2.1
# org.cyclonedx.bom
cyclonedxBomVersion=1.7.4
# com.palantir.docker
# There is a newer Version 0.35.0, but it is not Java 8 compatible
palantirDockerVersion=0.34.0
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ private boolean shouldEnable() {
}
if (otlp.getEnabled().equals(ExporterEnabledState.ENABLED)) {
if (!SUPPORTED_PROTOCOLS.contains(otlp.getProtocol())) {
log.warn("OTLP Metric Exporter is enabled, but wrong 'protocol' is specified. Supported values are ", Arrays.toString(SUPPORTED_PROTOCOLS.stream()
.map(transportProtocol -> transportProtocol.getConfigRepresentation())
log.warn("OTLP Metric Exporter is enabled, but wrong 'protocol' is specified. Supported values are {}", Arrays.toString(SUPPORTED_PROTOCOLS.stream()
.map(TransportProtocol::getConfigRepresentation)
.toArray()));
}
if (!StringUtils.hasText(otlp.getEndpoint())) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package rocks.inspectit.oce.eum.server.exporters.configuration;

import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.opentelemetry.exporter.jaeger.JaegerGrpcSpanExporter;
import io.opentelemetry.exporter.jaeger.thrift.JaegerThriftSpanExporter;
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import lombok.extern.slf4j.Slf4j;
Expand Down

0 comments on commit 9ebcb9e

Please sign in to comment.