Use bom and pass service and realm to token refresh by jonesbusy · Pull Request #641 · oras-project/oras-java

Expand Up @@ -20,7 +20,6 @@
package land.oras.auth;
import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.io.FileNotFoundException; Expand Down Expand Up @@ -68,11 +67,6 @@ public final class HttpClient { */ private static final Logger LOG = LoggerFactory.getLogger(HttpClient.class);
/** * Metric name for token refresh counter */ public static final String TOKEN_REFRESH_METRIC = "oras.auth.token.refresh";
/** * The pattern for the WWW-Authenticate header value */ Expand Down Expand Up @@ -103,12 +97,6 @@ public final class HttpClient { * The meter registry for metrics */ private MeterRegistry meterRegistry;
/** * Counter for token refreshes */ private Counter tokenRefreshCounter;
/** * Hidden constructor */ Expand Down Expand Up @@ -157,9 +145,6 @@ private void setTlsVerify(boolean skipTlsVerify) { */ public HttpClient build() { this.client = this.builder.build(); this.tokenRefreshCounter = Counter.builder(TOKEN_REFRESH_METRIC) .description("Number of token refreshes performed against the registry") .register(meterRegistry); return this; }
Expand Down Expand Up @@ -463,7 +448,9 @@ public <T> TokenResponse refreshToken( TokenResponse token = JsonUtils.fromJson(responseWrapper.response(), TokenResponse.class) .forService(service); TokenCache.put(newScopes, token); tokenRefreshCounter.increment(); meterRegistry .counter(Const.METRIC_TOKEN_REFRESH, Const.METRIC_TAG_SERVICE, service, Const.METRIC_TAG_REALM, realm) .increment(); return token; }
Expand Down