updated the builder so that all names (metric / event / attribute key /

attribute name) are converted to dot-separated snake case

Author: atimgraves

IoTDBJDBC/.classpath

@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

IoTDBJDBC/pom.xml

@@ -213,6 +213,11 @@ SOFTWARE. -->
 			<artifactId>jakarta.validation-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<scope>compile</scope>
+		</dependency>
 
 	</dependencies>
 	<build>

IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/normalizeddata/timeseriesdb/TimeSeriesDBOutputOTLP.java

@@ -137,8 +137,7 @@ public NormalizedData[] processNormalizedData(NormalizedData normalizedData) thr
 	}
 
 	private void addScopeAttributes(NormalizedDataMetricsDataBuilder builder) {
-		// include this to figure out what it does
-		builder.scopeAttribute("my.scope.attribute", "some scope attribute");
+		// for now none to add
 	}
 
 	private void addResourceAttributes(NormalizedDataMetricsDataBuilder builder, NormalizedData normalizedData) {

IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/normalizeddata/timeseriesdb/otlp/NormalizedDataMetricsDataBuilder.java

@@ -98,42 +98,42 @@ public NormalizedDataMetricsDataBuilder metric(String metricPrefix, String metri
 
 	public NormalizedDataMetricsDataBuilder resourceAttribute(String key, String value) {
 		if (hasText(key)) {
-			resourceAttributes.add(OtlpAttributeUtils.attribute(key, value));
+			resourceAttributes.add(attribute(key, value));
 		}
 		return this;
 	}
 
 	public NormalizedDataMetricsDataBuilder resourceAttribute(String key, AnyValue value) {
 		if (hasText(key) && value != null) {
-			resourceAttributes.add(OtlpAttributeUtils.attribute(key, value));
+			resourceAttributes.add(attribute(key, value));
 		}
 		return this;
 	}
 
 	public NormalizedDataMetricsDataBuilder resourceAttributes(List<KeyValue> attributes) {
 		if (attributes != null) {
-			resourceAttributes.addAll(attributes);
+			resourceAttributes.addAll(normalizeAttributeKeys(attributes));
 		}
 		return this;
 	}
 
 	public NormalizedDataMetricsDataBuilder scopeAttribute(String key, String value) {
 		if (hasText(key)) {
-			scopeAttributes.add(OtlpAttributeUtils.attribute(key, value));
+			scopeAttributes.add(attribute(key, value));
 		}
 		return this;
 	}
 
 	public NormalizedDataMetricsDataBuilder scopeAttribute(String key, AnyValue value) {
 		if (hasText(key) && value != null) {
-			scopeAttributes.add(OtlpAttributeUtils.attribute(key, value));
+			scopeAttributes.add(attribute(key, value));
 		}
 		return this;
 	}
 
 	public NormalizedDataMetricsDataBuilder scopeAttributes(List<KeyValue> attributes) {
 		if (attributes != null) {
-			scopeAttributes.addAll(attributes);
+			scopeAttributes.addAll(normalizeAttributeKeys(attributes));
 		}
 		return this;
 	}
@@ -236,9 +236,9 @@ private NumberDataPoint dataPoint(NormalizedData normalizedData, String contentP
 		NumberDataPoint dataPoint = new NumberDataPoint();
 		dataPoint.setTimeUnixNano(OtlpTimeUtils.unixNanoAsString(normalizedData.getTimeObserved()));
 		dataPoint.setAsDouble(metricValue(content, jsonValue, jsonType).doubleValue());
-		dataPoint.getAttributes().add(OtlpAttributeUtils.attribute("iot.content.path", contentPath));
+		dataPoint.getAttributes().add(attribute("iot.content.path", contentPath));
 		dataPoint.getAttributes()
-				.add(OtlpAttributeUtils.attribute("iot.content.type", normalizedData.getContentType()));
+				.add(attribute("iot.content.type", normalizedData.getContentType()));
 		return dataPoint;
 	}
 
@@ -248,14 +248,25 @@ public String metricName(NormalizedData normalizedData) {
 
 	public String metricName(String contentPath) {
 		if (!hasText(contentPath)) {
-			return metricPrefix + ".value";
+			return toDotSeparatedSnakeCase(metricPrefix) + ".value";
 		}
-		String sanitizedPath = contentPath.strip().replace('\\', '/').replaceAll("^/+", "").replace('/', '.')
-				.replaceAll("[^A-Za-z0-9_.-]+", "_").replaceAll("\\.+", ".");
+		String sanitizedPath = toDotSeparatedSnakeCase(contentPath.strip().replace('\\', '/').replaceAll("^/+", "")
+				.replace('/', '.').replaceAll("[^A-Za-z0-9_.-]+", "_").replaceAll("\\.+", "."));
 		if (!hasText(sanitizedPath)) {
 			sanitizedPath = "value";
 		}
-		return metricPrefix + "." + sanitizedPath;
+		return toDotSeparatedSnakeCase(metricPrefix) + "." + sanitizedPath;
+	}
+
+	public static String toDotSeparatedSnakeCase(String input) {
+		if (!hasText(input)) {
+			return input;
+		}
+		String[] parts = input.strip().replace('\\', '/').replace('/', '.').split("\\.");
+		for (int i = 0; i < parts.length; i++) {
+			parts[i] = toSnakeCase(parts[i]);
+		}
+		return String.join(".", parts).replaceAll("\\.+", ".");
 	}
 
 	public BigDecimal metricValue(NormalizedData normalizedData) {
@@ -293,6 +304,19 @@ private BigDecimal metricValue(String content, OracleJsonValue jsonValue, Oracle
 		}
 	}
 
+	private static String toSnakeCase(String value) {
+		if (!hasText(value)) {
+			return value;
+		}
+		return value.strip()
+				.replaceAll("([A-Z]+)([A-Z][a-z])", "$1_$2")
+				.replaceAll("([a-z0-9])([A-Z])", "$1_$2")
+				.replaceAll("[^A-Za-z0-9]+", "_")
+				.replaceAll("_+", "_")
+				.replaceAll("^_|_$", "")
+				.toLowerCase(java.util.Locale.ROOT);
+	}
+
 	private static String appendPath(String contentPath, String fieldName) {
 		if (!hasText(contentPath)) {
 			return fieldName;
@@ -310,9 +334,8 @@ private static boolean isNumeric(OracleJsonType jsonType) {
 
 	private ResourceMetrics resourceMetrics(NormalizedData normalizedData) {
 		Resource resource = new Resource();
-		resource.getAttributes().add(OtlpAttributeUtils.attribute("service.name", serviceName));
-		resource.getAttributes().add(OtlpAttributeUtils.attribute("iot.digital_twin.instance_id",
-				normalizedData.getDigitalTwinInstanceId()));
+		resource.getAttributes().add(attribute("service.name", serviceName));
+		resource.getAttributes().add(attribute("iot.digital_twin.instance_id", normalizedData.getDigitalTwinInstanceId()));
 
 		ResourceMetrics resourceMetrics = new ResourceMetrics();
 		resourceMetrics.setResource(resource);
@@ -321,7 +344,7 @@ private ResourceMetrics resourceMetrics(NormalizedData normalizedData) {
 
 	private ScopeMetrics scopeMetrics() {
 		InstrumentationScope scope = new InstrumentationScope();
-		scope.setName(scopeName);
+		scope.setName(toDotSeparatedSnakeCase(scopeName));
 		scope.setVersion(scopeVersion);
 
 		ScopeMetrics scopeMetrics = new ScopeMetrics();
@@ -337,6 +360,24 @@ private static void addMissingAttributes(List<KeyValue> target, List<KeyValue> a
 		}
 	}
 
+	private static List<KeyValue> normalizeAttributeKeys(List<KeyValue> attributes) {
+		List<KeyValue> normalizedAttributes = new ArrayList<>();
+		for (KeyValue attribute : attributes) {
+			if (attribute != null) {
+				normalizedAttributes.add(attribute(attribute.getKey(), attribute.getValue()));
+			}
+		}
+		return normalizedAttributes;
+	}
+
+	private static KeyValue attribute(String key, String value) {
+		return OtlpAttributeUtils.attribute(toDotSeparatedSnakeCase(key), value);
+	}
+
+	private static KeyValue attribute(String key, AnyValue value) {
+		return OtlpAttributeUtils.attribute(toDotSeparatedSnakeCase(key), value);
+	}
+
 	private static boolean hasText(String value) {
 		return value != null && !value.isBlank();
 	}