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

Plt 1753 #288

Merged
merged 6 commits into from
Apr 11, 2024
Merged

Plt 1753 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a9e55f
OAP-241 move oap-http-prometheus to a separate module
galaxina Feb 22, 2024
e824d95
OAP-218 move oap-http to a separate module
galaxina Feb 22, 2024
98cbf94
Merge remote-tracking branch 'origin/master'
alebastrov Mar 14, 2024
c8a6717
Merge remote-tracking branch 'origin/master'
alebastrov Apr 11, 2024
de53622
PLT-1753
alebastrov Apr 11, 2024
8826031
PLT-1753
alebastrov Apr 11, 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
39 changes: 20 additions & 19 deletions oap-template/src/main/java/oap/template/TemplateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import com.google.common.cache.CacheBuilder;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import com.google.common.util.concurrent.UncheckedExecutionException;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tags;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import oap.google.JodaTicker;
import oap.io.Resources;
Expand All @@ -45,7 +45,6 @@
import org.antlr.v4.runtime.BufferedTokenStream;
import org.antlr.v4.runtime.CharStreams;

import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.nio.file.Files;
Expand All @@ -55,19 +54,21 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Stream;

import static java.nio.charset.StandardCharsets.UTF_8;

@Slf4j
@ToString( of = { "ttl", "maxSize", "diskCache" } )
public class TemplateEngine implements Runnable {
public static final String METRICS_NAME = "oap_template_cache";
private final Map<String, List<Method>> builtInFunction = new HashMap<>();
private final Cache<String, TemplateFunction> templates;
public final Path diskCache;
public final long ttl;
private final HashMap<String, List<Method>> builtInFunction = new HashMap<>();
private final Cache<String, TemplateFunction> templates;
public long maxSize = 1_000_000;

public TemplateEngine( long ttl ) {
Expand All @@ -89,12 +90,12 @@ public TemplateEngine( Path diskCache, long ttl ) {

loadFunctions();

log.info( "diskCache {} ttl {} functions {}", diskCache, Dates.durationToString( ttl ), builtInFunction.keySet() );
log.info( "diskCache: {} ttl: {} functions: {}", diskCache, Dates.durationToString( ttl ), builtInFunction.keySet() );

Metrics.gauge( "oap_template_cache", Tags.of( "type", "size" ), templates, Cache::size );
Metrics.gauge( "oap_template_cache", Tags.of( "type", "hit" ), templates, c -> c.stats().hitCount() );
Metrics.gauge( "oap_template_cache", Tags.of( "type", "miss" ), templates, c -> c.stats().missCount() );
Metrics.gauge( "oap_template_cache", Tags.of( "type", "eviction" ), templates, c -> c.stats().evictionCount() );
Metrics.gauge( METRICS_NAME, Tags.of( "type", "size" ), templates, Cache::size );
Metrics.gauge( METRICS_NAME, Tags.of( "type", "hit" ), templates, c -> c.stats().hitCount() );
Metrics.gauge( METRICS_NAME, Tags.of( "type", "miss" ), templates, c -> c.stats().missCount() );
Metrics.gauge( METRICS_NAME, Tags.of( "type", "eviction" ), templates, c -> c.stats().evictionCount() );
}

public static String getHashName( String template ) {
Expand All @@ -104,7 +105,6 @@ public static String getHashName( String template ) {

public static long getHash( String template ) {
var hashFunction = Hashing.murmur3_128();

return hashFunction.hashUnencodedChars( template ).asLong();
}

Expand Down Expand Up @@ -151,8 +151,8 @@ private void loadFunctions() {
@SuppressWarnings( "unchecked" )
public <TIn, TOut, TOutMutable, TA extends TemplateAccumulator<TOut, TOutMutable, TA>> Template<TIn, TOut, TOutMutable, TA>
getTemplate( String name, TypeRef<TIn> type, String template, TA acc, Map<String, String> aliases, ErrorStrategy errorStrategy, Consumer<AstRender> postProcess ) {
assert template != null;
assert acc != null;
Objects.requireNonNull( template );
Objects.requireNonNull( acc );

Hasher hasher = Hashing.murmur3_128().newHasher();
hasher
Expand All @@ -178,7 +178,6 @@ private void loadFunctions() {
var elements = grammar.elements( aliases ).ret;
log.trace( "\n" + elements.print() );


AstRenderRoot ast = TemplateAstUtils.toAst( elements, new TemplateType( type.type() ), builtInFunction, errorStrategy );

if( postProcess != null )
Expand All @@ -191,7 +190,8 @@ private void loadFunctions() {
} );

return ( Template<TIn, TOut, TOutMutable, TA> ) tFunc.template;
} catch( UncheckedExecutionException | ExecutionException e ) {
} catch( Exception e ) {
if( e.getCause() == null ) throw new RuntimeException( e );
if( e.getCause() instanceof TemplateException ) {
throw ( TemplateException ) e.getCause();
}
Expand All @@ -206,6 +206,7 @@ public long getCacheSize() {
@Override
public void run() {
templates.cleanUp();
if( diskCache == null ) return;
var now = System.currentTimeMillis();
try( Stream<Path> stream = Files.walk( diskCache ) ) {
stream
Expand All @@ -215,12 +216,12 @@ public void run() {
log.debug( "delete {}", path );
Files.deleteIfExists( path );
}
} catch( IOException e ) {
log.error( "Cannot delete {}", path, e );
} catch( Exception e ) {
log.error( "Cannot delete file/dir: {}", path, e );
}
} );
} catch( IOException e ) {
log.error( "Could not walk through " + diskCache, e );
} catch( Exception e ) {
log.error( "Could not walk through: " + diskCache, e );
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</distributionManagement>

<properties>
<oap.project.version>21.19.1</oap.project.version>
<oap.project.version>21.19.2</oap.project.version>

<oap.deps.config.version>21.0.0</oap.deps.config.version>
<oap.deps.oap-teamcity.version>21.0.1</oap.deps.oap-teamcity.version>
Expand Down
Loading