Skip to content

update gradle to 8 #440

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
kishansairam9 merged 9 commits into from
Nov 22, 2023
Merged

update gradle to 8 #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
012b274
update gradle to 8
Nov 22, 2023
9a06144
update
Nov 22, 2023
de46d2d
update
Nov 22, 2023
8eb9bf1
remove grpc
Nov 22, 2023
f1f1dd8
spotless
Nov 22, 2023
d096f65
trivy ssl
Nov 22, 2023
f89dd0c
update
Nov 22, 2023
a335c7f
client utils grouper
Nov 22, 2023
42a65dc
spotless
Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# libssl3
CVE-2023-5678 exp:2023-12-31
Comment on lines +1 to +2
Copy link
Copy Markdown
Author

@kishansairam9 kishansairam9 Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
didn't report under PR tab but guessing this is the cause (based on other repo observations)

4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
hypertrace-entity-service = "0.8.78"
hypertrace-config-service = "0.1.54"
hypertrace-grpc-utils = "0.12.4"
hypertrace-grpc-utils = "0.12.6"
hypertrace-serviceFramework = "0.1.62"
hypertrace-kafkaStreams = "0.4.3"
hypertrace-view-generator = "0.4.20"
hypertrace-view-generator = "0.4.21"
grpc = "1.57.2"

[libraries]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
Copy link
Copy Markdown
Contributor

@aaron-steinfeld aaron-steinfeld Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't really matter, but any particular reason you chose an older 8.x release (8.4 has been out for a couple months)

Copy link
Copy Markdown
Author

@kishansairam9 kishansairam9 Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

8.4 didn't work on my machine failing to fetch distribution from gradle site. Might be connection issue, but happened multiple times

HEAD request to https://services.gradle.org/distributions/gradle-8.4-all.zip failed: response code (401)

Copy link
Copy Markdown
Contributor

@aaron-steinfeld aaron-steinfeld Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh bizarre, 401. Shouldn't be anything version specific but don't worry about it if it's still failing.

networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
31 changes: 23 additions & 8 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 7 additions & 43 deletions hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,31 @@
import com.google.protobuf.gradle.generateProtoTasks
import com.google.protobuf.gradle.id
import com.google.protobuf.gradle.ofSourceSet
import com.google.protobuf.gradle.plugins
import com.google.protobuf.gradle.protobuf
import com.google.protobuf.gradle.protoc

plugins {
`java-library`
jacoco
id("org.hypertrace.jacoco-report-plugin")
id("com.google.protobuf") version "0.8.15"
id("com.google.protobuf") version "0.9.2"
id("org.hypertrace.publish-plugin")
}

val generateLocalGoGrpcFiles = false

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.21.1"
}
plugins {
id("grpc_java") {
artifact = "io.grpc:protoc-gen-grpc-java:1.57.2"
}

if (generateLocalGoGrpcFiles) {
id("grpc_go") {
path = "<go-path>/bin/protoc-gen-go"
}
}
}
generateProtoTasks {
ofSourceSet("main").forEach {
it.plugins {
// Apply the "grpc" plugin whose spec is defined above, without options.
id("grpc_java")

if (generateLocalGoGrpcFiles) {
id("grpc_go")
}
}
it.builtins {
java
if (generateLocalGoGrpcFiles) {
id("go")
}
}
}
artifact = "com.google.protobuf:protoc:3.21.12"
}
}

tasks.test {
useJUnitPlatform()
}

sourceSets {
main {
java {
srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java")
srcDirs("build/generated/source/proto/main/java")
}
}
}

tasks.test {
useJUnitPlatform()
}

dependencies {
api(libs.google.protobuf.java)

Expand Down
1 change: 1 addition & 0 deletions raw-spans-grouper/raw-spans-grouper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation(libs.hypertrace.data.model)
implementation(libs.hypertrace.serviceFramework.framework)
implementation(libs.hypertrace.serviceFramework.metrics)
implementation(libs.hypertrace.grpc.client.utils)

implementation(libs.hypertrace.kafkaStreams.framework)
implementation(libs.hypertrace.kafkaStreams.weightedGroupPartitioners)
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ plugins {

rootProject.name = "hypertrace-ingester-root"

enableFeaturePreview("VERSION_CATALOGS")

// trace-enricher
include("hypertrace-trace-enricher:enriched-span-constants")
include("hypertrace-trace-enricher:hypertrace-trace-visualizer")
Expand Down
46 changes: 7 additions & 39 deletions span-normalizer/raw-span-constants/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,29 @@
import com.google.protobuf.gradle.generateProtoTasks
import com.google.protobuf.gradle.id
import com.google.protobuf.gradle.ofSourceSet
import com.google.protobuf.gradle.plugins
import com.google.protobuf.gradle.protobuf
import com.google.protobuf.gradle.protoc

plugins {
`java-library`
id("com.google.protobuf") version "0.8.15"
id("com.google.protobuf") version "0.9.2"
id("org.hypertrace.publish-plugin")
}

val generateLocalGoGrpcFiles = false

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.21.1"
}
plugins {
id("grpc_java") {
artifact = "io.grpc:protoc-gen-grpc-java:1.57.2"
}

if (generateLocalGoGrpcFiles) {
id("grpc_go") {
path = "<go-path>/bin/protoc-gen-go"
}
}
}
generateProtoTasks {
ofSourceSet("main").forEach {
it.plugins {
// Apply the "grpc" plugin whose spec is defined above, without options.
id("grpc_java")

if (generateLocalGoGrpcFiles) {
id("grpc_go")
}
}
it.builtins {
java
if (generateLocalGoGrpcFiles) {
id("go")
}
}
}
artifact = "com.google.protobuf:protoc:3.21.12"
}
}

sourceSets {
main {
java {
srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java")
srcDirs("build/generated/source/proto/main/java")
}
}
}

tasks.test {
useJUnitPlatform()
}

dependencies {
api("com.google.protobuf:protobuf-java-util:3.23.3")
constraints {
Expand Down
48 changes: 9 additions & 39 deletions span-normalizer/span-normalizer-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,30 @@
import com.google.protobuf.gradle.generateProtoTasks
import com.google.protobuf.gradle.id
import com.google.protobuf.gradle.ofSourceSet
import com.google.protobuf.gradle.plugins
import com.google.protobuf.gradle.protobuf
import com.google.protobuf.gradle.protoc

plugins {
`java-library`
id("com.google.protobuf") version "0.8.15"
id("com.google.protobuf") version "0.9.2"
id("org.hypertrace.publish-plugin")
id("org.hypertrace.avro-plugin")
}

val generateLocalGoGrpcFiles = false

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.21.1"
}
plugins {
id("grpc_java") {
artifact = "io.grpc:protoc-gen-grpc-java:1.57.2"
}

if (generateLocalGoGrpcFiles) {
id("grpc_go") {
path = "<go-path>/bin/protoc-gen-go"
}
}
}
generateProtoTasks {
ofSourceSet("main").forEach {
it.plugins {
// Apply the "grpc" plugin whose spec is defined above, without options.
id("grpc_java")

if (generateLocalGoGrpcFiles) {
id("grpc_go")
}
}
it.builtins {
java
if (generateLocalGoGrpcFiles) {
id("go")
}
}
}
artifact = "com.google.protobuf:protoc:3.21.12"
}
}

sourceSets {
main {
java {
srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java")
srcDirs("build/generated/source/proto/main/java")
}
}
}

tasks.test {
useJUnitPlatform()
}

dependencies {
api("com.google.api.grpc:proto-google-common-protos:2.14.1")
api("org.apache.avro:avro:1.11.3")
Expand Down