Skip to content

Enable collection of more metrics (esp. I/O level) via Honeycomb #1492

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

Merged
jdcasey merged 1 commit into from
Jan 20, 2020
Merged

Enable collection of more metrics (esp. I/O level) via Honeycomb #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ...xrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloMavenContentAccessResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
import org.commonjava.indy.core.bind.jaxrs.ContentAccessHandler;
import org.commonjava.indy.core.bind.jaxrs.util.RequestUtils;
import org.commonjava.indy.folo.model.TrackingKey;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.commonjava.indy.model.core.AccessChannel;
import org.commonjava.maven.galley.event.EventMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;

import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -124,7 +125,7 @@ public Response doHead( @ApiParam( "User-assigned tracking session key" ) @PathP
EventMetadata metadata =
new EventMetadata().set( TRACKING_KEY, tk ).set( ACCESS_CHANNEL, AccessChannel.NATIVE );

MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

return handler.doHead( PKG_TYPE_MAVEN, type, name, path, cacheOnly, baseUri, request, metadata );
}
Expand All @@ -147,7 +148,7 @@ public Response doGet( @ApiParam( "User-assigned tracking session key" ) @PathPa
EventMetadata metadata =
new EventMetadata().set( TRACKING_KEY, tk ).set( ACCESS_CHANNEL, AccessChannel.NATIVE );

MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

return handler.doGet( PKG_TYPE_MAVEN, type, name, path, baseUri, request, metadata );
}
Expand Down
11 changes: 6 additions & 5 deletions ...jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloNPMContentAccessResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
import org.commonjava.indy.bind.jaxrs.util.REST;
import org.commonjava.indy.core.bind.jaxrs.util.RequestUtils;
import org.commonjava.indy.folo.model.TrackingKey;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.commonjava.indy.model.core.AccessChannel;
import org.commonjava.indy.pkg.npm.inject.NPMContentHandler;
import org.commonjava.indy.pkg.npm.jaxrs.NPMContentAccessHandler;
import org.commonjava.maven.galley.event.EventMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;

import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -153,7 +154,7 @@ public Response doHead( @ApiParam( "User-assigned tracking session key" ) @PathP
EventMetadata metadata = new EventMetadata().set( TRACKING_KEY, tk )
.set( ACCESS_CHANNEL, AccessChannel.NATIVE );

MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

return handler.doHead( NPM_PKG_KEY, type, name, packageName, cacheOnly, baseUri, request, metadata );
}
Expand All @@ -176,7 +177,7 @@ public Response doHead( @ApiParam( "User-assigned tracking session key" ) @PathP
EventMetadata metadata =
new EventMetadata().set( TRACKING_KEY, tk ).set( ACCESS_CHANNEL, AccessChannel.NATIVE );

MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

final String baseUri = getBasePath( uriInfo, id );
final String path = Paths.get( packageName, versionTarball ).toString();
Expand All @@ -203,7 +204,7 @@ public Response doGet( @ApiParam( "User-assigned tracking session key" ) @PathPa
EventMetadata metadata = new EventMetadata().set( TRACKING_KEY, tk )
.set( ACCESS_CHANNEL, AccessChannel.NATIVE );

MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

return handler.doGet( NPM_PKG_KEY, type, name, packageName, baseUri, request, metadata );
}
Expand All @@ -225,7 +226,7 @@ public Response doGet( @ApiParam( "User-assigned tracking session key" ) @PathPa
final TrackingKey tk = new TrackingKey( id );
EventMetadata metadata =
new EventMetadata().set( TRACKING_KEY, tk ).set( ACCESS_CHANNEL, AccessChannel.NATIVE );
MDC.put( CONTENT_TRACKING_ID, id );
RequestContextHelper.setContext( CONTENT_TRACKING_ID, id );

final String path = Paths.get( packageName, versionTarball ).toString();
final String baseUri = getBasePath( uriInfo, id );
Expand Down
8 changes: 4 additions & 4 deletions .../httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyAcceptHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.commonjava.maven.galley.spi.cache.CacheProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.xnio.ChannelListener;
import org.xnio.StreamConnection;
import org.xnio.channels.AcceptingChannel;
Expand Down Expand Up @@ -135,7 +135,7 @@ public ProxyRepositoryCreator createRepoCreator()
public void handleEvent( AcceptingChannel<StreamConnection> channel )
{
long start = System.nanoTime();
MDC.put( RequestContextHelper.ACCESS_CHANNEL, AccessChannel.GENERIC_PROXY.toString() );
RequestContextHelper.setContext( RequestContextHelper.ACCESS_CHANNEL, AccessChannel.GENERIC_PROXY.toString() );
setContext( PACKAGE_TYPE, PKG_TYPE_GENERIC_HTTP );

final Logger logger = LoggerFactory.getLogger( getClass() );
Expand All @@ -157,10 +157,10 @@ public void handleEvent( AcceptingChannel<StreamConnection> channel )
return;
}

MDC.put( REQUEST_PHASE, REQUEST_PHASE_START );
RequestContextHelper.setContext( REQUEST_PHASE, REQUEST_PHASE_START );
LoggerFactory.getLogger( PROXY_METRIC_LOGGER )
.info( "START HTTProx request (from: {})", accepted.getPeerAddress() );
MDC.remove( REQUEST_PHASE );
RequestContextHelper.clearContext( REQUEST_PHASE );

logger.debug( "accepted {}", accepted.getPeerAddress() );

Expand Down
4 changes: 2 additions & 2 deletions ...httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.commonjava.maven.galley.spi.cache.CacheProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.xnio.ChannelListener;
import org.xnio.StreamConnection;
import org.xnio.conduits.ConduitStreamSinkChannel;
Expand Down Expand Up @@ -278,7 +278,7 @@ private void doHandleEvent( final ConduitStreamSinkChannel sinkChannel )
if ( trackingKey != null )
{
trackingId = trackingKey.getId();
MDC.put( RequestContextHelper.CONTENT_TRACKING_ID, trackingId );
RequestContextHelper.setContext( RequestContextHelper.CONTENT_TRACKING_ID, trackingId );
}

String authCacheKey = generateAuthCacheKey( proxyUserPass );
Expand Down
8 changes: 4 additions & 4 deletions addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyMeter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import org.commonjava.indy.sli.metrics.GoldenSignalsMetricSet;
import org.slf4j.Logger;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;

import java.net.SocketAddress;

Expand Down Expand Up @@ -73,7 +73,7 @@ public void reportResponseSummary()

long latency = System.nanoTime() - startNanos;

MDC.put( REQUEST_LATENCY_NS, String.valueOf( latency ) );
RequestContextHelper.setContext( REQUEST_LATENCY_NS, String.valueOf( latency ) );
setContext( HTTP_METHOD, method );

// log SLI metrics
Expand All @@ -89,9 +89,9 @@ public void reportResponseSummary()
} );
}

MDC.put( REQUEST_PHASE, REQUEST_PHASE_END );
RequestContextHelper.setContext( REQUEST_PHASE, REQUEST_PHASE_END );
restLogger.info( "END {} (from: {})", requestLine, peerAddress );
MDC.remove( REQUEST_PHASE );
RequestContextHelper.clearContext( REQUEST_PHASE );
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private String filterMetadata()
return "";
}

Timer.Context timer = metricsManager == null ? null : metricsManager.getTimer( TIMER ).time();
Timer.Context timer = metricsManager == null ? null : metricsManager.startTimer( TIMER );
try
{
// filter versions from GA metadata
Expand Down Expand Up @@ -321,7 +321,7 @@ private String filterMetadata()
{
if ( timer != null )
{
timer.stop();
metricsManager.stopTimer( TIMER );
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/commonjava/indy/pkg/npm/content/NPMPackageMaskingTransferDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public synchronized int read( byte[] b, int off, int len ) throws IOException

private void mask( String contextURL ) throws IOException
{
Timer.Context timer = metricsManager == null ? null : metricsManager.getTimer( TIMER ).time();
Timer.Context timer = metricsManager == null ? null : metricsManager.startTimer( TIMER );
try
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Expand All @@ -183,7 +183,7 @@ private void mask( String contextURL ) throws IOException
{
if ( timer != null )
{
timer.stop();
metricsManager.stopTimer( TIMER );
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Event;
Expand Down Expand Up @@ -203,10 +203,10 @@ public PromotionManager( PromotionValidator validator, ContentManager contentMan
public GroupPromoteResult promoteToGroup( GroupPromoteRequest request, String user, String baseUrl )
throws PromotionException, IndyWorkflowException
{
MDC.put( PROMOTION_ID, request.getPromotionId() );
MDC.put( PROMOTION_TYPE, GROUP_PROMOTION );
MDC.put( PROMOTION_SOURCE, request.getSource().toString() );
MDC.put( PROMOTION_TARGET, request.getTargetKey().toString() );
RequestContextHelper.setContext( PROMOTION_ID, request.getPromotionId() );
RequestContextHelper.setContext( PROMOTION_TYPE, GROUP_PROMOTION );
RequestContextHelper.setContext( PROMOTION_SOURCE, request.getSource().toString() );
RequestContextHelper.setContext( PROMOTION_TARGET, request.getTargetKey().toString() );

if ( !storeManager.hasArtifactStore( request.getSource() ) )
{
Expand Down Expand Up @@ -515,10 +515,10 @@ private Future<GroupPromoteResult> submitGroupPromoteRequest( final GroupPromote
public PathsPromoteResult promotePaths( final PathsPromoteRequest request, final String baseUrl )
throws PromotionException, IndyWorkflowException
{
MDC.put( PROMOTION_ID, request.getPromotionId() );
MDC.put( PROMOTION_TYPE, PATH_PROMOTION );
MDC.put( PROMOTION_SOURCE, request.getSource().toString() );
MDC.put( PROMOTION_TARGET, request.getTargetKey().toString() );
RequestContextHelper.setContext( PROMOTION_ID, request.getPromotionId() );
RequestContextHelper.setContext( PROMOTION_TYPE, PATH_PROMOTION );
RequestContextHelper.setContext( PROMOTION_SOURCE, request.getSource().toString() );
RequestContextHelper.setContext( PROMOTION_TARGET, request.getTargetKey().toString() );

Future<PathsPromoteResult> future = submitPathsPromoteRequest( request, baseUrl );
if ( request.isAsync() )
Expand Down Expand Up @@ -858,7 +858,7 @@ private Callable<Set<PathTransferResult>> newPathPromotionsJob( final Collection
PathTransferResult ret = doPathTransfer( transfer, tgt, request );
results.add( ret );
}
MDC.put( PROMOTION_CONTENT_PATH, pathsForMDC.toString() );
RequestContextHelper.setContext( PROMOTION_CONTENT_PATH, pathsForMDC.toString() );
return results;
};
}
Expand Down
9 changes: 5 additions & 4 deletions ...e/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.commonjava.maven.galley.transport.htcli.model.HttpExchangeMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.slf4j.MDC;

import javax.inject.Inject;
Expand Down Expand Up @@ -633,8 +634,8 @@ private <T> void runParallelInBatchAndWait( Collection<Collection<T>> batches, C
logger.trace( "The paralleled exe on batch {}", batch );
batch.forEach( e -> {
String depthStr = MDC.get( ITERATION_DEPTH );
MDC.put( ITERATION_DEPTH, depthStr == null ? "0" : String.valueOf( Integer.parseInt( depthStr ) + 1 ) );
MDC.put( ITERATION_ITEM, String.valueOf( e ) );
RequestContextHelper.setContext( ITERATION_DEPTH, depthStr == null ? "0" : String.valueOf( Integer.parseInt( depthStr ) + 1 ) );
RequestContextHelper.setContext( ITERATION_ITEM, String.valueOf( e ) );
try
{
closure.call( e );
Expand All @@ -661,8 +662,8 @@ private <T> void runParallelAndWait( Collection<T> runCollection, Closure closur
final CountDownLatch latch = new CountDownLatch( todo.size() );
todo.forEach( e -> ruleParallelExecutor.execute( () -> {
String depthStr = MDC.get( ITERATION_DEPTH );
MDC.put( ITERATION_DEPTH, depthStr == null ? "0" : String.valueOf( Integer.parseInt( depthStr ) + 1 ) );
MDC.put( ITERATION_ITEM, String.valueOf( e ) );
RequestContextHelper.setContext( ITERATION_DEPTH, depthStr == null ? "0" : String.valueOf( Integer.parseInt( depthStr ) + 1 ) );
RequestContextHelper.setContext( ITERATION_ITEM, String.valueOf( e ) );

try
{
Expand Down
7 changes: 4 additions & 3 deletions ...promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.commonjava.maven.galley.model.Transfer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.commonjava.indy.metrics.RequestContextHelper;
import org.slf4j.MDC;

import javax.inject.Inject;
Expand Down Expand Up @@ -145,7 +146,7 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu
if ( set != null )
{
result.setRuleSet( set.getName() );
MDC.put( PROMOTION_VALIDATION_RULE_SET, set.getName() );
RequestContextHelper.setContext( PROMOTION_VALIDATION_RULE_SET, set.getName() );

logger.debug( "Running validation rule-set for promotion: {}", set.getName() );

Expand All @@ -163,7 +164,7 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu
for ( String ruleRef : ruleNames )
{
svc.submit( () -> {
MDC.put( PROMOTION_VALIDATION_RULE, ruleRef );
RequestContextHelper.setContext( PROMOTION_VALIDATION_RULE, ruleRef );
Exception err = null;
try
{
Expand All @@ -175,7 +176,7 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu
}
finally
{
MDC.remove( PROMOTION_VALIDATION_RULE );
RequestContextHelper.clearContext( PROMOTION_VALIDATION_RULE );
}

return err;
Expand Down
7 changes: 5 additions & 2 deletions addons/sli/jaxrs/src/main/java/org/commonjava/indy/sli/jaxrs/GoldenSignalsFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.commonjava.maven.galley.spi.io.SpecialPathManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.commonjava.indy.metrics.RequestContextHelper;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
Expand All @@ -53,6 +53,8 @@
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.apache.commons.lang3.StringUtils.join;
import static org.commonjava.indy.IndyContentConstants.NANOS_PER_MILLISECOND;
import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_MILLIS;
import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_NS;
import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN;
import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_NPM;
Expand Down Expand Up @@ -141,7 +143,8 @@ public void doFilter( final ServletRequest servletRequest, final ServletResponse
// latency.
long end = RequestContextHelper.getRequestEndNanos() - RequestContextHelper.getRawIoWriteNanos();

MDC.put( REQUEST_LATENCY_NS, String.valueOf( end - start ) );
RequestContextHelper.setContext( REQUEST_LATENCY_NS, String.valueOf( end - start ) );
RequestContextHelper.setContext( REQUEST_LATENCY_MILLIS, (end-start) / NANOS_PER_MILLISECOND );

Set<String> functions = new HashSet<>( getFunctions( req.getPathInfo(), req.getMethod() ) );
boolean error = resp.getStatus() > 499;
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/java/org/commonjava/indy/metrics/RequestContextHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ public static long getRawIoWriteNanos()
@MDC
public static final String REQUEST_LATENCY_NS = "request-latency-ns";

@Thread
public static final String REQUEST_LATENCY_MILLIS = "request-latency";

@MDC
public static final String REQUEST_PHASE = "request-phase";

Expand Down
9 changes: 7 additions & 2 deletions bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/ContentAccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
import org.commonjava.indy.model.core.PackageTypes;
import org.commonjava.indy.model.core.StoreKey;
import org.commonjava.indy.model.core.StoreType;
import org.commonjava.indy.util.*;
import org.commonjava.indy.util.AcceptInfo;
import org.commonjava.indy.util.ApplicationContent;
import org.commonjava.indy.util.ApplicationHeader;
import org.commonjava.indy.util.ApplicationStatus;
import org.commonjava.indy.util.LocationUtils;
import org.commonjava.indy.util.UriFormatter;
import org.commonjava.maven.galley.event.EventMetadata;
import org.commonjava.maven.galley.io.checksum.ContentDigest;
import org.commonjava.maven.galley.model.SpecialPathInfo;
Expand All @@ -56,13 +61,13 @@
import java.util.function.Consumer;
import java.util.function.Supplier;

import static org.commonjava.indy.core.ctl.ContentController.LISTING_HTML_FILE;
import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_ENTRY_POINT;
import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS;
import static org.commonjava.indy.metrics.RequestContextHelper.METADATA_CONTENT;
import static org.commonjava.indy.metrics.RequestContextHelper.PACKAGE_TYPE;
import static org.commonjava.indy.metrics.RequestContextHelper.PATH;
import static org.commonjava.indy.metrics.RequestContextHelper.setContext;
import static org.commonjava.indy.core.ctl.ContentController.LISTING_HTML_FILE;
import static org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor.NPM_PKG_KEY;

@ApplicationScoped
Expand Down
2 changes: 1 addition & 1 deletion embedder/src/main/resources/META-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<interceptors>
<class>org.commonjava.indy.bind.jaxrs.util.RestInterceptor</class>
<class>org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor</class>
<class>org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombInterceptor</class>
<class>org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombMeasureInterceptor</class>
</interceptors>

<!-- NOTE: In the decorators below, the FIRST listed will be invoked FIRST (outer-most in the stack) -->
Expand Down
Loading