Merge pull request #1307 from jdcasey/indy-1.8.x

Fix SLI reporting for promotion and improve logging for proxy-auth

Author: jdcasey

addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java

@@ -253,12 +253,10 @@ private void doHandleEvent( final ConduitStreamSinkChannel sinkChannel )
                     }
 
                     final UserPass proxyUserPass = parse( ApplicationHeader.proxy_authorization, httpRequest, null );
+                    logger.info( "Using proxy authentication: {}", proxyUserPass );
 
                     mdcManager.putExtraHeaders( httpRequest );
-                    if ( proxyUserPass != null )
-                    {
-                        mdcManager.putExternalID( proxyUserPass.getUser() );
-                    }
+                    mdcManager.putExternalID( proxyUserPass == null ? null : proxyUserPass.getUser() );
 
                     logger.debug( "Proxy UserPass: {}\nConfig secured? {}\nConfig tracking type: {}", proxyUserPass,
                                   config.isSecured(), config.getTrackingType() );

addons/sli/jaxrs/src/main/java/org/commonjava/indy/sli/jaxrs/GoldenSignalsFilterMapper.java

@@ -46,7 +46,7 @@ public DeploymentInfo getDeploymentInfo( final String contextRoot, final Applica
         di.addFilter( filterInfo )
           .addFilterUrlMapping( filterInfo.getName(), "/api/folo/*", DispatcherType.REQUEST )
           .addFilterUrlMapping( filterInfo.getName(), "/api/content/*", DispatcherType.REQUEST )
-          .addFilterUrlMapping( filterInfo.getName(), "/api/promote/*", DispatcherType.REQUEST )
+          .addFilterUrlMapping( filterInfo.getName(), "/api/promotion/*", DispatcherType.REQUEST )
           .addFilterUrlMapping( filterInfo.getName(), "/api/admin/stores/*", DispatcherType.REQUEST )
           .addFilterUrlMapping( filterInfo.getName(), "/api/browse/*", DispatcherType.REQUEST );
 

subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/MDCManager.java

@@ -80,21 +80,20 @@ public void setUp()
 
     public void putExternalID( String externalID )
     {
-        if ( externalID == null )
-        {
-            logger.debug( "No externalId" );
-            return;
-        }
         String internalID = UUID.randomUUID().toString();
         String preferredID = externalID != null ? externalID : internalID;
         putRequestIDs( internalID, externalID, preferredID );
     }
 
     public void putRequestIDs( String internalID, String externalID, String preferredID )
     {
-        MDC.put( INTERNAL_ID, internalID );
-        MDC.put( EXTERNAL_ID, externalID );
         MDC.put( PREFERRED_ID, preferredID );
+        MDC.put( INTERNAL_ID, internalID );
+
+        if ( externalID != null )
+        {
+            MDC.put( EXTERNAL_ID, externalID );
+        }
     }
 
     public void putUserIP( String userIp )