Skip to content

Commit 76bace3

Browse files
shokakucarriershokakucarrier
authored
Remove o11yphant dependency and all related code from indy (#2544)
* Remove o11yphant dependency and all related code from indy Remove the o11yphant metrics and tracing library entirely from the codebase: - Remove all dependency declarations from pom.xml files (root + 8 modules) - Remove @measure annotations, DefaultMetricsManager, Meter, Timer, MetricRegistry, and related metrics instrumentation code - Remove TraceManager, OtelUtil, and tracing instrumentation code - Gut metrics/trace subsystem classes (IndyMetricsConfig, IndyTraceConfiguration, TraceManagerProducer, IndyTrafficClassifier, IndyGoldenSignalsMetricSet, etc.) - Clean up Infinispan cache handles to remove metrics wrapping - Remove o11yphant interceptors from beans.xml and loggers from logback configs Bump up kojiji and path-mapped-storage to latest SNAPSHOT to avoid transmission dependency of o11yphant * Bump up released libs to latest version * update galley version to released version
1 parent 3c72388 commit 76bace3

84 files changed

Lines changed: 100 additions & 1446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎addons/content-browse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.commonjava.indy.data.IndyDataException;
2424
import org.commonjava.indy.data.StoreDataManager;
2525
import org.commonjava.indy.util.RequestContextHelper;
26-
import org.commonjava.o11yphant.metrics.annotation.Measure;
2726
import org.commonjava.indy.model.core.ArtifactStore;
2827
import org.commonjava.indy.model.core.StoreKey;
2928
import org.commonjava.indy.model.galley.KeyedLocation;
@@ -70,7 +69,6 @@ public ContentBrowseController( final StoreDataManager storeManager, final Conte
7069
this.contentManager = contentManager;
7170
}
7271

73-
@Measure
7472
public ContentBrowseResult browseContent( final StoreKey storeKey, final String path, final String browseBaseUri,
7573
final String contentBaseUri, final UriFormatter uriFormatter,
7674
EventMetadata eventMetadata )

‎addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.commonjava.indy.data.IndyDataException;
2929
import org.commonjava.indy.data.StoreDataManager;
3030
import org.commonjava.indy.koji.conf.IndyKojiConfig;
31-
import org.commonjava.o11yphant.metrics.annotation.Measure;
3231
import org.commonjava.indy.model.core.ArtifactStore;
3332
import org.commonjava.indy.model.core.StoreKey;
3433
import org.commonjava.indy.subsys.infinispan.CacheProducer;
@@ -137,7 +136,6 @@ public boolean isAuthorized( String path, EventMetadata eventMetadata, ProjectRe
137136
return isAuthorized( path, eventMetadata, ref, build, session, new HashMap<>() );
138137
}
139138

140-
@Measure
141139
public boolean isAuthorized( String path, EventMetadata eventMetadata, ProjectRef ref, KojiBuildInfo build,
142140
KojiSessionInfo session, Map<Integer, KojiBuildArchiveCollection> seenBuildArchives )
143141
throws KojiClientException

‎addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.commonjava.maven.galley.model.Transfer;
4444
import org.commonjava.maven.galley.model.TransferOperation;
4545
import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
46-
import org.commonjava.o11yphant.metrics.annotation.Measure;
4746
import org.slf4j.Logger;
4847
import org.slf4j.LoggerFactory;
4948

@@ -129,7 +128,6 @@ public abstract class KojiContentManagerDecorator
129128
private KojiPathPatternFormatter pathFormatter;
130129

131130
@Override
132-
@Measure
133131
public boolean exists( ArtifactStore store, String path )
134132
throws IndyWorkflowException
135133
{
@@ -165,7 +163,6 @@ public Transfer retrieve( final ArtifactStore store, final String path )
165163
}
166164

167165
@Override
168-
@Measure
169166
public Transfer retrieve( final ArtifactStore store, final String path, final EventMetadata eventMetadata )
170167
throws IndyWorkflowException
171168
{
@@ -251,7 +248,6 @@ public Transfer getTransfer( final ArtifactStore store, final String path, final
251248
return result;
252249
}
253250

254-
@Measure
255251
private <T> T findKojiBuildAnd( ArtifactStore store, String path, EventMetadata eventMetadata, T defValue, KojiBuildAction<T> action )
256252
throws IndyWorkflowException
257253
{

‎addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import org.commonjava.maven.galley.model.ConcreteResource;
6060
import org.commonjava.maven.galley.model.Transfer;
6161
import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
62-
import org.commonjava.o11yphant.metrics.annotation.Measure;
6362
import org.infinispan.Cache;
6463
import org.infinispan.client.hotrod.RemoteCache;
6564
import org.infinispan.client.hotrod.annotation.ClientCacheEntryExpired;
@@ -266,7 +265,6 @@ private void clearPaths( final Set<Group> affected, final String path )
266265
}
267266

268267
@Override
269-
@Measure
270268
public Metadata getMetadata( StoreKey targetKey, String path )
271269
{
272270
Logger logger = LoggerFactory.getLogger( getClass() );
@@ -378,7 +376,6 @@ public Metadata getMetadata( StoreKey targetKey, String path )
378376

379377
}
380378

381-
@Measure
382379
private Metadata executeKojiMetadataLookup(ProjectRef ga, String path )
383380
throws KojiClientException, IndyWorkflowException
384381
{

‎addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
import org.commonjava.indy.action.ShutdownAction;
2525
import org.commonjava.indy.action.StartupAction;
2626
import org.commonjava.indy.koji.conf.IndyKojiConfig;
27-
import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig;
2827
import org.commonjava.atlas.maven.ident.ref.ProjectRef;
29-
import org.commonjava.o11yphant.metrics.api.MetricRegistry;
3028
import org.commonjava.util.jhttpc.auth.MemoryPasswordManager;
3129
import org.commonjava.util.jhttpc.auth.PasswordManager;
3230
import org.commonjava.util.jhttpc.auth.PasswordType;
@@ -57,12 +55,6 @@ public class KojijiProvider
5755

5856
private Locker<ProjectRef> versionMetadataLocks;
5957

60-
@Inject
61-
private IndyMetricsConfig indyMetricsConfig;
62-
63-
@Inject
64-
private MetricRegistry metricRegistry;
65-
6658
@Inject
6759
@WeftManaged
6860
@ExecutorConfig( named = "koji-queries", threads = 4 )
@@ -117,14 +109,7 @@ public void start() throws IndyLifecycleException
117109

118110
try
119111
{
120-
if ( indyMetricsConfig.isKojiMetricEnabled() )
121-
{
122-
kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor, metricRegistry );
123-
}
124-
else
125-
{
126-
kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor );
127-
}
112+
kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor );
128113
}
129114
catch ( KojiClientException e )
130115
{

‎addons/koji/common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,13 +336,13 @@ private void initKojiClient( String exchangeName, boolean verifyArtifacts )
336336
new IndyObjectMapper( true ), new GlobalHttpConfiguration().getGlobalProxyConfig()) ).build();
337337

338338
WeftExecutorService rescanService =
339-
new PoolWeftExecutorService( "test-rescan-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
339+
new PoolWeftExecutorService( "test-rescan-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
340340

341341
DownloadManager downloadManager = new DefaultDownloadManager( storeDataManager, galley.getTransferManager(),
342342
new IndyLocationExpander( storeDataManager ), rescanService );
343343

344344
WeftExecutorService contentAccessService =
345-
new PoolWeftExecutorService( "test-content-access-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
345+
new PoolWeftExecutorService( "test-content-access-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
346346

347347
DirectContentAccess directContentAccess = new DefaultDirectContentAccess( downloadManager, contentAccessService );
348348

@@ -357,7 +357,7 @@ private void initKojiClient( String exchangeName, boolean verifyArtifacts )
357357
contentDigester, directContentAccess, cacheManager );
358358

359359
WeftExecutorService kojiMDService =
360-
new PoolWeftExecutorService( "test-koji-metadata-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
360+
new PoolWeftExecutorService( "test-koji-metadata-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
361361

362362
provider = new KojiMavenMetadataProvider( this.cache, kojiClient, buildAuthority, kojiConfig, kojiMDService, cacheManager );
363363
}

‎addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
import org.apache.commons.lang3.StringUtils;
3939
import org.commonjava.atlas.maven.ident.util.SnapshotUtils;
4040
import org.commonjava.atlas.maven.ident.version.part.SnapshotPart;
41-
import org.commonjava.o11yphant.metrics.api.Timer;
42-
import org.commonjava.o11yphant.metrics.DefaultMetricsManager;
4341
import org.commonjava.maven.galley.event.EventMetadata;
4442
import org.commonjava.maven.galley.io.AbstractTransferDecorator;
4543
import org.commonjava.maven.galley.model.Location;
@@ -70,9 +68,6 @@ public class MavenContentsFilteringTransferDecorator
7068
{
7169
private final Logger logger = LoggerFactory.getLogger( this.getClass() );
7270

73-
@Inject
74-
private DefaultMetricsManager metricsManager;
75-
7671
@Override
7772
public OverriddenBooleanValue decorateExists( final Transfer transfer, final EventMetadata metadata )
7873
{
@@ -96,7 +91,7 @@ public OutputStream decorateWrite( final OutputStream stream, final Transfer tra
9691
if ( loc instanceof HttpLocation && ( !allowsSnapshots || !allowsReleases ) && transfer.getFullPath()
9792
.endsWith( "maven-metadata.xml" ) )
9893
{
99-
return new MetadataFilteringOutputStream( stream, allowsSnapshots, allowsReleases, transfer, metricsManager );
94+
return new MetadataFilteringOutputStream( stream, allowsSnapshots, allowsReleases, transfer );
10095
}
10196
else
10297
{
@@ -186,8 +181,6 @@ private boolean isArtifact( final String element, final String artifactId, final
186181
private static class MetadataFilteringOutputStream
187182
extends IdempotentCloseOutputStream
188183
{
189-
private static final String TIMER = "io.maven.metadata.out.filter";
190-
191184
private final Logger logger = LoggerFactory.getLogger( this.getClass() );
192185

193186
private static final String LATEST = "<latest>([^<]+)</latest>";
@@ -206,17 +199,13 @@ private static class MetadataFilteringOutputStream
206199

207200
private Transfer transfer;
208201

209-
private DefaultMetricsManager metricsManager;
210-
211202
private MetadataFilteringOutputStream( final OutputStream stream, final boolean allowsSnapshots,
212-
final boolean allowsReleases, Transfer transfer,
213-
final DefaultMetricsManager metricsManager )
203+
final boolean allowsReleases, Transfer transfer )
214204
{
215205
super( stream );
216206
this.allowsSnapshots = allowsSnapshots;
217207
this.allowsReleases = allowsReleases;
218208
this.transfer = transfer;
219-
this.metricsManager = metricsManager;
220209
}
221210

222211
private String filterMetadata()
@@ -227,7 +216,6 @@ private String filterMetadata()
227216
return "";
228217
}
229218

230-
Timer.Context timer = metricsManager == null ? null : metricsManager.startTimer( TIMER );
231219
try
232220
{
233221
// filter versions from GA metadata
@@ -268,13 +256,6 @@ private String filterMetadata()
268256
transfer.getPath() );
269257
return buffer.toString();
270258
}
271-
finally
272-
{
273-
if ( timer != null )
274-
{
275-
metricsManager.stopTimer( TIMER );
276-
}
277-
}
278259
}
279260

280261
private List<String> fetchVersions()

‎addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.commonjava.maven.galley.model.TransferOperation;
5959
import org.commonjava.maven.galley.model.TypeMapping;
6060
import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
61-
import org.commonjava.o11yphant.metrics.annotation.Measure;
6261
import org.w3c.dom.Document;
6362
import org.w3c.dom.Element;
6463

@@ -100,7 +99,6 @@
10099
import static org.commonjava.maven.galley.io.SpecialPathConstants.HTTP_METADATA_EXT;
101100
import static org.commonjava.maven.galley.util.PathUtils.normalize;
102101
import static org.commonjava.maven.galley.util.PathUtils.parentPath;
103-
import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
104102

105103
public class MavenMetadataGenerator
106104
extends AbstractMergedContentGenerator
@@ -209,7 +207,6 @@ public void clearAllMerged( ArtifactStore store, String...paths )
209207
}
210208

211209
@Override
212-
@Measure
213210
public Transfer generateFileContent( final ArtifactStore store, final String path, final EventMetadata eventMetadata )
214211
throws IndyWorkflowException
215212
{
@@ -377,7 +374,6 @@ public List<StoreResource> generateDirectoryContent( final ArtifactStore store,
377374
* @throws IndyWorkflowException
378375
*/
379376
@Override
380-
@Measure
381377
public Transfer generateGroupFileContent( final Group group, final List<ArtifactStore> members, final String path,
382378
final EventMetadata eventMetadata )
383379
throws IndyWorkflowException
@@ -642,10 +638,6 @@ private void putToMetadataCache( StoreKey key, String toMergePath, MetadataInfo
642638
private Callable<MetadataResult> generateMissing( ArtifactStore store, String toMergePath )
643639
{
644640
return ()->{
645-
addFieldToActiveSpan( "storekey", store.getKey().toString() );
646-
addFieldToActiveSpan( "path", toMergePath );
647-
addFieldToActiveSpan( "activity", "generateMissing" );
648-
649641
try
650642
{
651643
logger.trace( "Starting metadata generation: {}:{}", store.getKey(), toMergePath );
@@ -668,9 +660,6 @@ private Callable<MetadataResult> generateMissing( ArtifactStore store, String to
668660
}
669661
catch ( final Exception e )
670662
{
671-
addFieldToActiveSpan( "error", e.getClass().getSimpleName() );
672-
addFieldToActiveSpan( "error.message", e.getMessage() );
673-
674663
String msg = String.format( "EXCLUDING Failed generated metadata: %s:%s. Reason: %s", store.getKey(),
675664
toMergePath, e.getMessage() );
676665
logger.error( msg, e );
@@ -707,10 +696,6 @@ private void clearObsoleteFiles( Transfer item )
707696
private Callable<MetadataResult> retrieveCached( final ArtifactStore store, final String toMergePath )
708697
{
709698
return ()->{
710-
addFieldToActiveSpan( "storekey", store.getKey().toString() );
711-
addFieldToActiveSpan( "path", toMergePath );
712-
addFieldToActiveSpan( "activity", "retrieveCached" );
713-
714699
Metadata memberMeta;
715700
memberMeta = getMetaFromCache( store.getKey(), toMergePath );
716701

@@ -855,9 +840,6 @@ private Metadata mergeProviderMetadata( final Group group, final Metadata master
855840
private Callable<MetadataResult> downloadMissing( ArtifactStore store, String toMergePath )
856841
{
857842
return () -> {
858-
addFieldToActiveSpan( "storekey", store.getKey().toString() );
859-
addFieldToActiveSpan( "path", toMergePath );
860-
addFieldToActiveSpan( "activity", "downloadMissing" );
861843
try
862844
{
863845
logger.trace( "Starting metadata download: {}:{}", store.getKey(), toMergePath );

‎addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.commonjava.indy.content.DirectContentAccess;
1919
import org.commonjava.indy.content.MergedContentAction;
20-
import org.commonjava.o11yphant.metrics.annotation.Measure;
2120
import org.commonjava.indy.model.core.ArtifactStore;
2221
import org.commonjava.indy.model.core.Group;
2322
import org.slf4j.Logger;
@@ -50,7 +49,6 @@ public class MetadataMergeListener
5049
* if that path of file changed in the member of #originatingStore
5150
*/
5251
@Override
53-
@Measure
5452
public void clearMergedPath( ArtifactStore originatingStore, Set<Group> affectedGroups, String path )
5553
{
5654
logger.debug( "Clear merged path {}, origin: {}, affected: {}", path, originatingStore, affectedGroups );

‎addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@
1818
import com.fasterxml.jackson.databind.ObjectMapper;
1919
import org.apache.commons.io.IOUtils;
2020
import org.commonjava.indy.test.fixture.core.HttpTestFixture;
21-
import org.commonjava.maven.galley.config.TransportMetricConfig;
2221
import org.commonjava.maven.galley.event.EventMetadata;
2322
import org.commonjava.maven.galley.model.ConcreteResource;
24-
import org.commonjava.maven.galley.model.Location;
2523
import org.commonjava.maven.galley.model.Transfer;
2624
import org.commonjava.maven.galley.model.TransferOperation;
2725
import org.commonjava.maven.galley.proxy.NoOpProxySitesCache;
2826
import org.commonjava.maven.galley.transport.htcli.internal.HttpDownload;
2927
import org.commonjava.maven.galley.transport.htcli.model.SimpleHttpLocation;
30-
import org.commonjava.o11yphant.metrics.DefaultMetricRegistry;
3128
import org.hamcrest.CoreMatchers;
3229
import org.junit.Rule;
3330
import org.junit.Test;
@@ -39,7 +36,6 @@
3936
import java.util.HashMap;
4037
import java.util.List;
4138

42-
import static org.commonjava.o11yphant.metrics.util.MetricUtils.newDefaultMetricRegistry;
4339
import static org.hamcrest.CoreMatchers.equalTo;
4440
import static org.hamcrest.CoreMatchers.notNullValue;
4541
import static org.hamcrest.MatcherAssert.assertThat;
@@ -49,33 +45,6 @@ public class MavenContentFilteringTransferDecoratorTest
4945
@Rule
5046
public HttpTestFixture fixture = new HttpTestFixture( "test", new MavenContentsFilteringTransferDecorator() );
5147

52-
private static DefaultMetricRegistry metricRegistry = newDefaultMetricRegistry();
53-
54-
private static TransportMetricConfig metricConfig = new TransportMetricConfig()
55-
{
56-
@Override
57-
public boolean isEnabled()
58-
{
59-
return true;
60-
}
61-
62-
@Override
63-
public String getNodePrefix()
64-
{
65-
return null;
66-
}
67-
68-
@Override
69-
public String getMetricUniqueName( Location location )
70-
{
71-
if ( location.getName().equals( "test" ) )
72-
{
73-
return location.getName();
74-
}
75-
return null;
76-
}
77-
};
78-
7948
@Test
8049
public void metadataFilteringWhenSnapshotsNotAllowed() throws Exception
8150
{

0 commit comments

Comments
 (0)