Merge branch 'wme-missing-query-fields' into 'main'

Wme missing query fields

See merge request weblogic-cloud/weblogic-kubernetes-operator!5054

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/MonitoringExporterConfiguration.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.weblogic.domain.model;
@@ -99,6 +99,10 @@ static class ExporterQuery extends HashMap<String,ExporterQuery> {
     private String[] values;
 
     private Map<String,String[]> stringValues;
+
+    private String excludedKeyValues;
+
+    private String includedKeyValues;
   }
 
   // This class controls serialization of the exporter configuration.
@@ -138,6 +142,8 @@ private void writeQuery(JsonWriter out, ExporterQuery src) throws IOException {
       writeOptionalStringField(out, "keyName", src.keyName);
       writeOptionalStringField(out, "type", src.type);
       writeOptionalStringField(out, "prefix", src.prefix);
+      writeOptionalStringField(out, "excludedKeyValues", src.excludedKeyValues);
+      writeOptionalStringField(out, "includedKeyValues", src.includedKeyValues);
       writeOptionalValueArray(out, src.values);
       writeOptionalStringValues(out, src.stringValues);
 
@@ -227,6 +233,8 @@ private ExporterQuery readQuery(JsonReader in) throws IOException {
           case "prefix" -> query.prefix = in.nextString();
           case "values" -> query.values = readArrayValue(in);
           case "stringValues" -> query.stringValues = readStringValues(in);
+          case "excludedKeyValues" -> query.excludedKeyValues = in.nextString();
+          case "includedKeyValues" -> query.includedKeyValues = in.nextString();
           default -> query.put(name, readQuery(in));
         }
       }

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/MonitoringExporterSpecification.java

@@ -76,8 +76,14 @@ private String toJson(Object object) {
     return new Gson().toJson(object);
   }
 
-  private MonitoringExporterConfiguration toConfiguration(String string) {
-    return new Gson().fromJson(string, MonitoringExporterConfiguration.class);
+  private MonitoringExporterConfiguration toConfiguration(String jsonConfig) {
+    try {
+      return new Gson().fromJson(jsonConfig, MonitoringExporterConfiguration.class);
+    } catch (com.google.gson.JsonSyntaxException e) {
+      throw new IllegalArgumentException(
+          "Failed to parse monitoring exporter configuration in 'domain.spec.monitoringExporter' - "
+                  + e.getMessage(), e);
+    }
   }
 
   void createConfiguration(String yaml) {

operator/src/test/java/oracle/kubernetes/weblogic/domain/model/MonitoringExporterConfigurationTest.java

@@ -49,6 +49,8 @@ void deserializeFromJson() {
           queries:
           - applicationRuntimes:
               key: name
+              excludedKeyValues: "^(Oracle.*|bea.*|coherence.*|state.*|opss.*|jms.*|test_ins.*)$"
+              includedKeyValues: "^(Oracle.*|bea.*|coherence.*|state.*|opss.*|jms.*|test_ins.*)$"
               componentRuntimes:
                 type: WebAppComponentRuntime
                 prefix: webapp_config_