From 0f33b0e36a7d536839dca93c22e785d06bc8bcbf Mon Sep 17 00:00:00 2001 From: kishansairam9 Date: Thu, 22 Feb 2024 19:14:02 +0530 Subject: [PATCH 1/2] update to latest kafka streams framework --- gradle/libs.versions.toml | 2 +- .../enrichment/clients/DefaultClientRegistry.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1e5861b4..1c29644a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ hypertrace-attribute-service = "0.14.38" hypertrace-config-service = "0.1.60" hypertrace-grpc-utils = "0.12.6" hypertrace-serviceFramework = "0.1.68" -hypertrace-kafkaStreams = "0.4.4" +hypertrace-kafkaStreams = "0.4.7" hypertrace-view-generator = "0.4.21" grpc = "1.57.2" diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java index 39be7796..df70ec04 100644 --- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java +++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java @@ -21,6 +21,7 @@ import org.hypertrace.core.grpcutils.client.GrpcChannelConfig; import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry; import org.hypertrace.core.grpcutils.client.RequestContextClientCallCredsProviderFactory; +import org.hypertrace.core.kafka.event.listener.KafkaConsumerUtils; import org.hypertrace.core.kafka.event.listener.KafkaLiveEventListener; import org.hypertrace.entity.change.event.v1.EntityChangeEventKey; import org.hypertrace.entity.change.event.v1.EntityChangeEventValue; @@ -99,7 +100,7 @@ public DefaultClientRegistry( EntityServiceClientConfig.from(config).getCacheConfig(), cacheLoaderExecutor); this.entityChangeEventListener = - getEntityChangeEventConsumer(config, edsCacheClient::updateBasedOnChangeEvent); + getEntityChangeEventListener(config, edsCacheClient::updateBasedOnChangeEvent); this.entityDataClient = EntityDataClient.builder(this.entityServiceChannel).build(); this.entityCache = new EntityCache(this.edsCacheClient, cacheLoaderExecutor); this.entityAccessor = @@ -197,7 +198,7 @@ protected Channel buildChannel(String host, int port, GrpcChannelConfig grpcChan } private static Optional> - getEntityChangeEventConsumer( + getEntityChangeEventListener( Config clientsConfig, BiConsumer callback) { if (clientsConfig.hasPath(ENTITY_CHANGE_EVENTS_CONSUMER_ENABLED_KEY) && clientsConfig.getBoolean(ENTITY_CHANGE_EVENTS_CONSUMER_ENABLED_KEY)) { @@ -206,14 +207,17 @@ protected Channel buildChannel(String host, int port, GrpcChannelConfig grpcChan Collections.singletonMap( "schema.registry.url", clientsConfig.getString(ENTITY_CHANGE_EVENTS_SCHEMA_REGISTRY_URL_KEY)); + Config kafkaConfig = clientsConfig.getConfig(ENTITY_CHANGE_EVENTS_CONFIG_KEY); return Optional.of( new KafkaLiveEventListener.Builder() .registerCallback(callback) .build( consumerName, - clientsConfig.getConfig(ENTITY_CHANGE_EVENTS_CONFIG_KEY), - getEntityChangeEventKeyDeser(deserConfig), - getEntityChangeEventValueDeser(deserConfig))); + kafkaConfig, + KafkaConsumerUtils.getKafkaConsumer( + kafkaConfig, + getEntityChangeEventKeyDeser(deserConfig), + getEntityChangeEventValueDeser(deserConfig)))); } return Optional.empty(); } From b83bd587d8ebd0f48160d2f31ac9196867cc3a40 Mon Sep 17 00:00:00 2001 From: kishansairam9 Date: Thu, 22 Feb 2024 19:57:07 +0530 Subject: [PATCH 2/2] vuln fix --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1c29644a..c62bf234 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ hypertrace-config-service = "0.1.60" hypertrace-grpc-utils = "0.12.6" hypertrace-serviceFramework = "0.1.68" hypertrace-kafkaStreams = "0.4.7" -hypertrace-view-generator = "0.4.21" +hypertrace-view-generator = "0.4.24" grpc = "1.57.2" [libraries]