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

chore: fixed the naming of entity cache #455

Merged
merged 3 commits into from
Feb 20, 2024
Merged

chore: fixed the naming of entity cache #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9036d0
chore: fixed the naming of entity cache
Feb 20, 2024
b73febc
fixed the naming other caches too
Feb 20, 2024
306fcfe
fixing vuln for apache common compress
Feb 20, 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
8 changes: 4 additions & 4 deletions ...pl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/cache/EntityCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,22 @@ public EntityCache(EdsClient edsClient, Executor asyncCacheLoaderExecutor) {
asyncCacheLoaderExecutor));

PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"fqnToServiceEntityCache",
this.getClass().getName() + DOT + "fqnToServiceEntityCache",
fqnToServiceEntityCache,
Collections.emptyMap(),
DEFAULT_CACHE_MAX_SIZE);
PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"nameToServiceEntitiesCache",
this.getClass().getName() + DOT + "nameToServiceEntitiesCache",
nameToServiceEntitiesCache,
Collections.emptyMap(),
DEFAULT_CACHE_MAX_SIZE);
PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"nameToNamespaceEntitiesCache",
this.getClass().getName() + DOT + "nameToNamespaceEntitiesCache",
nameToNamespaceEntitiesCache,
Collections.emptyMap(),
DEFAULT_CACHE_MAX_SIZE);
PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"backendIdAttrsToEntityCache",
this.getClass().getName() + DOT + "backendIdAttrsToEntityCache",
backendIdAttrsToEntityCache,
Collections.emptyMap(),
DEFAULT_CACHE_MAX_SIZE);
Expand Down
5 changes: 4 additions & 1 deletion ...java/org/hypertrace/traceenricher/enrichment/enrichers/space/SpaceRulesCachingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ public SpaceRulesCachingClient(Channel spacesConfigChannel) {
.withCallCredentials(
RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider().get());
PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"spaceRulesCache", spaceRulesCache, Collections.emptyMap(), DEFAULT_CACHE_MAX_SIZE);
this.getClass().getName() + DOT + "spaceRulesCache",
spaceRulesCache,
Collections.emptyMap(),
DEFAULT_CACHE_MAX_SIZE);
}

private final LoadingCache<String, List<SpaceConfigRule>> spaceRulesCache =
Expand Down
5 changes: 4 additions & 1 deletion ...-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/util/UserAgentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ public UserAgentParser(Config config) {
.recordStats()
.build(CacheLoader.from(userAgentStringParser::parse));
PlatformMetricsRegistry.registerCacheTrackingOccupancy(
"userAgentCache", userAgentCache, Collections.emptyMap(), cacheMaxSize);
this.getClass().getName() + ".userAgentCache",
userAgentCache,
Collections.emptyMap(),
cacheMaxSize);
}

public Optional<ReadableUserAgent> getUserAgent(Event event) {
Expand Down
9 changes: 9 additions & 0 deletions owasp-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,13 @@
<packageUrl regex="true">^pkg:maven/io\.grpc/grpc\-.*@.*$</packageUrl>
<cve>CVE-2023-44487</cve>
</suppress>
<suppress until="2024-03-30Z">
<notes><![CDATA[
The fix might be available in 1.26.0, we will upgrade to it when its available
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The latest version is 1.25.0, and it also has the same vuln. So, for now, suppressing it.

file name: commons-compress-1.24.0.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.commons/commons\-compress@.*$</packageUrl>
<cve>CVE-2024-25710</cve>
<cve>CVE-2024-26308</cve>
</suppress>
</suppressions>
Loading