Store OTel scope/descriptor strings as UTF8BytesString to help with OTLP export (#10807)

Store OTel scope/descriptor strings as UTF8BytesString to help with OTLP export

Co-authored-by: stuart.mcculloch <stuart.mcculloch@datadoghq.com>

Author: mcculls

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/OtelInstrumentationScope.java

@@ -1,33 +1,34 @@
 package datadog.opentelemetry.shim;
 
+import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
 /** Instrumentation scopes have a mandatory name, optional version, and optional schema URL. */
 public final class OtelInstrumentationScope {
 
-  private final String scopeName;
-  @Nullable private final String scopeVersion;
-  @Nullable private final String schemaUrl;
+  private final UTF8BytesString scopeName;
+  @Nullable private final UTF8BytesString scopeVersion;
+  @Nullable private final UTF8BytesString schemaUrl;
 
   public OtelInstrumentationScope(
       String scopeName, @Nullable String scopeVersion, @Nullable String schemaUrl) {
-    this.scopeName = scopeName;
-    this.scopeVersion = scopeVersion;
-    this.schemaUrl = schemaUrl;
+    this.scopeName = UTF8BytesString.create(scopeName);
+    this.scopeVersion = UTF8BytesString.create(scopeVersion);
+    this.schemaUrl = UTF8BytesString.create(schemaUrl);
   }
 
-  public String getName() {
+  public UTF8BytesString getName() {
     return scopeName;
   }
 
   @Nullable
-  public String getVersion() {
+  public UTF8BytesString getVersion() {
     return scopeVersion;
   }
 
   @Nullable
-  public String getSchemaUrl() {
+  public UTF8BytesString getSchemaUrl() {
     return schemaUrl;
   }
 

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelInstrumentDescriptor.java

@@ -1,31 +1,32 @@
 package datadog.opentelemetry.shim.metrics;
 
+import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import java.util.Locale;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
 /** Uniquely describes an instrument for the Meter that created it. */
 public final class OtelInstrumentDescriptor {
-  private final String instrumentName;
+  private final UTF8BytesString instrumentName;
   private final OtelInstrumentType instrumentType;
   private final boolean longValues;
-  @Nullable private final String description;
-  @Nullable private final String unit;
+  @Nullable private final UTF8BytesString description;
+  @Nullable private final UTF8BytesString unit;
 
   OtelInstrumentDescriptor(
       String instrumentName,
       OtelInstrumentType instrumentType,
       boolean longValues,
       @Nullable String description,
       @Nullable String unit) {
-    this.instrumentName = instrumentName;
+    this.instrumentName = UTF8BytesString.create(instrumentName);
     this.instrumentType = instrumentType;
     this.longValues = longValues;
-    this.description = description;
-    this.unit = unit;
+    this.description = UTF8BytesString.create(description);
+    this.unit = UTF8BytesString.create(unit);
   }
 
-  public String getName() {
+  public UTF8BytesString getName() {
     return instrumentName;
   }
 
@@ -38,12 +39,12 @@ public boolean hasLongValues() {
   }
 
   @Nullable
-  public String getDescription() {
+  public UTF8BytesString getDescription() {
     return description;
   }
 
   @Nullable
-  public String getUnit() {
+  public UTF8BytesString getUnit() {
     return unit;
   }
 
@@ -54,7 +55,7 @@ public boolean equals(Object o) {
     }
 
     OtelInstrumentDescriptor that = (OtelInstrumentDescriptor) o;
-    return instrumentName.equalsIgnoreCase(that.instrumentName)
+    return instrumentName.toString().equalsIgnoreCase(that.instrumentName.toString())
         && instrumentType == that.instrumentType
         && longValues == that.longValues
         && Objects.equals(description, that.description)
@@ -63,7 +64,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = instrumentName.toLowerCase(Locale.ROOT).hashCode();
+    int result = instrumentName.toString().toLowerCase(Locale.ROOT).hashCode();
     result = 31 * result + instrumentType.hashCode();
     result = 31 * result + Boolean.hashCode(longValues);
     result = 31 * result + Objects.hashCode(description);

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelMetricStorage.java

@@ -5,6 +5,7 @@
 import datadog.opentelemetry.shim.metrics.export.OtelInstrumentVisitor;
 import datadog.trace.api.Config;
 import datadog.trace.api.config.OtlpConfig;
+import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.common.Attributes;
 import java.util.List;
@@ -89,7 +90,7 @@ public static OtelMetricStorage newHistogramStorage(
     return new OtelMetricStorage(descriptor, () -> new OtelHistogramSketch(bucketBoundaries));
   }
 
-  public String getInstrumentName() {
+  public UTF8BytesString getInstrumentName() {
     return descriptor.getName();
   }