Skip to content

Remove o11yphant from dependency list #474

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

Draft
shokakucarrier wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove o11yphant from dependency list #474

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
16 changes: 0 additions & 16 deletions cdi-embedder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,5 @@
<artifactId>http-testserver</artifactId>
</dependency>

<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-otel</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
</project>
147 changes: 0 additions & 147 deletions cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -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<String, Integer> 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<String> 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<String> calculateCachedFunctionClassifiers( String restPath, String method, Map<String, String> headers )
{
return Collections.emptyList();
}
};
}

@Produces
public GoldenSignalsMetricSet getGoldenSignalsMetricSet()
{
return null;
}
}
2 changes: 1 addition & 1 deletion ...c/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<init>",
Expand Down
32 changes: 0 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,38 +264,6 @@
<scope>test</scope>
</dependency>

<!-- metrics support-->
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-api</artifactId>
<version>${o11yphantVersion}</version>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-core</artifactId>
<version>${o11yphantVersion}</version>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-core</artifactId>
<version>${o11yphantVersion}</version>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-otel</artifactId>
<version>${o11yphantVersion}</version>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-api</artifactId>
<version>${o11yphantVersion}</version>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-helper-jhttpc</artifactId>
<version>${o11yphantVersion}</version>
</dependency>

<!-- JPA support -->
<dependency>
<groupId>javax.persistence</groupId>
Expand Down
21 changes: 0 additions & 21 deletions transports/httpclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,27 +88,6 @@
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-bmunit</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-core</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-api</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-helper-jhttpc</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-api</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.commonjava.maven.galley</groupId>
<artifactId>galley-cache-tck</artifactId>
Expand Down
16 changes: 3 additions & 13 deletions ...client/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -73,11 +71,6 @@ public class HttpClientTransport
@Inject
private ObjectMapper mapper;

@Inject
private MetricRegistry metricRegistry;

@Inject
private TransportMetricConfig metricConfig;

@Inject
private ProxySitesCache proxySitesCache;
Expand All @@ -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
Expand All @@ -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 );
}

Expand Down
13 changes: 0 additions & 13 deletions ...sports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -47,7 +44,6 @@

import javax.enterprise.context.ApplicationScoped;
import java.io.Closeable;
import java.util.Optional;

@ApplicationScoped
public class HttpImpl
Expand All @@ -61,15 +57,6 @@ public class HttpImpl

private final LocationLookup locationLookup;

@SuppressWarnings( "OptionalUsedAsFieldOrParameterType" )
public <T extends TracerType> HttpImpl( final PasswordManager passwords, Optional<TraceManager> 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;
Expand Down
Loading