From b5232c18cc89d3c587b2aeffc4335ead574889d4 Mon Sep 17 00:00:00 2001
From: Lianghui Yu <liyu@redhat.com>
Date: Fri, 27 Mar 2026 12:15:40 +0800
Subject: [PATCH] remove o11yphant from kojiji

remove o11yphant as it is not used anymore and will cause downstream
repo to contain o11yphant as transmission dependency
---
 pom.xml                                       | 11 ------
 .../com/redhat/red/build/koji/KojiClient.java | 16 ++-------
 .../http/httpclient4/HC4SyncObjectClient.java | 34 ++-----------------
 3 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index f22e172..a91e713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
         <atlasVersion>1.1.8</atlasVersion>
         <mockitoVersion>2.22.0</mockitoVersion>
         <kerbyVersion>2.1.0</kerbyVersion>
-        <o11yphantVersion>1.9.2</o11yphantVersion>
 
         <dbImage>postgres:9.4</dbImage>
         <hubImage>docker.io/buildchimp/koji-dojo-hub:dev</hubImage>
@@ -114,12 +113,6 @@
                 <version>${kerbyVersion}</version>
             </dependency>
 
-            <!-- metrics support-->
-            <dependency>
-                <groupId>org.commonjava.util</groupId>
-                <artifactId>o11yphant-metrics-api</artifactId>
-                <version>${o11yphantVersion}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -226,10 +219,6 @@
             <artifactId>kerb-client</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.commonjava.util</groupId>
-            <artifactId>o11yphant-metrics-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/redhat/red/build/koji/KojiClient.java b/src/main/java/com/redhat/red/build/koji/KojiClient.java
index 64fcec3..4b3f16f 100644
--- a/src/main/java/com/redhat/red/build/koji/KojiClient.java
+++ b/src/main/java/com/redhat/red/build/koji/KojiClient.java
@@ -33,7 +33,6 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.commonjava.atlas.maven.ident.ref.ProjectRef;
 import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
-import org.commonjava.o11yphant.metrics.api.MetricRegistry;
 import org.commonjava.rwx.api.RWXMapper;
 import org.commonjava.rwx.core.Registry;
 import org.commonjava.rwx.error.XmlRpcException;
@@ -100,8 +99,6 @@ public class KojiClient
 
     private ExecutorService executorService;
 
-    private MetricRegistry metricRegistry;
-
     private KojiObjectMapper objectMapper;
 
     private KojiConfig config;
@@ -164,22 +161,15 @@ private UrlBuilder sessionUrlBuilder( KojiSessionInfo session, Supplier<Map<Stri
         };
     }
 
-    public KojiClient( KojiConfig config, PasswordManager passwordManager, ExecutorService executorService,
-                       MetricRegistry metricRegistry ) throws KojiClientException
+    public KojiClient( KojiConfig config, PasswordManager passwordManager, ExecutorService executorService )
+                    throws KojiClientException
     {
         this.config = config;
         this.httpFactory = new HttpFactory( passwordManager );
         this.executorService = executorService;
-        this.metricRegistry = metricRegistry;
         setup();
     }
 
-    public KojiClient( KojiConfig config, PasswordManager passwordManager, ExecutorService executorService )
-                    throws KojiClientException
-    {
-        this( config, passwordManager, executorService, null );
-    }
-
     @Override
     public synchronized void close()
     {
@@ -203,7 +193,7 @@ public void setup()
         logger.debug( "SETUP: Starting KojiClient for: {}", config.getKojiURL() );
         try
         {
-            xmlrpcClient = new HC4SyncObjectClient( httpFactory, config.getKojiSiteConfig(), metricRegistry );
+            xmlrpcClient = new HC4SyncObjectClient( httpFactory, config.getKojiSiteConfig() );
         }
         catch ( IOException e )
         {
diff --git a/src/main/java/com/redhat/red/build/koji/http/httpclient4/HC4SyncObjectClient.java b/src/main/java/com/redhat/red/build/koji/http/httpclient4/HC4SyncObjectClient.java
index b689b13..d33e082 100644
--- a/src/main/java/com/redhat/red/build/koji/http/httpclient4/HC4SyncObjectClient.java
+++ b/src/main/java/com/redhat/red/build/koji/http/httpclient4/HC4SyncObjectClient.java
@@ -19,8 +19,6 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.commonjava.o11yphant.metrics.api.MetricRegistry;
-import org.commonjava.o11yphant.metrics.api.Timer;
 import org.commonjava.rwx.anno.Request;
 import org.commonjava.rwx.api.RWXMapper;
 import org.commonjava.rwx.error.XmlRpcException;
@@ -40,54 +38,26 @@
 import java.net.MalformedURLException;
 import java.util.Arrays;
 
-import static org.commonjava.o11yphant.metrics.util.NameUtils.name;
-
 public class HC4SyncObjectClient
 {
     private final HttpFactory httpFactory;
 
     private final SiteConfig siteConfig;
 
-    private final MetricRegistry metricRegistry;
-
     private final String[] extraPath;
 
     public HC4SyncObjectClient( final HttpFactory httpFactory, final SiteConfig siteConfig,
-                                final MetricRegistry metricRegistry, String... extraPath )
+                                String... extraPath )
     {
         this.httpFactory = httpFactory;
         this.siteConfig = siteConfig;
-        this.metricRegistry = metricRegistry;
         this.extraPath = extraPath;
     }
 
     public <T> T call( final Object request, final Class<T> responseType, final UrlBuilder urlBuilder,
                        final RequestModifier requestModifier ) throws XmlRpcException
     {
-        if ( metricRegistry == null )
-        {
-            return RetryUtils.withRetry( () -> doCall( request, responseType, urlBuilder, requestModifier ) );
-        }
-
-        // Apply global and per request metric
-
-        try ( final Timer.Context timerContext = metricRegistry.timer( name( getClass(), "call" ) ).time();
-             final Timer.Context requestTimerContext = metricRegistry.timer( name( request.getClass(), "call" ) ).time() )
-        {
-            try
-            {
-                return RetryUtils.withRetry( () -> doCall( request, responseType, urlBuilder, requestModifier ) );
-            }
-            finally
-            {
-                timerContext.stop();
-                requestTimerContext.stop();
-            }
-        }
-        catch ( Exception e )
-        {
-            throw new XmlRpcException( e.getMessage(), e );
-        }
+        return RetryUtils.withRetry( () -> doCall( request, responseType, urlBuilder, requestModifier ) );
     }
 
     private <T> T doCall( final Object request, final Class<T> responseType, final UrlBuilder urlBuilder,