Skip to content

Commit 7e70e3a

Browse files
ligangtyligangty
authored
Merge pull request #474 from shokakucarrier/master
Remove o11yphant from dependency list
2 parents 0f0055e + 55ae120 commit 7e70e3a

13 files changed

Lines changed: 9 additions & 403 deletions

File tree

‎cdi-embedder/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,5 @@
8585
<artifactId>http-testserver</artifactId>
8686
</dependency>
8787

88-
<dependency>
89-
<groupId>org.commonjava.util</groupId>
90-
<artifactId>o11yphant-metrics-core</artifactId>
91-
<scope>test</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.commonjava.util</groupId>
95-
<artifactId>o11yphant-trace-core</artifactId>
96-
<scope>test</scope>
97-
</dependency>
98-
<dependency>
99-
<groupId>org.commonjava.util</groupId>
100-
<artifactId>o11yphant-trace-otel</artifactId>
101-
<scope>test</scope>
102-
</dependency>
103-
10488
</dependencies>
10589
</project>

‎cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java‎

Lines changed: 0 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,6 @@
3131
import org.commonjava.maven.galley.transport.SimpleUrlLocationResolver;
3232
import org.commonjava.maven.galley.transport.htcli.conf.GlobalHttpConfiguration;
3333
import org.commonjava.maven.galley.transport.htcli.conf.GlobalProxyConfig;
34-
import org.commonjava.o11yphant.metrics.AbstractTrafficClassifier;
35-
import org.commonjava.o11yphant.metrics.TrafficClassifier;
36-
import org.commonjava.o11yphant.metrics.conf.DefaultMetricsConfig;
37-
import org.commonjava.o11yphant.metrics.conf.MetricsConfig;
38-
import org.commonjava.o11yphant.metrics.sli.GoldenSignalsMetricSet;
39-
import org.commonjava.o11yphant.metrics.system.StoragePathProvider;
40-
import org.commonjava.o11yphant.otel.OtelConfiguration;
41-
import org.commonjava.o11yphant.otel.OtelTracePlugin;
42-
import org.commonjava.o11yphant.trace.SpanFieldsDecorator;
43-
import org.commonjava.o11yphant.trace.TraceManager;
44-
import org.commonjava.o11yphant.trace.TracerConfiguration;
4534
import org.commonjava.util.partyline.Partyline;
4635
import org.junit.Assert;
4736
import org.junit.rules.TemporaryFolder;
@@ -54,10 +43,7 @@
5443
import javax.inject.Inject;
5544
import java.io.IOException;
5645
import java.util.ArrayList;
57-
import java.util.Collections;
5846
import java.util.List;
59-
import java.util.Map;
60-
import java.util.Set;
6147
import java.util.concurrent.Executors;
6248

6349
/**
@@ -232,137 +218,4 @@ public GlobalProxyConfig getGlobalProxyConfig()
232218
return globalProxyConfig;
233219
}
234220

235-
@Produces
236-
@Default
237-
public MetricsConfig getMetricsConfig()
238-
{
239-
return new DefaultMetricsConfig();
240-
}
241-
242-
@Produces
243-
@Default
244-
public StoragePathProvider getStoragePathProvider()
245-
{
246-
return () -> null;
247-
}
248-
249-
@Produces
250-
@Default
251-
public TraceManager getTraceManager()
252-
{
253-
OtelConfiguration otelConf = new OtelConfiguration()
254-
{
255-
};
256-
257-
TracerConfiguration traceConf = new TracerConfiguration()
258-
{
259-
@Override
260-
public boolean isEnabled()
261-
{
262-
return false;
263-
}
264-
265-
@Override
266-
public boolean isConsoleTransport()
267-
{
268-
return false;
269-
}
270-
271-
@Override
272-
public String getServiceName()
273-
{
274-
return "galley";
275-
}
276-
277-
@Override
278-
public String getNodeId()
279-
{
280-
return "node";
281-
}
282-
};
283-
284-
return new TraceManager( new OtelTracePlugin( traceConf, otelConf ), new SpanFieldsDecorator( new ArrayList<>() ), getTracerConfiguration() );
285-
}
286-
287-
@Produces
288-
@Default
289-
public TracerConfiguration getTracerConfiguration()
290-
{
291-
return new TracerConfiguration()
292-
{
293-
@Override
294-
public Map<String, Integer> getSpanRates()
295-
{
296-
return null;
297-
}
298-
299-
@Override
300-
public boolean isEnabled()
301-
{
302-
return false;
303-
}
304-
305-
@Override
306-
public boolean isConsoleTransport()
307-
{
308-
return false;
309-
}
310-
311-
@Override
312-
public String getServiceName()
313-
{
314-
return null;
315-
}
316-
317-
@Override
318-
public Integer getBaseSampleRate()
319-
{
320-
return null;
321-
}
322-
323-
@Override
324-
public Set<String> getFieldSet()
325-
{
326-
return null;
327-
}
328-
329-
@Override
330-
public String getEnvironmentMappings()
331-
{
332-
return null;
333-
}
334-
335-
@Override
336-
public String getCPNames()
337-
{
338-
return null;
339-
}
340-
341-
@Override
342-
public String getNodeId()
343-
{
344-
return null;
345-
}
346-
};
347-
}
348-
349-
@Produces
350-
@Default
351-
public TrafficClassifier getTrafficClassifier()
352-
{
353-
return new AbstractTrafficClassifier()
354-
{
355-
@Override
356-
protected List<String> calculateCachedFunctionClassifiers( String restPath, String method, Map<String, String> headers )
357-
{
358-
return Collections.emptyList();
359-
}
360-
};
361-
}
362-
363-
@Produces
364-
public GoldenSignalsMetricSet getGoldenSignalsMetricSet()
365-
{
366-
return null;
367-
}
368221
}

‎core/src/test/java/org/commonjava/maven/galley/internal/xfer/DownloadHandlerConcurrencyTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void before()
9393
new TransferDecoratorManager( new NoOpTransferDecorator() ), false );
9494

9595
transport = new HttpClientTransport( new HttpImpl( new MemoryPasswordManager() ), new ObjectMapper(),
96-
new GlobalHttpConfiguration().getGlobalProxyConfig(), null, null );
96+
new GlobalHttpConfiguration().getGlobalProxyConfig() );
9797
}
9898

9999
@BMRules( rules = { @BMRule( name = "init rendezvous", targetClass = "DownloadHandler", targetMethod = "<init>",

‎pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -264,38 +264,6 @@
264264
<scope>test</scope>
265265
</dependency>
266266

267-
<!-- metrics support-->
268-
<dependency>
269-
<groupId>org.commonjava.util</groupId>
270-
<artifactId>o11yphant-metrics-api</artifactId>
271-
<version>${o11yphantVersion}</version>
272-
</dependency>
273-
<dependency>
274-
<groupId>org.commonjava.util</groupId>
275-
<artifactId>o11yphant-metrics-core</artifactId>
276-
<version>${o11yphantVersion}</version>
277-
</dependency>
278-
<dependency>
279-
<groupId>org.commonjava.util</groupId>
280-
<artifactId>o11yphant-trace-core</artifactId>
281-
<version>${o11yphantVersion}</version>
282-
</dependency>
283-
<dependency>
284-
<groupId>org.commonjava.util</groupId>
285-
<artifactId>o11yphant-trace-otel</artifactId>
286-
<version>${o11yphantVersion}</version>
287-
</dependency>
288-
<dependency>
289-
<groupId>org.commonjava.util</groupId>
290-
<artifactId>o11yphant-trace-api</artifactId>
291-
<version>${o11yphantVersion}</version>
292-
</dependency>
293-
<dependency>
294-
<groupId>org.commonjava.util</groupId>
295-
<artifactId>o11yphant-trace-helper-jhttpc</artifactId>
296-
<version>${o11yphantVersion}</version>
297-
</dependency>
298-
299267
<!-- JPA support -->
300268
<dependency>
301269
<groupId>javax.persistence</groupId>

‎transports/httpclient/pom.xml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,6 @@
8888
<groupId>org.jboss.byteman</groupId>
8989
<artifactId>byteman-bmunit</artifactId>
9090
</dependency>
91-
<dependency>
92-
<groupId>org.commonjava.util</groupId>
93-
<artifactId>o11yphant-trace-core</artifactId>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.commonjava.util</groupId>
97-
<artifactId>o11yphant-trace-api</artifactId>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.commonjava.util</groupId>
101-
<artifactId>o11yphant-trace-helper-jhttpc</artifactId>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.commonjava.util</groupId>
105-
<artifactId>o11yphant-metrics-api</artifactId>
106-
</dependency>
107-
<dependency>
108-
<groupId>org.commonjava.util</groupId>
109-
<artifactId>o11yphant-metrics-core</artifactId>
110-
<scope>test</scope>
111-
</dependency>
11291
<dependency>
11392
<groupId>org.commonjava.maven.galley</groupId>
11493
<artifactId>galley-cache-tck</artifactId>

‎transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.ObjectMapper;
1919
import org.commonjava.maven.galley.TransferException;
2020
import org.commonjava.maven.galley.TransferLocationException;
21-
import org.commonjava.maven.galley.config.TransportMetricConfig;
2221
import org.commonjava.maven.galley.event.EventMetadata;
2322
import org.commonjava.maven.galley.model.ConcreteResource;
2423
import org.commonjava.maven.galley.model.Location;
@@ -37,7 +36,6 @@
3736
import org.commonjava.maven.galley.transport.htcli.internal.HttpPublish;
3837
import org.commonjava.maven.galley.transport.htcli.internal.model.WrapperHttpLocation;
3938
import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
40-
import org.commonjava.o11yphant.metrics.api.MetricRegistry;
4139
import org.slf4j.Logger;
4240
import org.slf4j.LoggerFactory;
4341

@@ -73,11 +71,6 @@ public class HttpClientTransport
7371
@Inject
7472
private ObjectMapper mapper;
7573

76-
@Inject
77-
private MetricRegistry metricRegistry;
78-
79-
@Inject
80-
private TransportMetricConfig metricConfig;
8174

8275
@Inject
8376
private ProxySitesCache proxySitesCache;
@@ -88,17 +81,14 @@ protected HttpClientTransport()
8881

8982
public HttpClientTransport( final Http http )
9083
{
91-
this( http, new ObjectMapper(), null, null, null );
84+
this( http, new ObjectMapper(), null);
9285
}
9386

94-
public HttpClientTransport( final Http http, final ObjectMapper mapper, final GlobalProxyConfig globalProxyConfig,
95-
final MetricRegistry metricRegistry, final TransportMetricConfig metricConfig )
87+
public HttpClientTransport( final Http http, final ObjectMapper mapper, final GlobalProxyConfig globalProxyConfig )
9688
{
9789
this.http = http;
9890
this.mapper = mapper;
9991
this.globalProxyConfig = globalProxyConfig;
100-
this.metricRegistry = metricRegistry;
101-
this.metricConfig = metricConfig;
10292
}
10393

10494
@PreDestroy
@@ -121,7 +111,7 @@ public DownloadJob createDownloadJob( final ConcreteResource resource, final Tra
121111
throws TransferException
122112
{
123113
return new HttpDownload( getUrl( resource ), getHttpLocation( resource.getLocation(), download ), target,
124-
transferSizes, eventMetadata, http, mapper, metricRegistry, metricConfig,
114+
transferSizes, eventMetadata, http, mapper,
125115
globalProxyConfig == null ? null : globalProxyConfig.getEgressSites(), proxySitesCache );
126116
}
127117

‎transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpImpl.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
3434
import org.commonjava.maven.galley.transport.htcli.util.HttpUtil;
3535
import org.commonjava.maven.galley.util.LocationUtils;
36-
import org.commonjava.o11yphant.jhttpc.SpanningHttpFactory;
37-
import org.commonjava.o11yphant.trace.TraceManager;
38-
import org.commonjava.o11yphant.trace.spi.adapter.TracerType;
3936
import org.commonjava.util.jhttpc.HttpFactory;
4037
import org.commonjava.util.jhttpc.HttpFactoryIfc;
4138
import org.commonjava.util.jhttpc.JHttpCException;
@@ -47,7 +44,6 @@
4744

4845
import javax.enterprise.context.ApplicationScoped;
4946
import java.io.Closeable;
50-
import java.util.Optional;
5147

5248
@ApplicationScoped
5349
public class HttpImpl
@@ -61,15 +57,6 @@ public class HttpImpl
6157

6258
private final LocationLookup locationLookup;
6359

64-
@SuppressWarnings( "OptionalUsedAsFieldOrParameterType" )
65-
public <T extends TracerType> HttpImpl( final PasswordManager passwords, Optional<TraceManager> traceManager )
66-
{
67-
this.passwords = passwords;
68-
this.locationLookup = new LocationLookup();
69-
this.httpFactory = new SpanningHttpFactory(
70-
new HttpFactory( new HttpFactoryPasswordDelegate( passwords, locationLookup ) ), traceManager );
71-
}
72-
7360
public HttpImpl( final PasswordManager passwords )
7461
{
7562
this.passwords = passwords;

0 commit comments

Comments
 (0)