Skip to content
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

update to latest kafka streams framework #456

Merged
merged 2 commits into from
Feb 22, 2024
Merged

update to latest kafka streams framework #456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f33b0e
update to latest kafka streams framework
Feb 22, 2024
b83bd58
vuln fix
Feb 22, 2024
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
14 changes: 9 additions & 5 deletions .../src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -99,7 +100,7 @@
EntityServiceClientConfig.from(config).getCacheConfig(),
cacheLoaderExecutor);
this.entityChangeEventListener =
getEntityChangeEventConsumer(config, edsCacheClient::updateBasedOnChangeEvent);
getEntityChangeEventListener(config, edsCacheClient::updateBasedOnChangeEvent);

Check warning on line 103 in hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java

View check run for this annotation

Codecov / codecov/patch

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java#L103 

Added line #L103 was not covered by tests
this.entityDataClient = EntityDataClient.builder(this.entityServiceChannel).build();
this.entityCache = new EntityCache(this.edsCacheClient, cacheLoaderExecutor);
this.entityAccessor =
Expand Down Expand Up @@ -197,7 +198,7 @@
}

private static Optional<KafkaLiveEventListener<EntityChangeEventKey, EntityChangeEventValue>>
getEntityChangeEventConsumer(
getEntityChangeEventListener(
Config clientsConfig, BiConsumer<EntityChangeEventKey, EntityChangeEventValue> callback) {
if (clientsConfig.hasPath(ENTITY_CHANGE_EVENTS_CONSUMER_ENABLED_KEY)
&& clientsConfig.getBoolean(ENTITY_CHANGE_EVENTS_CONSUMER_ENABLED_KEY)) {
Expand All @@ -206,14 +207,17 @@
Collections.singletonMap(
"schema.registry.url",
clientsConfig.getString(ENTITY_CHANGE_EVENTS_SCHEMA_REGISTRY_URL_KEY));
Config kafkaConfig = clientsConfig.getConfig(ENTITY_CHANGE_EVENTS_CONFIG_KEY);

Check warning on line 210 in hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java

View check run for this annotation

Codecov / codecov/patch

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java#L210 

Added line #L210 was not covered by tests
return Optional.of(
new KafkaLiveEventListener.Builder<EntityChangeEventKey, EntityChangeEventValue>()
.registerCallback(callback)
.build(
consumerName,
clientsConfig.getConfig(ENTITY_CHANGE_EVENTS_CONFIG_KEY),
getEntityChangeEventKeyDeser(deserConfig),
getEntityChangeEventValueDeser(deserConfig)));
kafkaConfig,
KafkaConsumerUtils.getKafkaConsumer(

Check warning on line 217 in hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java

View check run for this annotation

Codecov / codecov/patch

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java#L217 

Added line #L217 was not covered by tests
kafkaConfig,
getEntityChangeEventKeyDeser(deserConfig),
getEntityChangeEventValueDeser(deserConfig))));

Check warning on line 220 in hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java

View check run for this annotation

Codecov / codecov/patch

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/clients/DefaultClientRegistry.java#L219-L220 

Added lines #L219 - L220 were not covered by tests
}
return Optional.empty();
}
Expand Down
Loading