diff --git a/cdi-embedder/pom.xml b/cdi-embedder/pom.xml index ad410b618..4acd8fe26 100644 --- a/cdi-embedder/pom.xml +++ b/cdi-embedder/pom.xml @@ -85,21 +85,5 @@ http-testserver - - org.commonjava.util - o11yphant-metrics-core - test - - - org.commonjava.util - o11yphant-trace-core - test - - - org.commonjava.util - o11yphant-trace-otel - test - - diff --git a/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java b/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java index c8ce82705..e910b43e1 100644 --- a/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java +++ b/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java @@ -31,17 +31,6 @@ import org.commonjava.maven.galley.transport.SimpleUrlLocationResolver; import org.commonjava.maven.galley.transport.htcli.conf.GlobalHttpConfiguration; import org.commonjava.maven.galley.transport.htcli.conf.GlobalProxyConfig; -import org.commonjava.o11yphant.metrics.AbstractTrafficClassifier; -import org.commonjava.o11yphant.metrics.TrafficClassifier; -import org.commonjava.o11yphant.metrics.conf.DefaultMetricsConfig; -import org.commonjava.o11yphant.metrics.conf.MetricsConfig; -import org.commonjava.o11yphant.metrics.sli.GoldenSignalsMetricSet; -import org.commonjava.o11yphant.metrics.system.StoragePathProvider; -import org.commonjava.o11yphant.otel.OtelConfiguration; -import org.commonjava.o11yphant.otel.OtelTracePlugin; -import org.commonjava.o11yphant.trace.SpanFieldsDecorator; -import org.commonjava.o11yphant.trace.TraceManager; -import org.commonjava.o11yphant.trace.TracerConfiguration; import org.commonjava.util.partyline.Partyline; import org.junit.Assert; import org.junit.rules.TemporaryFolder; @@ -54,10 +43,7 @@ import javax.inject.Inject; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.concurrent.Executors; /** @@ -232,137 +218,4 @@ public GlobalProxyConfig getGlobalProxyConfig() return globalProxyConfig; } - @Produces - @Default - public MetricsConfig getMetricsConfig() - { - return new DefaultMetricsConfig(); - } - - @Produces - @Default - public StoragePathProvider getStoragePathProvider() - { - return () -> null; - } - - @Produces - @Default - public TraceManager getTraceManager() - { - OtelConfiguration otelConf = new OtelConfiguration() - { - }; - - TracerConfiguration traceConf = new TracerConfiguration() - { - @Override - public boolean isEnabled() - { - return false; - } - - @Override - public boolean isConsoleTransport() - { - return false; - } - - @Override - public String getServiceName() - { - return "galley"; - } - - @Override - public String getNodeId() - { - return "node"; - } - }; - - return new TraceManager( new OtelTracePlugin( traceConf, otelConf ), new SpanFieldsDecorator( new ArrayList<>() ), getTracerConfiguration() ); - } - - @Produces - @Default - public TracerConfiguration getTracerConfiguration() - { - return new TracerConfiguration() - { - @Override - public Map getSpanRates() - { - return null; - } - - @Override - public boolean isEnabled() - { - return false; - } - - @Override - public boolean isConsoleTransport() - { - return false; - } - - @Override - public String getServiceName() - { - return null; - } - - @Override - public Integer getBaseSampleRate() - { - return null; - } - - @Override - public Set getFieldSet() - { - return null; - } - - @Override - public String getEnvironmentMappings() - { - return null; - } - - @Override - public String getCPNames() - { - return null; - } - - @Override - public String getNodeId() - { - return null; - } - }; - } - - @Produces - @Default - public TrafficClassifier getTrafficClassifier() - { - return new AbstractTrafficClassifier() - { - @Override - protected List calculateCachedFunctionClassifiers( String restPath, String method, Map headers ) - { - return Collections.emptyList(); - } - }; - } - - @Produces - public GoldenSignalsMetricSet getGoldenSignalsMetricSet() - { - return null; - } } diff --git a/core/src/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java b/core/src/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java index ef73f4d9e..000830457 100644 --- a/core/src/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java +++ b/core/src/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java @@ -93,7 +93,7 @@ public void before() new TransferDecoratorManager( new NoOpTransferDecorator() ), false ); transport = new HttpClientTransport( new HttpImpl( new MemoryPasswordManager() ), new ObjectMapper(), - new GlobalHttpConfiguration().getGlobalProxyConfig(), null, null ); + new GlobalHttpConfiguration().getGlobalProxyConfig() ); } @BMRules( rules = { @BMRule( name = "init rendezvous", targetClass = "DownloadHandler", targetMethod = "", diff --git a/pom.xml b/pom.xml index 20e58a24d..1bb884c59 100644 --- a/pom.xml +++ b/pom.xml @@ -264,38 +264,6 @@ test - - - org.commonjava.util - o11yphant-metrics-api - ${o11yphantVersion} - - - org.commonjava.util - o11yphant-metrics-core - ${o11yphantVersion} - - - org.commonjava.util - o11yphant-trace-core - ${o11yphantVersion} - - - org.commonjava.util - o11yphant-trace-otel - ${o11yphantVersion} - - - org.commonjava.util - o11yphant-trace-api - ${o11yphantVersion} - - - org.commonjava.util - o11yphant-trace-helper-jhttpc - ${o11yphantVersion} - - javax.persistence diff --git a/transports/httpclient/pom.xml b/transports/httpclient/pom.xml index 2058b8ce2..7e0101fd9 100644 --- a/transports/httpclient/pom.xml +++ b/transports/httpclient/pom.xml @@ -88,27 +88,6 @@ org.jboss.byteman byteman-bmunit - - org.commonjava.util - o11yphant-trace-core - - - org.commonjava.util - o11yphant-trace-api - - - org.commonjava.util - o11yphant-trace-helper-jhttpc - - - org.commonjava.util - o11yphant-metrics-api - - - org.commonjava.util - o11yphant-metrics-core - test - org.commonjava.maven.galley galley-cache-tck diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java index 1cf7bf152..96749f113 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.commonjava.maven.galley.TransferException; import org.commonjava.maven.galley.TransferLocationException; -import org.commonjava.maven.galley.config.TransportMetricConfig; import org.commonjava.maven.galley.event.EventMetadata; import org.commonjava.maven.galley.model.ConcreteResource; import org.commonjava.maven.galley.model.Location; @@ -37,7 +36,6 @@ import org.commonjava.maven.galley.transport.htcli.internal.HttpPublish; import org.commonjava.maven.galley.transport.htcli.internal.model.WrapperHttpLocation; import org.commonjava.maven.galley.transport.htcli.model.HttpLocation; -import org.commonjava.o11yphant.metrics.api.MetricRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,11 +71,6 @@ public class HttpClientTransport @Inject private ObjectMapper mapper; - @Inject - private MetricRegistry metricRegistry; - - @Inject - private TransportMetricConfig metricConfig; @Inject private ProxySitesCache proxySitesCache; @@ -88,17 +81,14 @@ protected HttpClientTransport() public HttpClientTransport( final Http http ) { - this( http, new ObjectMapper(), null, null, null ); + this( http, new ObjectMapper(), null); } - public HttpClientTransport( final Http http, final ObjectMapper mapper, final GlobalProxyConfig globalProxyConfig, - final MetricRegistry metricRegistry, final TransportMetricConfig metricConfig ) + public HttpClientTransport( final Http http, final ObjectMapper mapper, final GlobalProxyConfig globalProxyConfig ) { this.http = http; this.mapper = mapper; this.globalProxyConfig = globalProxyConfig; - this.metricRegistry = metricRegistry; - this.metricConfig = metricConfig; } @PreDestroy @@ -121,7 +111,7 @@ public DownloadJob createDownloadJob( final ConcreteResource resource, final Tra throws TransferException { return new HttpDownload( getUrl( resource ), getHttpLocation( resource.getLocation(), download ), target, - transferSizes, eventMetadata, http, mapper, metricRegistry, metricConfig, + transferSizes, eventMetadata, http, mapper, globalProxyConfig == null ? null : globalProxyConfig.getEgressSites(), proxySitesCache ); } diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java index 2afc2bedc..afd69f0f1 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java @@ -33,9 +33,6 @@ import org.commonjava.maven.galley.transport.htcli.model.HttpLocation; import org.commonjava.maven.galley.transport.htcli.util.HttpUtil; import org.commonjava.maven.galley.util.LocationUtils; -import org.commonjava.o11yphant.jhttpc.SpanningHttpFactory; -import org.commonjava.o11yphant.trace.TraceManager; -import org.commonjava.o11yphant.trace.spi.adapter.TracerType; import org.commonjava.util.jhttpc.HttpFactory; import org.commonjava.util.jhttpc.HttpFactoryIfc; import org.commonjava.util.jhttpc.JHttpCException; @@ -47,7 +44,6 @@ import javax.enterprise.context.ApplicationScoped; import java.io.Closeable; -import java.util.Optional; @ApplicationScoped public class HttpImpl @@ -61,15 +57,6 @@ public class HttpImpl private final LocationLookup locationLookup; - @SuppressWarnings( "OptionalUsedAsFieldOrParameterType" ) - public HttpImpl( final PasswordManager passwords, Optional traceManager ) - { - this.passwords = passwords; - this.locationLookup = new LocationLookup(); - this.httpFactory = new SpanningHttpFactory( - new HttpFactory( new HttpFactoryPasswordDelegate( passwords, locationLookup ) ), traceManager ); - } - public HttpImpl( final PasswordManager passwords ) { this.passwords = passwords; diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java index a78dc8738..dcf6e8a40 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java @@ -50,8 +50,6 @@ import java.util.Collections; import java.util.List; -import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan; - public abstract class AbstractHttpJob { protected final Logger logger = LoggerFactory.getLogger( getClass() ); @@ -172,8 +170,6 @@ else if ( !doProxy ) // never do with proxy, retry with proxy } else // already did proxy, still timeout { - addFieldToActiveSpan( "target-error-reason", "timeout" ); - addFieldToActiveSpan( "target-error", e.getClass().getSimpleName() ); throw new TransferTimeoutException( location, url, "Retried with proxy, repository remote request timeout failed for: {}. Reason: {}", e, url, e.getMessage() ); @@ -181,22 +177,16 @@ else if ( !doProxy ) // never do with proxy, retry with proxy } catch ( final IOException e ) { - addFieldToActiveSpan( "target-error-reason", "I/O" ); - addFieldToActiveSpan( "target-error", e.getClass().getSimpleName() ); throw new TransferLocationException( location, "Repository remote request IO failed for: {}. Reason: {}", e, url, e.getMessage() ); } catch ( TransferLocationException e ) { - addFieldToActiveSpan( "target-error-reason", "no transport" ); - addFieldToActiveSpan( "target-error", e.getClass().getSimpleName() ); throw e; } catch ( final GalleyException e ) { - addFieldToActiveSpan( "target-error-reason", "unknown" ); - addFieldToActiveSpan( "target-error", e.getClass().getSimpleName() ); throw new TransferException( "Repository remote request Galley failed for: {}. Reason: {}", e, url, e.getMessage() ); } @@ -291,8 +281,6 @@ public String toString() } catch ( final JsonProcessingException e ) { - addFieldToActiveSpan( "httpmeta-error-reason", "JSON error" ); - addFieldToActiveSpan( "httpmeta-error", e.getClass().getSimpleName() ); logger.warn( String.format("Failed to write HTTP exchange metadata: %s. Reason: %s", finalMeta, e.getMessage()), e ); } @@ -304,8 +292,6 @@ public String toString() } catch ( final IOException e ) { - addFieldToActiveSpan( "httpmeta-error-reason", "I/O" ); - addFieldToActiveSpan( "httpmeta-error", e.getClass().getSimpleName() ); if ( logger.isTraceEnabled() ) { logger.trace( String.format( "Failed to write metadata for HTTP exchange to: %s. Reason: %s", metaTxfr, diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java index d2758c21b..e4f053c5a 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java @@ -21,7 +21,6 @@ import org.apache.http.util.EntityUtils; import org.commonjava.maven.galley.TransferContentException; import org.commonjava.maven.galley.TransferException; -import org.commonjava.maven.galley.config.TransportMetricConfig; import org.commonjava.maven.galley.event.EventMetadata; import org.commonjava.maven.galley.model.ConcreteResource; import org.commonjava.maven.galley.model.Transfer; @@ -31,9 +30,6 @@ import org.commonjava.maven.galley.transport.htcli.Http; import org.commonjava.maven.galley.transport.htcli.model.HttpLocation; import org.commonjava.maven.galley.transport.htcli.util.HttpUtil; -import org.commonjava.o11yphant.metrics.api.MetricRegistry; -import org.commonjava.o11yphant.metrics.api.Timer; -import org.commonjava.o11yphant.trace.util.InterceptorUtils; import java.io.IOException; import java.io.InputStream; @@ -43,8 +39,6 @@ import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.io.IOUtils.copy; -import static org.commonjava.o11yphant.metrics.util.NameUtils.name; -import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan; public final class HttpDownload extends AbstractHttpJob @@ -61,40 +55,24 @@ public final class HttpDownload private final boolean deleteFilesOnPath; - private final MetricRegistry metricRegistry; - - private final TransportMetricConfig transportMetricConfig; - public HttpDownload( final String url, final HttpLocation location, final Transfer target, final Map transferSizes, final EventMetadata eventMetadata, final Http http, final ObjectMapper mapper ) { - this( url, location, target, transferSizes, eventMetadata, http, mapper, true, null, null, null, null ); + this( url, location, target, transferSizes, eventMetadata, http, mapper, true, null, null ); } public HttpDownload( final String url, final HttpLocation location, final Transfer target, final Map transferSizes, final EventMetadata eventMetadata, final Http http, - final ObjectMapper mapper, final MetricRegistry metricRegistry, - final TransportMetricConfig transportMetricConfig ) - { - this( url, location, target, transferSizes, eventMetadata, http, mapper, true, metricRegistry, - transportMetricConfig, null, null ); - } - - public HttpDownload( final String url, final HttpLocation location, final Transfer target, - final Map transferSizes, final EventMetadata eventMetadata, final Http http, - final ObjectMapper mapper, final MetricRegistry metricRegistry, - final TransportMetricConfig transportMetricConfig, final List egressSites, + final ObjectMapper mapper, final List egressSites, ProxySitesCache proxySitesCache ) { - this( url, location, target, transferSizes, eventMetadata, http, mapper, true, metricRegistry, - transportMetricConfig, egressSites, proxySitesCache ); + this( url, location, target, transferSizes, eventMetadata, http, mapper, true, egressSites, proxySitesCache ); } public HttpDownload( final String url, final HttpLocation location, final Transfer target, final Map transferSizes, final EventMetadata eventMetadata, final Http http, final ObjectMapper mapper, final boolean deleteFilesOnPath, - final MetricRegistry metricRegistry, final TransportMetricConfig transportMetricConfig, final List egressSites, ProxySitesCache proxySitesCache ) { @@ -105,68 +83,12 @@ public HttpDownload( final String url, final HttpLocation location, final Transf this.eventMetadata = eventMetadata; this.mapper = mapper; this.deleteFilesOnPath = deleteFilesOnPath; - this.metricRegistry = metricRegistry; - this.transportMetricConfig = transportMetricConfig; } - @SuppressWarnings( "resource" ) @Override public DownloadJob call() { - if ( transportMetricConfig == null || !transportMetricConfig.isEnabled() || metricRegistry == null ) - { - return doCall(); - } - - logger.trace( "Download metric enabled, location: {}", location ); - - addFieldToActiveSpan( "http-target", request.getURI().toASCIIString() ); - addFieldToActiveSpan( "activity", "httpclient-download" ); - - String cls = getClass().getSimpleName(); - - Timer repoTimer = null; - String metricName = transportMetricConfig.getMetricUniqueName( location ); - if ( metricName != null ) - { - repoTimer = metricRegistry.timer( name( transportMetricConfig.getNodePrefix(), cls, "call", metricName ) ); - logger.trace( "Measure repo metric, metricName: {}", metricName ); - } - - final Timer globalTimer = metricRegistry.timer( name( transportMetricConfig.getNodePrefix(), cls, "call" ) ); - final Timer.Context globalTimerContext = globalTimer.time(); - Timer.Context repoTimerContext = null; - if ( repoTimer != null ) - { - repoTimerContext = repoTimer.time(); - } - - try - { - return new InterceptorUtils().withStandardMetricWrapper( this::doCall, - () -> name( transportMetricConfig.getNodePrefix(), - mangledName() ), this::appendix ); - } - finally - { - globalTimerContext.stop(); - if ( repoTimerContext != null ) - { - repoTimerContext.stop(); - } - } - } - - // Generate a mangled name for metric/honeycomb. e.g., https://maven.apache.org to https.maven_apache_org - private String mangledName() - { - return name( this.request.getProtocolVersion().getProtocol(), - this.request.getURI().getHost().replaceAll( "\\.", "_" ) ); - } - - private String appendix() - { - return response != null ? String.valueOf( response.getStatusLine().getStatusCode() ) : null; + return doCall(); } private DownloadJob doCall() diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java index 7456a5e7d..c2612befb 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java @@ -26,8 +26,6 @@ import java.util.List; -import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan; - public final class HttpExistence extends AbstractHttpJob implements ExistenceJob @@ -58,9 +56,6 @@ public Boolean call() request = new HttpHead( url ); - addFieldToActiveSpan( "http-target", url ); - addFieldToActiveSpan( "activity", "httpclient-existence" ); - try { String newName = oldName + ": EXISTS " + url; diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java index e08c3f959..ce6b07e23 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java @@ -41,7 +41,6 @@ import java.util.Set; import static org.apache.commons.io.IOUtils.closeQuietly; -import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan; public class HttpListing extends AbstractHttpJob @@ -76,9 +75,6 @@ public ListingResult call() { request = new HttpGet( url ); - addFieldToActiveSpan( "http-target", url ); - addFieldToActiveSpan( "activity", "httpclient-listing" ); - // return null if something goes wrong, after setting the error. // What we should be doing here is trying to retrieve the html directory // listing, then parse out the filenames from that... diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java index da282978d..27cb2cfdc 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java @@ -26,9 +26,6 @@ import org.commonjava.maven.galley.util.ContentTypeUtils; import java.io.InputStream; -import java.util.ArrayList; - -import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan; public final class HttpPublish extends AbstractHttpJob @@ -58,9 +55,6 @@ public HttpPublish call() // logger.info( "Trying: {}", url ); final HttpPut put = new HttpPut( url ); - addFieldToActiveSpan( "http-target", url ); - addFieldToActiveSpan( "activity", "httpclient-publish" ); - put.setEntity( new InputStreamEntity( stream, length, ContentType.create( contentType ) ) ); request = put; diff --git a/transports/httpclient/src/test/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownloadTest.java b/transports/httpclient/src/test/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownloadTest.java index 1d9a08317..0dfbe3055 100644 --- a/transports/httpclient/src/test/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownloadTest.java +++ b/transports/httpclient/src/test/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownloadTest.java @@ -15,14 +15,12 @@ */ package org.commonjava.maven.galley.transport.htcli.internal; -import static org.commonjava.o11yphant.metrics.util.MetricUtils.newDefaultMetricRegistry; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import org.commonjava.maven.galley.TransferException; -import org.commonjava.maven.galley.config.TransportMetricConfig; import org.commonjava.maven.galley.event.EventMetadata; import org.commonjava.maven.galley.model.ConcreteResource; import org.commonjava.maven.galley.model.Location; @@ -31,7 +29,6 @@ import org.commonjava.maven.galley.transport.htcli.model.HttpExchangeMetadata; import org.commonjava.maven.galley.transport.htcli.model.SimpleHttpLocation; import org.commonjava.maven.galley.transport.htcli.testutil.HttpTestFixture; -import org.commonjava.o11yphant.metrics.DefaultMetricRegistry; import org.commonjava.test.http.expect.ExpectationHandler; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitConfig; @@ -53,33 +50,6 @@ @BMUnitConfig( debug = true ) public class HttpDownloadTest { - private static final DefaultMetricRegistry metricRegistry = newDefaultMetricRegistry(); - - private static final TransportMetricConfig metricConfig = new TransportMetricConfig() - { - @Override - public boolean isEnabled() - { - return true; - } - - @Override - public String getNodePrefix() - { - return null; - } - - @Override - public String getMetricUniqueName( Location location ) - { - if ( location.getName().equals( "test" ) ) - { - return location.getName(); - } - return null; - } - }; - @Rule public final HttpTestFixture fixture = new HttpTestFixture( "download-basic" ); @@ -274,7 +244,7 @@ public void simpleRetrieveOfAvailableUrl() assertThat( transfer.exists(), equalTo( false ) ); final HttpDownload dl = - new HttpDownload( url, location, transfer, transferSizes, new EventMetadata(), fixture.getHttp(), new ObjectMapper(), metricRegistry, metricConfig ); + new HttpDownload( url, location, transfer, transferSizes, new EventMetadata(), fixture.getHttp(), new ObjectMapper() ); final DownloadJob resultJob = dl.call(); final TransferException error = dl.getError(); @@ -412,22 +382,4 @@ public void simpleRetrieveOfUrlWithError() assertThat( fixture.getAccessesFor( path ), equalTo( 1 ) ); } - @Test - public void simpleRetrieveOfAvailableUrl_MetricTest() throws Exception - { - metricRegistry.startConsoleReporter( 1 ); - simpleRetrieveOfAvailableUrl(); - waitSeconds( 3 ); // wait for a while to see the metric - } - - private void waitSeconds( int seconds ) - { - try - { - Thread.sleep( seconds * 1000L ); - } - catch ( InterruptedException ignored ) - { - } - } }