remove hard-coded fallback values

2 files changed, 22 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java
index e11f0b3a169..3f7ca7b46a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java
@@ -97,7 +97,9 @@ public class OpenTelemetryConfigGenerator {
             // attributes on all metrics from this /state/v1 port
             g.writeStartObject();
             for (var entry : dimVals.entrySet()) {
-                g.writeStringField(entry.getKey(), entry.getValue());
+                if (entry.getValue() != null) {
+                    g.writeStringField(entry.getKey(), entry.getValue());
+                }
             }
             g.writeEndObject();
         }
@@ -163,6 +165,7 @@ public class OpenTelemetryConfigGenerator {
         g.writeEndObject();
     }
     private void addAttributeInsert(JsonGenerator g, String key, String value) throws java.io.IOException {
+        if (value == null) return;
         g.writeStartObject();
         g.writeStringField("key", key);
         g.writeStringField("value", value);
@@ -253,39 +256,41 @@ public class OpenTelemetryConfigGenerator {
     }
 
     private String zoneAttr() {
-        if (zone == null) return "noZone";
+        if (zone == null) return null;
         return zone.environment().value() + "." + zone.region().value();
     }
     private String appIdAttr() {
-        if (applicationId == null) return "noApp";
+        if (applicationId == null) return null;
         return applicationId.toFullString();
     }
     private String systemAttr() {
-        if (zone == null) return "noSystem";
+        if (zone == null) return null;
         return zone.system().value();
     }
     private String tenantAttr() {
-        if (applicationId == null) return "noTenant";
+        if (applicationId == null) return null;
         return applicationId.tenant().value();
     }
     private String appNameAttr() {
-        if (applicationId == null) return "noAppName";
+        if (applicationId == null) return null;
         return applicationId.application().value();
     }
     private String appInstanceAttr() {
-        if (applicationId == null) return "noAppInstance";
+        if (applicationId == null) return null;
         return applicationId.instance().value();
     }
     private String cloudAttr() {
-        if (zone == null) return "noCloud";
+        if (zone == null) return null;
         return zone.cloud().name().value();
     }
 
     private String getDeploymentCluster(ClusterSpec cluster) {
-        String appString = applicationId == null ? "none.noapp.nope" : applicationId.toFullString();
+        if (applicationId == null) return null;
+        if (zone == null) return null;
+        String appString = applicationId.toFullString();
         return String.join(".", appString,
-                           zone == null ? "dev" : zone.environment().value(),
-                           zone == null ? "local" : zone.region().value(),
+                           zone.environment().value(),
+                           zone.region().value(),
                            cluster.id().value());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGeneratorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGeneratorTest.java
index b555196b6cc..c24fcb27dc9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGeneratorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGeneratorTest.java
@@ -6,8 +6,12 @@ import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterMembership;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
+import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.SystemName;
+import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.Host;
 import com.yahoo.vespa.model.HostResource;
@@ -25,8 +29,9 @@ public class OpenTelemetryConfigGeneratorTest {
 
     @Test
     void testBuildsYaml() {
+        var mockZone = new Zone(SystemName.PublicCd, Environment.prod, RegionName.from("mock"));
         var app = ApplicationId.from("mytenant", "myapp", "myinstance");
-        var generator = new OpenTelemetryConfigGenerator(null, app);
+        var generator = new OpenTelemetryConfigGenerator(mockZone, app);
         var root = new MockRoot();
 
         var mockHost = new Host(root, "localhost2.local");