update the OTLP builder helper to actually add later added attributes

Author: atimgraves

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

@@ -137,8 +137,8 @@ public NormalizedData[] processNormalizedData(NormalizedData normalizedData) thr
 	}
 
 	private void addScopeAttributes(NormalizedDataMetricsDataBuilder builder) {
-		// for now this does nothing
-		// builder.scopeAttribute("my.scope.attribute", "some scope attribute");
+		// include this to figure out what it does
+		builder.scopeAttribute("my.scope.attribute", "some scope attribute");
 	}
 
 	private void addResourceAttributes(NormalizedDataMetricsDataBuilder builder, NormalizedData normalizedData) {
@@ -147,10 +147,12 @@ private void addResourceAttributes(NormalizedDataMetricsDataBuilder builder, Nor
 		try {
 			String modelId = deviceModelInstancesCache.getModelIdByInstanceId(instanceId, true);
 			builder.resourceAttribute("iot.digital_twin.model_id", modelId);
+			log.info("Added model ID resource attribute of " + modelId);
 			String modelName;
 			try {
 				modelName = deviceModelInstancesCache.getModelNameByModelId(modelId, true);
 				builder.resourceAttribute("iot.digital_twin.model_name", modelName);
+				log.info("Added model name resource attribute of " + modelName);
 			} catch (MissingModelException e) {
 				log.severe("No model name found for modelid " + modelId);
 			} catch (SQLException e) {

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

@@ -148,6 +148,16 @@ public NormalizedDataMetricsDataBuilder gaugeMetric(NormalizedData normalizedDat
 	}
 
 	public MetricsData build() {
+		for (ResourceMetrics resourceMetrics : metricsData.getResourceMetrics()) {
+			if (resourceMetrics.getResource() != null) {
+				addMissingAttributes(resourceMetrics.getResource().getAttributes(), resourceAttributes);
+			}
+			for (ScopeMetrics scopeMetrics : resourceMetrics.getScopeMetrics()) {
+				if (scopeMetrics.getScope() != null) {
+					addMissingAttributes(scopeMetrics.getScope().getAttributes(), scopeAttributes);
+				}
+			}
+		}
 		return metricsData;
 	}
 
@@ -303,7 +313,6 @@ private ResourceMetrics resourceMetrics(NormalizedData normalizedData) {
 		resource.getAttributes().add(OtlpAttributeUtils.attribute("service.name", serviceName));
 		resource.getAttributes().add(OtlpAttributeUtils.attribute("iot.digital_twin.instance_id",
 				normalizedData.getDigitalTwinInstanceId()));
-		resource.getAttributes().addAll(resourceAttributes);
 
 		ResourceMetrics resourceMetrics = new ResourceMetrics();
 		resourceMetrics.setResource(resource);
@@ -314,13 +323,20 @@ private ScopeMetrics scopeMetrics() {
 		InstrumentationScope scope = new InstrumentationScope();
 		scope.setName(scopeName);
 		scope.setVersion(scopeVersion);
-		scope.getAttributes().addAll(scopeAttributes);
 
 		ScopeMetrics scopeMetrics = new ScopeMetrics();
 		scopeMetrics.setScope(scope);
 		return scopeMetrics;
 	}
 
+	private static void addMissingAttributes(List<KeyValue> target, List<KeyValue> attributes) {
+		for (KeyValue attribute : attributes) {
+			if (!target.contains(attribute)) {
+				target.add(attribute);
+			}
+		}
+	}
+
 	private static boolean hasText(String value) {
 		return value != null && !value.isBlank();
 	}