Add more logs for proxy trace

Commonjava · Aug 19, 2024 · fbb815c · fbb815c
1 parent 1c2b5c0
commit fbb815c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 18 deletions.
diff --git a/...sports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java b/...sports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java
@@ -27,6 +27,7 @@
 import org.commonjava.maven.galley.TransferLocationException;
 import org.commonjava.maven.galley.auth.PasswordEntry;
 import org.commonjava.maven.galley.spi.auth.PasswordManager;
+import org.commonjava.maven.galley.transport.htcli.internal.model.WrapperHttpLocation;
 import org.commonjava.maven.galley.transport.htcli.internal.util.HttpFactoryPasswordDelegate;
 import org.commonjava.maven.galley.transport.htcli.internal.util.LocationLookup;
 import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
@@ -41,6 +42,8 @@
 import org.commonjava.util.jhttpc.model.SiteConfig;
 import org.commonjava.util.jhttpc.model.SiteConfigBuilder;
 import org.commonjava.util.jhttpc.model.SiteTrustType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.enterprise.context.ApplicationScoped;
 import java.io.Closeable;
@@ -50,6 +53,8 @@
 public class HttpImpl
         implements Http, Closeable
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
+
     private final PasswordManager passwords;
 
     private final HttpFactoryIfc httpFactory;
@@ -87,6 +92,13 @@ public CloseableHttpClient createClient( final HttpLocation location )
         {
             if ( location != null )
             {
+                logger.debug( "The location class: {}", location.getClass().getSimpleName() );
+                if ( location instanceof WrapperHttpLocation )
+                {
+                    WrapperHttpLocation wrapper = (WrapperHttpLocation) location;
+                    logger.debug( "WrapperHttpLocation:{}, isProxyAllowHttpJobType:{}", wrapper,
+                                  wrapper.isProxyAllowHttpJobType() );
+                }
                 locationLookup.register( location );
 
                 int maxConnections = LocationUtils.getMaxConnections( location );

diff --git a/...t/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java b/...t/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java
@@ -15,13 +15,8 @@
  */
 package org.commonjava.maven.galley.transport.htcli.internal;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.SocketTimeoutException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.apache.http.NoHttpResponseException;
@@ -38,16 +33,19 @@
 import org.commonjava.maven.galley.model.Transfer;
 import org.commonjava.maven.galley.model.TransferOperation;
 import org.commonjava.maven.galley.transport.htcli.Http;
-import org.commonjava.maven.galley.transport.htcli.internal.model.WrapperHttpLocation;
 import org.commonjava.maven.galley.transport.htcli.internal.util.TransferResponseUtils;
 import org.commonjava.maven.galley.transport.htcli.model.HttpExchangeMetadata;
 import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
 import org.commonjava.maven.galley.transport.htcli.util.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketTimeoutException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
 
@@ -105,8 +103,6 @@ protected boolean executeHttp()
     {
         try
         {
-            logger.debug( "The location class: {}, is wrapper: {}", location.getClass().getName(),
-                          location instanceof WrapperHttpLocation );
             client = http.createClient( location );
             response = client.execute( request, http.createContext( location ) );
 

diff --git a/.../java/org/commonjava/maven/galley/transport/htcli/internal/model/WrapperHttpLocation.java b/.../java/org/commonjava/maven/galley/transport/htcli/internal/model/WrapperHttpLocation.java
@@ -20,6 +20,8 @@
 import org.commonjava.maven.galley.transport.htcli.conf.HttpJobType;
 import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
 import org.commonjava.maven.galley.transport.htcli.model.LocationTrustType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -28,6 +30,7 @@
 public class WrapperHttpLocation
         implements HttpLocation
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final Location delegate;
 
@@ -117,21 +120,21 @@ public String getUser()
     public String getProxyHost()
     {
         GlobalProxyConfig proxy = getGlobalProxyConfig();
-        return isProxyAllowHttpJobType( proxy ) ? proxy.getHost() : null;
+        return isProxyAllowHttpJobType() ? proxy.getHost() : null;
     }
 
     @Override
     public String getProxyUser()
     {
         GlobalProxyConfig proxy = getGlobalProxyConfig();
-        return isProxyAllowHttpJobType( proxy ) ? proxy.getUser() : null;
+        return isProxyAllowHttpJobType() ? proxy.getUser() : null;
     }
 
     @Override
     public int getProxyPort()
     {
         GlobalProxyConfig proxy = getGlobalProxyConfig();
-        return isProxyAllowHttpJobType( proxy ) ? proxy.getPort() : 8080;
+        return isProxyAllowHttpJobType() ? proxy.getPort() : 8080;
     }
 
     @Override
@@ -213,13 +216,27 @@ public String getName()
         return delegate.getName();
     }
 
-    private GlobalProxyConfig getGlobalProxyConfig()
+    public GlobalProxyConfig getGlobalProxyConfig()
     {
         return globalProxyConfig;
     }
 
-    private boolean isProxyAllowHttpJobType( GlobalProxyConfig proxy )
+    public boolean isProxyAllowHttpJobType()
     {
-        return proxy != null && proxy.getAllowHttpJobTypes().contains( httpJobType.name() );
+        if ( globalProxyConfig == null )
+        {
+            logger.debug( "GlobalProxyConfig is null" );
+            return false;
+        }
+        logger.debug( "GlobalProxyConfig: {}", globalProxyConfig );
+        return globalProxyConfig.getAllowHttpJobTypes() != null && globalProxyConfig.getAllowHttpJobTypes()
+                                                                                    .contains( httpJobType.name() );
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format( "WrapperHttpLocation [location=%s, proxyHost=%s, proxyPort=%s]", getName(),
+                              getProxyHost(), getProxyPort() );
     }
 }