Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ ignore:
SNYK-JAVA-IONETTY-1042268:
- '*':
reason: no available replacement
expires: 2021-12-31T00:00:00.000Z
expires: 2022-01-31T00:00:00.000Z
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

what does this mean ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

As currently there is no fixed version available for this (https://security.snyk.io/vuln/SNYK-JAVA-IONETTY-1042268), I am extending the expiry date for one month, till then it will not be reported as snyk failures.

Do you see anything wrong or missing something? It's YYYY-MM-DD, right?

patch: {}
6 changes: 3 additions & 3 deletions hypertrace-ingester/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ hypertraceDocker {
}

dependencies {
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.9")
implementation("com.typesafe:config:1.4.1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ tasks.test {

dependencies {
// common and framework
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")

// open telemetry
implementation("io.opentelemetry:opentelemetry-sdk-metrics:1.7.0-alpah")
Expand All @@ -43,6 +43,15 @@ dependencies {
// kafka
implementation("org.apache.kafka:kafka-clients:2.7.2")

// constrains
constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

// test
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ dependencies {
// common and framework
implementation(project(":hypertrace-metrics-generator:hypertrace-metrics-generator-api"))
implementation(project(":hypertrace-view-generator:hypertrace-view-generator-api"))
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.31")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.31")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")

// open telemetry proto
implementation("io.opentelemetry:opentelemetry-proto:1.6.0-alpha")
Expand All @@ -40,6 +40,11 @@ dependencies {
implementation("org.glassfish.jersey.core:jersey-common:2.34") {
because("https://snyk.io/vuln/SNYK-JAVA-ORGGLASSFISHJERSEYCORE-1255637")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

// test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ dependencies {
implementation(project(":hypertrace-view-generator:hypertrace-view-generator-api"))

// frameworks
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")

// open telemetry proto
implementation("io.opentelemetry:opentelemetry-proto:1.6.0-alpha")
Expand All @@ -43,6 +43,11 @@ dependencies {
"io.confluent:kafka-schema-registry-client@6.0.1 > " +
"org.glassfish.jersey.core:jersey-common@2.30")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

// test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ dependencies {
implementation(project(":semantic-convention-utils"))
implementation("org.hypertrace.entity.service:entity-service-api:0.8.5")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ dependencies {

implementation("org.slf4j:slf4j-api:1.7.30")
implementation("org.apache.commons:commons-lang3:3.12.0")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.9.0")
testImplementation("org.mockito:mockito-inline:3.9.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.entity.service:entity-service-client:0.8.5")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.28")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.2")
implementation("org.hypertrace.config.service:spaces-config-service-api:0.1.0")
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.6.2")
Expand All @@ -30,6 +30,14 @@ dependencies {
implementation("net.sf.uadetector:uadetector-resources:2014.10")
implementation("io.reactivex.rxjava3:rxjava:3.0.11")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
testImplementation("org.mockito:mockito-junit-jupiter:3.8.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,31 @@ tasks.test {
dependencies {
implementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher-impl"))
implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.entity.service:entity-service-client:0.8.5")

implementation("com.typesafe:config:1.4.1")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")
constraints {
runtimeOnly("io.netty:netty-codec-http2:4.1.71.Final")
runtimeOnly("io.netty:netty-handler-proxy:4.1.71.Final")
implementation("org.glassfish.jersey.core:jersey-common:2.34") {
because("https://snyk.io/vuln/SNYK-JAVA-ORGGLASSFISHJERSEYCORE-1255637")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

// Required for the GRPC clients.
runtimeOnly("io.grpc:grpc-netty:1.42.0")

// Logging
implementation("org.slf4j:slf4j-api:1.7.30")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")

testImplementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher"))
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ dependencies {

implementation("org.json:json:20210307")
implementation("org.apache.commons:commons-lang3:3.12.0")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}
}

description = "Trace Visualizer to help visualize a structured trace."
10 changes: 9 additions & 1 deletion hypertrace-trace-enricher/trace-reader/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,18 @@ dependencies {
annotationProcessor("org.projectlombok:lombok:1.18.20")
compileOnly("org.projectlombok:lombok:1.18.20")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-inline:3.8.0")
testImplementation("org.mockito:mockito-junit-jupiter:3.8.0")
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")

tasks.test {
useJUnitPlatform()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@ tasks.test {

dependencies {
implementation(project(":hypertrace-view-generator:hypertrace-view-generator-api"))
implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.3.9")
implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.3.10")
constraints {
// to have calcite libs on the same version
implementation("org.apache.calcite:calcite-babel:1.26.0") {
because("https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECALCITE-1038296")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@ dependencies {
api("org.apache.commons:commons-compress:1.21") {
because("Multiple vulnerabilities in avro-declared version")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ dependencies {
implementation(project(":semantic-convention-utils"))

// TODO: migrate in core
implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.9")
implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.10")
implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")

implementation("org.hypertrace.entity.service:entity-service-api:0.8.5")

implementation("org.apache.avro:avro:1.10.2")
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
Expand Down
16 changes: 12 additions & 4 deletions raw-spans-grouper/raw-spans-grouper/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,26 @@ dependencies {
}
implementation(project(":span-normalizer:span-normalizer-api"))
implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")

implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")
implementation("com.typesafe:config:1.4.1")
implementation("de.javakaffee:kryo-serializers:0.45")
implementation("io.confluent:kafka-avro-serializer:5.5.0")
implementation("com.google.guava:guava:30.1.1-jre")

// Logging
implementation("org.slf4j:slf4j-api:1.7.30")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
Expand Down
8 changes: 8 additions & 0 deletions semantic-convention-utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ dependencies {
implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.apache.commons:commons-lang3:3.12.0")

constraints {
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.mockito:mockito-core:3.8.0")
}
4 changes: 4 additions & 0 deletions span-normalizer/helm/templates/span-normalizer-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ data:
spanDropCriterion = {{ .Values.spanNormalizerConfig.processor.spanDropCriterion | toJson }}
{{- end }}

{{- if hasKey .Values.spanNormalizerConfig.processor "spanDropFilters" }}
spanDropFilters = {{ .Values.spanNormalizerConfig.processor.spanDropFilters | toJson }}
{{- end }}

{{- if hasKey .Values.spanNormalizerConfig.processor "rootExitSpanDropCriterion" }}
rootExitSpanDropCriterion = {{ .Values.spanNormalizerConfig.processor.rootExitSpanDropCriterion | toJson }}
{{- end }}
Expand Down
5 changes: 5 additions & 0 deletions span-normalizer/span-normalizer-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,10 @@ dependencies {
api("org.apache.commons:commons-compress:1.21") {
because("Multiple vulnerabilities in avro-declared version")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}
}
15 changes: 10 additions & 5 deletions span-normalizer/span-normalizer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ dependencies {
implementation(project(":semantic-convention-utils"))

implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.33")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.23")

// Required for the GRPC clients.
runtimeOnly("io.grpc:grpc-netty:1.42.0")
Expand All @@ -47,6 +47,11 @@ dependencies {
implementation("org.glassfish.jersey.core:jersey-common:2.34") {
because("https://snyk.io/vuln/SNYK-JAVA-ORGGLASSFISHJERSEYCORE-1255637")
}
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.1") {
because("Denial of Service (DoS) " +
"[Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2326698] " +
"in com.fasterxml.jackson.core:jackson-databind@2.12.2")
}
}

implementation("com.typesafe:config:1.4.1")
Expand All @@ -57,10 +62,10 @@ dependencies {

// Logging
implementation("org.slf4j:slf4j-api:1.7.30")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")

testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26")
testImplementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33")
testImplementation("org.junit-pioneer:junit-pioneer:1.3.8")
testImplementation("org.mockito:mockito-core:3.8.0")
testImplementation("org.apache.kafka:kafka-streams-test-utils:6.0.1-ccs")
Expand Down