Guard connection pool histograms in beta, bump service.ranking of mp telemetry's OpenTelemetryInfoFactoryImpl to 1500, update feature resolver singletons map

Author: Channyboy

dev/com.ibm.ws.connectionpool.monitor/bnd.bnd

@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2023 IBM Corporation and others.
+# Copyright (c) 2017, 2024 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -56,4 +56,5 @@ instrument.disabled: true
 	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
 	com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\
 	com.ibm.wsspi.org.osgi.service.event;version=latest,\
-	com.ibm.ws.container.service.compat;version=latest
+	com.ibm.ws.container.service.compat;version=latest,\
+	com.ibm.ws.kernel.boot.core;version=latest

dev/com.ibm.ws.connectionpool.monitor/src/com/ibm/ws/connectionpool/monitor/metrics/MetricsManager.java

@@ -24,6 +24,7 @@
 
 import com.ibm.websphere.ras.Tr;
 import com.ibm.websphere.ras.TraceComponent;
+import com.ibm.ws.kernel.productinfo.ProductInfo;
 
 @Component(configurationPolicy = IGNORE, immediate = true)
 public class MetricsManager {
@@ -47,6 +48,12 @@ public void deactivate() {
     }
 
     public static MetricsManager getInstance() {
+
+        //beta - return no instance
+        if (!ProductInfo.getBetaEdition()) {
+            return null;
+        }
+
         if (instance != null) {
             return instance;
         }
@@ -63,7 +70,11 @@ public static MetricsManager getInstance() {
      * @param duration recorded Duration of the wait time
      */
     public void updateWaitTimeMetrics(String poolName, Duration duration) {
-        metricRuntimes.stream().forEach(adapters -> adapters.updateWaitTimeMetrics(poolName, duration));
+        //just in case
+        if (!ProductInfo.getBetaEdition()) {
+            metricRuntimes.stream().forEach(adapters -> adapters.updateWaitTimeMetrics(poolName, duration));
+        }
+
     }
 
     /**
@@ -72,7 +83,11 @@ public void updateWaitTimeMetrics(String poolName, Duration duration) {
      * @param Duration recorded Duration of the (in) use time.
      */
     public void updateInUseTimeMetrics(String poolName, Duration duration) {
-        metricRuntimes.stream().forEach(adapters -> adapters.updateInUseTimeMetrics(poolName, duration));
+        //just in case
+        if (!ProductInfo.getBetaEdition()) {
+            metricRuntimes.stream().forEach(adapters -> adapters.updateInUseTimeMetrics(poolName, duration));
+        }
+
     }
 
 }

dev/com.ibm.ws.kernel.feature.resolver_fat/publish/verify/singleton_expected.xml

@@ -13865,6 +13865,12 @@
             <resolved>io.openliberty.mpJwtPropagation-2.1</resolved>
             <resolved>io.openliberty.cdi3.0-transaction2.0</resolved>
             <resolved>io.openliberty.cdi3.0-appSecurity</resolved>
+            <resolved-feature>io.openliberty.servlet5.0-monitor1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.distributedMapPMI-1.0</resolved-feature>
+            <resolved-feature>io.openliberty.restfulWS3.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.httpStat-monitor1.0.jakarta</resolved-feature>
+            <resolved-feature>monitor-1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.sessionMonitor-1.0</resolved-feature>
         </output>
     </case>
     <case>
@@ -15587,6 +15593,11 @@
             <resolved>io.openliberty.cdi3.0-jndi1.0</resolved>
             <resolved>io.openliberty.cdi4.0-servlet6.0</resolved>
             <resolved>io.openliberty.cdi3.0-transaction2.0</resolved>
+            <resolved-feature>io.openliberty.servlet5.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.restfulWS3.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.httpStat-monitor1.0.jakarta</resolved-feature>
+            <resolved-feature>monitor-1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.sessionMonitor-1.0</resolved-feature>
         </output>
     </case>
     <case>

dev/com.ibm.ws.kernel.feature.resolver_fat/publish/verify/singleton_expected_WL.xml

@@ -215,6 +215,11 @@
             <resolved-feature>io.openliberty.cdi3.0-jndi1.0</resolved-feature>
             <resolved-feature>io.openliberty.cdi4.0-servlet6.0</resolved-feature>
             <resolved-feature>io.openliberty.cdi3.0-transaction2.0</resolved-feature>
+            <resolved-feature>io.openliberty.servlet5.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.restfulWS3.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.httpStat-monitor1.0.jakarta</resolved-feature>
+            <resolved-feature>monitor-1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.sessionMonitor-1.0</resolved-feature>
         </output>
     </case>
     <case>
@@ -7292,6 +7297,12 @@
             <resolved-feature>io.openliberty.mpJwtPropagation-2.1</resolved-feature>
             <resolved-feature>io.openliberty.cdi3.0-transaction2.0</resolved-feature>
             <resolved-feature>io.openliberty.cdi3.0-appSecurity</resolved-feature>
+            <resolved-feature>io.openliberty.servlet5.0-monitor1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.distributedMapPMI-1.0</resolved-feature>
+            <resolved-feature>io.openliberty.restfulWS3.0-monitor1.0</resolved-feature>
+            <resolved-feature>io.openliberty.httpStat-monitor1.0.jakarta</resolved-feature>
+            <resolved-feature>monitor-1.0</resolved-feature>
+            <resolved-feature>com.ibm.websphere.appserver.sessionMonitor-1.0</resolved-feature>
         </output>
     </case>
     <case>

dev/io.openliberty.microprofile.telemetry.internal.common/src/io/openliberty/microprofile/telemetry/internal/common/info/OpenTelemetryInfoFactoryImpl.java

@@ -20,6 +20,14 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 
+import org.apache.commons.lang3.concurrent.LazyInitializer;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
 import com.ibm.websphere.ras.Tr;
 import com.ibm.websphere.ras.TraceComponent;
 import com.ibm.ws.container.service.app.deploy.ApplicationInfo;
@@ -32,14 +40,6 @@
 import com.ibm.ws.runtime.metadata.MetaDataSlot;
 import com.ibm.ws.threadContext.ComponentMetaDataAccessorImpl;
 
-import org.apache.commons.lang3.concurrent.LazyInitializer;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-
 import io.openliberty.microprofile.telemetry.internal.common.AgentDetection;
 import io.openliberty.microprofile.telemetry.internal.common.constants.OpenTelemetryConstants;
 import io.openliberty.microprofile.telemetry.internal.interfaces.OpenTelemetryInfoFactory;
@@ -51,7 +51,7 @@
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
 // We want this to start before CDI so the meta data slot is ready before anyone triggers the CDI producer.
-@Component(service = { ApplicationStateListener.class, OpenTelemetryInfoFactory.class }, property = { "service.vendor=IBM", "service.ranking:Integer=150" })
+@Component(service = { ApplicationStateListener.class, OpenTelemetryInfoFactory.class }, property = { "service.vendor=IBM", "service.ranking:Integer=1500" })
 public class OpenTelemetryInfoFactoryImpl implements ApplicationStateListener, OpenTelemetryInfoFactory {
 
     /*