Support skipping tests requiring metric registrar

Author: jorbaum

README.md

@@ -299,6 +299,7 @@ Name | Description
 `TEST_SKIPSSLVALIDATION` | _(Optional)_ Whether to skip SSL validation when connecting to the Cloud Foundry instance.  Defaults to `false`.
 `UAA_API_REQUEST_LIMIT` | _(Optional)_ If your UAA server does rate limiting and returns 429 errors, set this variable to the smallest limit configured there. Whether your server limits UAA calls is shown in the log, together with the location of the configuration file on the server. Defaults to `0` (no limit).
 `SKIP_BROWSER_AUTH_TESTS` | _(Optional)_ Set to `true` to skip integration tests that require browser-based authentication (e.g., SSO tests). Useful when the Cloud Foundry instance does not support browser-based authentication or when running tests in a non-interactive environment. Defaults to `false`.
+`SKIP_METRIC_REGISTRAR_TESTS` | _(Optional)_ Set to `true` to skip integration tests that require the Metric Registrar service (e.g., MetricRegistrarTest). Useful when the Cloud Foundry instance does not have the Metric Registrar service available. Defaults to `false`.
 `SKIP_TCP_ROUTING_TESTS` | _(Optional)_ Set to `true` to skip TCP routing integration tests (TcpRoutesTest, RouterGroupsTest). Useful when the Cloud Foundry instance does not have TCP routing configured (i.e., no `routing_endpoint` in the info payload). Defaults to `false`.
 `SKIP_V2_TESTS` | _(Optional)_ Set to `true` to skip all V2 API integration tests. Useful when the Cloud Foundry V2 API is rate-limited or unavailable. When enabled, tests annotated with `@RequiresV2Api` will be skipped, including V3 tests that depend on V2 API calls (e.g., service broker creation). Defaults to `false`.
 

integration-test/src/test/java/org/cloudfoundry/RequiresMetricRegistrar.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to mark tests that require the Metric Registrar service to be available.
+ * Tests annotated with this will be skipped if the environment variable
+ * {@code SKIP_METRIC_REGISTRAR_TESTS} is set to "true".
+ *
+ * <p>Usage:
+ * <pre>
+ * &#64;RequiresMetricRegistrar
+ * public class MetricTest extends AbstractIntegrationTest {
+ *     // ...
+ * }
+ * </pre>
+ *
+ * <p>To skip metric registrar tests, set the environment variable:
+ * <pre>
+ * export SKIP_METRIC_REGISTRAR_TESTS=true
+ * </pre>
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(RequiresMetricRegistrar.RegistrarCondition.class)
+public @interface RequiresMetricRegistrar {
+
+    /**
+     * JUnit 5 ExecutionCondition that checks if Metric Registrar tests should be skipped.
+     */
+    class RegistrarCondition implements ExecutionCondition {
+
+        private static final String SKIP_REGISTRAR_ENV = "SKIP_METRIC_REGISTRAR_TESTS";
+
+        @Override
+        public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+            if ("true".equalsIgnoreCase(System.getenv(SKIP_REGISTRAR_ENV))) {
+                return ConditionEvaluationResult.disabled(
+                        "Tests requiring Metric Registrar Service are disabled via "
+                                + SKIP_REGISTRAR_ENV
+                                + " environment variable.");
+            }
+
+            return ConditionEvaluationResult.enabled("Metric Registrar tests are enabled");
+        }
+    }
+}

integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java

@@ -29,6 +29,7 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresMetricRegistrar;
 import org.cloudfoundry.RequiresV2Api;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -44,12 +45,23 @@ public class LogCacheTest extends AbstractIntegrationTest {
 
     private ApplicationUtils.ApplicationMetadata testLogCacheAppMetadata;
 
-    @Autowired(required = false) private TestLogCacheEndpoints testLogCacheEndpoints;
+    // Optional: only available when V2 API is enabled (requires deployed test app)
+    @Autowired(required = false)
+    private TestLogCacheEndpoints testLogCacheEndpoints;
 
     private final Random random = new SecureRandom();
 
+    /**
+     * Sets up the test log cache app metadata. The testLogCacheApp bean is optional
+     * ({@code required = false}) because it depends on V2 API calls for app deployment.
+     * When SKIP_V2_TESTS=true, this bean won't be available and setUp becomes a no-op.
+     * Tests that need testLogCacheAppMetadata are annotated with {@code @RequiresV2Api}
+     * and will be skipped in that case.
+     */
     @BeforeEach
-    void setUp(@Autowired(required = false) Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp) {
+    void setUp(
+            @Autowired(required = false)
+                    Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp) {
         if (testLogCacheApp != null) {
             this.testLogCacheAppMetadata = testLogCacheApp.block();
         }
@@ -88,6 +100,7 @@ public void meta() {
 
     @Test
     @RequiresV2Api
+    @RequiresMetricRegistrar
     public void readCounter() {
         final String name = this.nameFactory.getName("counter-");
         final int delta = this.random.nextInt(1000);
@@ -108,6 +121,7 @@ public void readCounter() {
 
     @Test
     @RequiresV2Api
+    @RequiresMetricRegistrar
     public void readEvent() {
         final String title = this.nameFactory.getName("event-");
         final String body = "This is the body. " + new BigInteger(1024, this.random).toString(32);