Improve the aggregation logic for tokens and duration (#63)

* Improve the aggregation logic for tokens and duration * Use 10000 times the cost value * Add aiSystem as part of modelKey
instana · Oct 24, 2024 · 6bd0d53 · 6bd0d53
1 parent 60c9f6b
commit 6bd0d53
Show file tree

Hide file tree

Showing 8 changed files with 331 additions and 205 deletions.
diff --git a/llm/config/config.yaml b/llm/config/config.yaml
@@ -1,7 +1,9 @@
 llm.application: LLM_DC
 
 instances:
-  - otel.backend.url: http://localhost:4317
+  - otel.agentless.mode: true
+    otel.backend.url: http://<backend/agent-otlp-acceptor>:4317
+    callback.interval: 10
     otel.service.name: DC1
     otel.service.port: 8000
     #Only configure the settings of the AI provider you are using

diff --git a/llm/src/main/java/com/instana/dc/llm/AbstractLLMDc.java b/llm/src/main/java/com/instana/dc/llm/AbstractLLMDc.java
@@ -4,14 +4,14 @@
  */
 package com.instana.dc.llm;
 
-import com.instana.dc.AbstractDc;
-import com.instana.dc.llm.DataCollector.CustomDcConfig;
-import com.instana.dc.resources.ContainerResource;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.SdkMeterProvider;
-import io.opentelemetry.sdk.resources.Resource;
+import static com.instana.dc.DcUtil.CALLBACK_INTERVAL;
+import static com.instana.dc.DcUtil.INSTANA_PLUGIN;
+import static com.instana.dc.DcUtil.OTEL_BACKEND_URL;
+import static com.instana.dc.DcUtil.OTEL_BACKEND_USING_HTTP;
+import static com.instana.dc.DcUtil.OTEL_SERVICE_NAME;
+import static com.instana.dc.DcUtil.POLLING_INTERVAL;
+import static com.instana.dc.DcUtil.mergeResourceAttributesFromEnv;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -21,9 +21,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import static com.instana.dc.DcUtil.*;
-import static com.instana.dc.llm.LLMDcUtil.*;
-import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import com.instana.dc.AbstractDc;
+import com.instana.dc.llm.DataCollector.CustomDcConfig;
+import com.instana.dc.resources.ContainerResource;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.semconv.ResourceAttributes;
 public abstract class AbstractLLMDc extends AbstractDc {
     private static final Logger logger = Logger.getLogger(AbstractLLMDc.class.getName());
 
@@ -36,9 +43,8 @@ public abstract class AbstractLLMDc extends AbstractDc {
     private String serviceInstanceId;
     private CustomDcConfig cdcConfig;
 
-    // Used the fixed 10 seconds for poll interval
-    public static final int LLM_POLL_INTERVAL = 10;
-    public static final int LLM_CLBK_INTERVAL = 10;
+    public static final int DEFAULT_LLM_POLL_INTERVAL = 10;
+    public static final int DEFAULT_LLM_CLBK_INTERVAL = 10;
 
     private final ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
 
@@ -52,10 +58,8 @@ public String getHostName() {
 
     public AbstractLLMDc(Map<String, Object> properties, CustomDcConfig cdcConfig) {
         super(new LLMRawMetricRegistry().getMap());
-		// pollInterval = (Integer) properties.getOrDefault(POLLING_INTERVAL, DEFAULT_POLL_INTERVAL);
-        // callbackInterval = (Integer) properties.getOrDefault(CALLBACK_INTERVAL, DEFAULT_CALLBACK_INTERVAL);
-        pollInterval = LLM_POLL_INTERVAL;
-        callbackInterval = LLM_CLBK_INTERVAL;
+        callbackInterval = (Integer) properties.getOrDefault(CALLBACK_INTERVAL, DEFAULT_LLM_CLBK_INTERVAL);
+        pollInterval = (Integer) properties.getOrDefault(POLLING_INTERVAL, callbackInterval);
         otelBackendUrl = (String) properties.get(OTEL_BACKEND_URL);
         otelUsingHttp = (Boolean) properties.getOrDefault(OTEL_BACKEND_USING_HTTP, Boolean.FALSE);
         serviceName = (String) properties.get(OTEL_SERVICE_NAME);
@@ -68,12 +72,11 @@ public Resource getResourceAttributes() {
         Resource resource = Resource.getDefault()
                 .merge(Resource.create(Attributes.of(
                     stringKey("llm.platform"), "LLM",
-                    stringKey(SERVICE_NAME), serviceName,
-                    stringKey(SERVICE_INSTANCE_ID), serviceInstanceId
+                    ResourceAttributes.SERVICE_NAME, serviceName,
+                    ResourceAttributes.SERVICE_INSTANCE_ID, serviceInstanceId
                 )))
                 .merge(Resource.create(Attributes.of(
-                        stringKey("INSTANA_PLUGIN"), // com.instana.agent.sensorsdk.semconv.ResourceAttributes.INSTANA_PLUGIN
-                        "llmonitor" // com.instana.agent.sensorsdk.semconv.ResourceAttributes.LLM
+                    stringKey(INSTANA_PLUGIN), "llmonitor"
                 )));
 
         resource = resource.merge(ContainerResource.get());

diff --git a/llm/src/main/java/com/instana/dc/llm/DataCollector.java b/llm/src/main/java/com/instana/dc/llm/DataCollector.java
@@ -4,6 +4,10 @@
  */
 package com.instana.dc.llm;
 
+import static com.instana.dc.DcUtil.CONFIG_ENV;
+import static com.instana.dc.DcUtil.CONFIG_YAML;
+import static com.instana.dc.DcUtil.LOGGING_PROP;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,9 +18,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import static com.instana.dc.DcUtil.CONFIG_ENV;
-import static com.instana.dc.DcUtil.CONFIG_YAML;
-import static com.instana.dc.DcUtil.LOGGING_PROP;
 import com.instana.dc.IDc;
 
 public class DataCollector {

diff --git a/llm/src/main/java/com/instana/dc/llm/LLMDcRegistry.java b/llm/src/main/java/com/instana/dc/llm/LLMDcRegistry.java
@@ -4,12 +4,10 @@
  */
 package com.instana.dc.llm;
 
-import com.instana.dc.llm.AbstractLLMDc;
-import com.instana.dc.llm.impl.llm.LLMDc;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import com.instana.dc.llm.impl.llm.LLMDc;
 public class LLMDcRegistry {
     /* Add all DataCollector implementations here:
     **/

diff --git a/llm/src/main/java/com/instana/dc/llm/LLMDcUtil.java b/llm/src/main/java/com/instana/dc/llm/LLMDcUtil.java
@@ -13,8 +13,6 @@ public class LLMDcUtil {
      */
     public static final String DEFAULT_INSTRUMENTATION_SCOPE = "instana.sensor-sdk.dc.llm";
     public static final String DEFAULT_INSTRUMENTATION_SCOPE_VER = "1.0.0";
-    public static final String SERVICE_NAME = "service.name";
-    public static final String SERVICE_INSTANCE_ID = "service.instance.id";
     public final static String WATSONX_PRICE_PROMPT_TOKES_PER_KILO = "watsonx.price.prompt.tokens.per.kilo";
     public final static String WATSONX_PRICE_COMPLETE_TOKES_PER_KILO = "watsonx.price.complete.tokens.per.kilo";
     public final static String OPENAI_PRICE_PROMPT_TOKES_PER_KILO = "openai.price.prompt.tokens.per.kilo";
@@ -24,6 +22,7 @@ public class LLMDcUtil {
     public final static String BEDROCK_PRICE_PROMPT_TOKES_PER_KILO = "bedrock.price.prompt.tokens.per.kilo";
     public final static String BEDROCK_PRICE_COMPLETE_TOKES_PER_KILO = "bedrock.price.complete.tokens.per.kilo";
     public final static String SERVICE_LISTEN_PORT = "otel.service.port";
+    public final static String OTEL_AGENTLESS_MODE = "otel.agentless.mode";
 
     /* Configurations for Metrics:
      */

diff --git a/llm/src/main/java/com/instana/dc/llm/LLMRawMetricRegistry.java b/llm/src/main/java/com/instana/dc/llm/LLMRawMetricRegistry.java
@@ -4,14 +4,31 @@
  */
 package com.instana.dc.llm;
 
-import com.instana.dc.RawMetric;
+import static com.instana.dc.InstrumentType.GAUGE;
+import static com.instana.dc.InstrumentType.UPDOWN_COUNTER;
+import static com.instana.dc.llm.LLMDcUtil.LLM_COST_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_COST_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_COST_UNIT;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_MAX_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_MAX_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_MAX_UNIT;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_DURATION_UNIT;
+import static com.instana.dc.llm.LLMDcUtil.LLM_REQ_COUNT_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_REQ_COUNT_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_REQ_COUNT_UNIT;
+import static com.instana.dc.llm.LLMDcUtil.LLM_STATUS_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_STATUS_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_STATUS_UNIT;
+import static com.instana.dc.llm.LLMDcUtil.LLM_TOKEN_DESC;
+import static com.instana.dc.llm.LLMDcUtil.LLM_TOKEN_NAME;
+import static com.instana.dc.llm.LLMDcUtil.LLM_TOKEN_UNIT;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.instana.dc.InstrumentType.GAUGE;
-import static com.instana.dc.InstrumentType.UPDOWN_COUNTER;
-import static com.instana.dc.llm.LLMDcUtil.*;
+import com.instana.dc.RawMetric;
 
 public class LLMRawMetricRegistry {
     private final Map<String, RawMetric> map = new ConcurrentHashMap<String, RawMetric>() {{