Commonjava · shokakucarrier · Mar 27, 2026
diff --git a/...owse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java b/...owse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java
@@ -23,7 +23,6 @@
 import org.commonjava.indy.data.IndyDataException;
 import org.commonjava.indy.data.StoreDataManager;
 import org.commonjava.indy.util.RequestContextHelper;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.commonjava.indy.model.core.ArtifactStore;
 import org.commonjava.indy.model.core.StoreKey;
 import org.commonjava.indy.model.galley.KeyedLocation;
@@ -70,7 +69,6 @@ public ContentBrowseController( final StoreDataManager storeManager, final Conte
         this.contentManager = contentManager;
     }
 
-    @Measure
     public ContentBrowseResult browseContent( final StoreKey storeKey, final String path, final String browseBaseUri,
                                               final String contentBaseUri, final UriFormatter uriFormatter,
                                               EventMetadata eventMetadata )

diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java
@@ -28,7 +28,6 @@
 import org.commonjava.indy.data.IndyDataException;
 import org.commonjava.indy.data.StoreDataManager;
 import org.commonjava.indy.koji.conf.IndyKojiConfig;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.commonjava.indy.model.core.ArtifactStore;
 import org.commonjava.indy.model.core.StoreKey;
 import org.commonjava.indy.subsys.infinispan.CacheProducer;
@@ -137,7 +136,6 @@ public boolean isAuthorized( String path, EventMetadata eventMetadata, ProjectRe
         return isAuthorized( path, eventMetadata, ref, build, session, new HashMap<>() );
     }
 
-    @Measure
     public boolean isAuthorized( String path, EventMetadata eventMetadata, ProjectRef ref, KojiBuildInfo build,
                                  KojiSessionInfo session, Map<Integer, KojiBuildArchiveCollection> seenBuildArchives )
             throws KojiClientException

diff --git a/...ji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java b/...ji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java
@@ -43,7 +43,6 @@
 import org.commonjava.maven.galley.model.Transfer;
 import org.commonjava.maven.galley.model.TransferOperation;
 import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -129,7 +128,6 @@ public abstract class KojiContentManagerDecorator
     private KojiPathPatternFormatter pathFormatter;
 
     @Override
-    @Measure
     public boolean exists( ArtifactStore store, String path )
             throws IndyWorkflowException
     {
@@ -165,7 +163,6 @@ public Transfer retrieve( final ArtifactStore store, final String path )
     }
 
     @Override
-    @Measure
     public Transfer retrieve( final ArtifactStore store, final String path, final EventMetadata eventMetadata )
             throws IndyWorkflowException
     {
@@ -251,7 +248,6 @@ public Transfer getTransfer( final ArtifactStore store, final String path, final
         return result;
     }
 
-    @Measure
     private <T> T findKojiBuildAnd( ArtifactStore store, String path, EventMetadata eventMetadata, T defValue, KojiBuildAction<T> action )
             throws IndyWorkflowException
     {

diff --git a/...koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java b/...koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java
@@ -59,7 +59,6 @@
 import org.commonjava.maven.galley.model.ConcreteResource;
 import org.commonjava.maven.galley.model.Transfer;
 import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.infinispan.Cache;
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.annotation.ClientCacheEntryExpired;
@@ -266,7 +265,6 @@ private void clearPaths( final Set<Group> affected, final String path )
     }
 
     @Override
-    @Measure
     public Metadata getMetadata( StoreKey targetKey, String path )
     {
         Logger logger = LoggerFactory.getLogger( getClass() );
@@ -378,7 +376,6 @@ public Metadata getMetadata( StoreKey targetKey, String path )
 
     }
 
-    @Measure
     private Metadata executeKojiMetadataLookup(ProjectRef ga, String path )
             throws KojiClientException, IndyWorkflowException
     {

diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java
@@ -24,9 +24,7 @@
 import org.commonjava.indy.action.ShutdownAction;
 import org.commonjava.indy.action.StartupAction;
 import org.commonjava.indy.koji.conf.IndyKojiConfig;
-import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig;
 import org.commonjava.atlas.maven.ident.ref.ProjectRef;
-import org.commonjava.o11yphant.metrics.api.MetricRegistry;
 import org.commonjava.util.jhttpc.auth.MemoryPasswordManager;
 import org.commonjava.util.jhttpc.auth.PasswordManager;
 import org.commonjava.util.jhttpc.auth.PasswordType;
@@ -57,12 +55,6 @@ public class KojijiProvider
 
     private Locker<ProjectRef> versionMetadataLocks;
 
-    @Inject
-    private IndyMetricsConfig indyMetricsConfig;
-
-    @Inject
-    private MetricRegistry metricRegistry;
-
     @Inject
     @WeftManaged
     @ExecutorConfig( named = "koji-queries", threads = 4 )
@@ -117,14 +109,7 @@ public void start() throws IndyLifecycleException
 
         try
         {
-            if ( indyMetricsConfig.isKojiMetricEnabled() )
-            {
-                kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor, metricRegistry );
-            }
-            else
-            {
-                kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor );
-            }
+            kojiClient = new KojiClient( config, kojiPasswordManager, kojiExecutor );
         }
         catch ( KojiClientException e )
         {

diff --git a/.../common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java b/.../common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java
@@ -336,13 +336,13 @@ private void initKojiClient( String exchangeName, boolean verifyArtifacts )
                                          new IndyObjectMapper( true ), new GlobalHttpConfiguration().getGlobalProxyConfig()) ).build();
 
         WeftExecutorService rescanService =
-                        new PoolWeftExecutorService( "test-rescan-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
+                        new PoolWeftExecutorService( "test-rescan-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
 
         DownloadManager downloadManager = new DefaultDownloadManager( storeDataManager, galley.getTransferManager(),
                                                                       new IndyLocationExpander( storeDataManager ), rescanService );
 
         WeftExecutorService contentAccessService =
-                        new PoolWeftExecutorService( "test-content-access-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
+                        new PoolWeftExecutorService( "test-content-access-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
 
         DirectContentAccess directContentAccess = new DefaultDirectContentAccess( downloadManager, contentAccessService );
 
@@ -357,7 +357,7 @@ private void initKojiClient( String exchangeName, boolean verifyArtifacts )
                                         contentDigester, directContentAccess, cacheManager );
 
         WeftExecutorService kojiMDService =
-                        new PoolWeftExecutorService( "test-koji-metadata-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
+                        new PoolWeftExecutorService( "test-koji-metadata-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false);
 
         provider = new KojiMavenMetadataProvider( this.cache, kojiClient, buildAuthority, kojiConfig, kojiMDService, cacheManager );
     }

diff --git a/...n/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java b/...n/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java
@@ -38,8 +38,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.commonjava.atlas.maven.ident.util.SnapshotUtils;
 import org.commonjava.atlas.maven.ident.version.part.SnapshotPart;
-import org.commonjava.o11yphant.metrics.api.Timer;
-import org.commonjava.o11yphant.metrics.DefaultMetricsManager;
 import org.commonjava.maven.galley.event.EventMetadata;
 import org.commonjava.maven.galley.io.AbstractTransferDecorator;
 import org.commonjava.maven.galley.model.Location;
@@ -70,9 +68,6 @@ public class MavenContentsFilteringTransferDecorator
 {
     private final Logger logger = LoggerFactory.getLogger( this.getClass() );
 
-    @Inject
-    private DefaultMetricsManager metricsManager;
-
     @Override
     public OverriddenBooleanValue decorateExists( final Transfer transfer, final EventMetadata metadata )
     {
@@ -96,7 +91,7 @@ public OutputStream decorateWrite( final OutputStream stream, final Transfer tra
         if ( loc instanceof HttpLocation && ( !allowsSnapshots || !allowsReleases ) && transfer.getFullPath()
                                                                                                .endsWith( "maven-metadata.xml" ) )
         {
-            return new MetadataFilteringOutputStream( stream, allowsSnapshots, allowsReleases, transfer, metricsManager );
+            return new MetadataFilteringOutputStream( stream, allowsSnapshots, allowsReleases, transfer );
         }
         else
         {
@@ -186,8 +181,6 @@ private boolean isArtifact( final String element, final String artifactId, final
     private static class MetadataFilteringOutputStream
             extends IdempotentCloseOutputStream
     {
-        private static final String TIMER = "io.maven.metadata.out.filter";
-
         private final Logger logger = LoggerFactory.getLogger( this.getClass() );
 
         private static final String LATEST = "<latest>([^<]+)</latest>";
@@ -206,17 +199,13 @@ private static class MetadataFilteringOutputStream
 
         private Transfer transfer;
 
-        private DefaultMetricsManager metricsManager;
-
         private MetadataFilteringOutputStream( final OutputStream stream, final boolean allowsSnapshots,
-                                               final boolean allowsReleases, Transfer transfer,
-                                               final DefaultMetricsManager metricsManager )
+                                               final boolean allowsReleases, Transfer transfer )
         {
             super( stream );
             this.allowsSnapshots = allowsSnapshots;
             this.allowsReleases = allowsReleases;
             this.transfer = transfer;
-            this.metricsManager = metricsManager;
         }
 
         private String filterMetadata()
@@ -227,7 +216,6 @@ private String filterMetadata()
                 return "";
             }
 
-            Timer.Context timer = metricsManager == null ? null : metricsManager.startTimer( TIMER );
             try
             {
                 // filter versions from GA metadata
@@ -268,13 +256,6 @@ private String filterMetadata()
                               transfer.getPath() );
                 return buffer.toString();
             }
-            finally
-            {
-                if ( timer != null )
-                {
-                    metricsManager.stopTimer( TIMER );
-                }
-            }
         }
 
         private List<String> fetchVersions()

diff --git a/...en/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java b/...en/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java
@@ -58,7 +58,6 @@
 import org.commonjava.maven.galley.model.TransferOperation;
 import org.commonjava.maven.galley.model.TypeMapping;
 import org.commonjava.maven.galley.spi.nfc.NotFoundCache;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -100,7 +99,6 @@
 import static org.commonjava.maven.galley.io.SpecialPathConstants.HTTP_METADATA_EXT;
 import static org.commonjava.maven.galley.util.PathUtils.normalize;
 import static org.commonjava.maven.galley.util.PathUtils.parentPath;
-import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
 
 public class MavenMetadataGenerator
     extends AbstractMergedContentGenerator
@@ -209,7 +207,6 @@ public void clearAllMerged( ArtifactStore store, String...paths )
     }
 
     @Override
-    @Measure
     public Transfer generateFileContent( final ArtifactStore store, final String path, final EventMetadata eventMetadata )
         throws IndyWorkflowException
     {
@@ -377,7 +374,6 @@ public List<StoreResource> generateDirectoryContent( final ArtifactStore store,
      * @throws IndyWorkflowException
      */
     @Override
-    @Measure
     public Transfer generateGroupFileContent( final Group group, final List<ArtifactStore> members, final String path,
                                               final EventMetadata eventMetadata )
             throws IndyWorkflowException
@@ -642,10 +638,6 @@ private void putToMetadataCache( StoreKey key, String toMergePath, MetadataInfo
     private Callable<MetadataResult> generateMissing( ArtifactStore store, String toMergePath )
     {
         return ()->{
-            addFieldToActiveSpan( "storekey", store.getKey().toString() );
-            addFieldToActiveSpan( "path", toMergePath );
-            addFieldToActiveSpan( "activity", "generateMissing" );
-
             try
             {
                 logger.trace( "Starting metadata generation: {}:{}", store.getKey(), toMergePath );
@@ -668,9 +660,6 @@ private Callable<MetadataResult> generateMissing( ArtifactStore store, String to
             }
             catch ( final Exception e )
             {
-                addFieldToActiveSpan( "error", e.getClass().getSimpleName() );
-                addFieldToActiveSpan( "error.message", e.getMessage() );
-
                 String msg = String.format( "EXCLUDING Failed generated metadata: %s:%s. Reason: %s", store.getKey(),
                                             toMergePath, e.getMessage() );
                 logger.error( msg, e );
@@ -707,10 +696,6 @@ private void clearObsoleteFiles( Transfer item )
     private Callable<MetadataResult> retrieveCached( final ArtifactStore store, final String toMergePath )
     {
         return ()->{
-            addFieldToActiveSpan( "storekey", store.getKey().toString() );
-            addFieldToActiveSpan( "path", toMergePath );
-            addFieldToActiveSpan( "activity", "retrieveCached" );
-
             Metadata memberMeta;
             memberMeta = getMetaFromCache( store.getKey(), toMergePath );
 
@@ -855,9 +840,6 @@ private Metadata mergeProviderMetadata( final Group group, final Metadata master
     private Callable<MetadataResult> downloadMissing( ArtifactStore store, String toMergePath )
     {
         return () -> {
-            addFieldToActiveSpan( "storekey", store.getKey().toString() );
-            addFieldToActiveSpan( "path", toMergePath );
-            addFieldToActiveSpan( "activity", "downloadMissing" );
             try
             {
                 logger.trace( "Starting metadata download: {}:{}", store.getKey(), toMergePath );

diff --git a/...ven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java b/...ven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java
@@ -17,7 +17,6 @@
 
 import org.commonjava.indy.content.DirectContentAccess;
 import org.commonjava.indy.content.MergedContentAction;
-import org.commonjava.o11yphant.metrics.annotation.Measure;
 import org.commonjava.indy.model.core.ArtifactStore;
 import org.commonjava.indy.model.core.Group;
 import org.slf4j.Logger;
@@ -50,7 +49,6 @@ public class MetadataMergeListener
      * if that path of file changed in the member of #originatingStore
      */
     @Override
-    @Measure
     public void clearMergedPath( ArtifactStore originatingStore, Set<Group> affectedGroups, String path )
     {
         logger.debug( "Clear merged path {}, origin: {}, affected: {}", path, originatingStore, affectedGroups );

diff --git a/...ava/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java b/...ava/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java
@@ -18,16 +18,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.commonjava.indy.test.fixture.core.HttpTestFixture;
-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;
 import org.commonjava.maven.galley.model.Transfer;
 import org.commonjava.maven.galley.model.TransferOperation;
 import org.commonjava.maven.galley.proxy.NoOpProxySitesCache;
 import org.commonjava.maven.galley.transport.htcli.internal.HttpDownload;
 import org.commonjava.maven.galley.transport.htcli.model.SimpleHttpLocation;
-import org.commonjava.o11yphant.metrics.DefaultMetricRegistry;
 import org.hamcrest.CoreMatchers;
 import org.junit.Rule;
 import org.junit.Test;
@@ -39,7 +36,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-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.MatcherAssert.assertThat;
@@ -49,33 +45,6 @@ public class MavenContentFilteringTransferDecoratorTest
     @Rule
     public HttpTestFixture fixture = new HttpTestFixture( "test", new MavenContentsFilteringTransferDecorator() );
 
-    private static DefaultMetricRegistry metricRegistry = newDefaultMetricRegistry();
-
-    private static 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;
-        }
-    };
-
     @Test
     public void metadataFilteringWhenSnapshotsNotAllowed() throws Exception
     {