Cleanup

Author: mcculls

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java

@@ -1,5 +1,9 @@
 package datadog.trace.bootstrap.otel.metrics;
 
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.OBSERVABLE_COUNTER;
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.OBSERVABLE_GAUGE;
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.OBSERVABLE_UP_DOWN_COUNTER;
+
 import javax.annotation.Nullable;
 
 public final class OtelInstrumentBuilder {
@@ -91,11 +95,11 @@ public OtelInstrumentDescriptor observableDescriptor() {
   private OtelInstrumentType observableType(OtelInstrumentType instrumentType) {
     switch (instrumentType) {
       case COUNTER:
-        return OtelInstrumentType.OBSERVABLE_COUNTER;
+        return OBSERVABLE_COUNTER;
       case UP_DOWN_COUNTER:
-        return OtelInstrumentType.OBSERVABLE_UP_DOWN_COUNTER;
+        return OBSERVABLE_UP_DOWN_COUNTER;
       case GAUGE:
-        return OtelInstrumentType.OBSERVABLE_GAUGE;
+        return OBSERVABLE_GAUGE;
       default:
         throw new IllegalArgumentException(instrumentType + " has no observable equivalent");
     }

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java

@@ -1,5 +1,9 @@
 package datadog.trace.bootstrap.otel.metrics.data;
 
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.COUNTER;
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.HISTOGRAM;
+import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.OBSERVABLE_COUNTER;
+
 import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.api.config.OtlpConfig;
@@ -63,12 +67,10 @@ private static boolean shouldResetOnCollect(OtelInstrumentType type) {
     switch (TEMPORALITY_PREFERENCE) {
       case DELTA:
         // gauges and up/down counters stay as cumulative
-        return type == OtelInstrumentType.HISTOGRAM
-            || type == OtelInstrumentType.COUNTER
-            || type == OtelInstrumentType.OBSERVABLE_COUNTER;
+        return type == HISTOGRAM || type == COUNTER || type == OBSERVABLE_COUNTER;
       case LOWMEMORY:
         // observable counters, gauges, and up/down counters stay as cumulative
-        return type == OtelInstrumentType.HISTOGRAM || type == OtelInstrumentType.COUNTER;
+        return type == HISTOGRAM || type == COUNTER;
       case CUMULATIVE:
       default:
         return false;

dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonProto.java

@@ -1,5 +1,13 @@
 package datadog.trace.core.otlp.common;
 
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.BOOLEAN;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.BOOLEAN_ARRAY;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.DOUBLE;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.DOUBLE_ARRAY;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.LONG;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.LONG_ARRAY;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.STRING;
+import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.STRING_ARRAY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import datadog.communication.serialization.GenerationalUtf8Cache;
@@ -8,7 +16,6 @@
 import datadog.communication.serialization.StreamingBuffer;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
-import datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor;
 import java.nio.ByteBuffer;
 import java.util.List;
 
@@ -149,28 +156,28 @@ public static void writeInstrumentationScope(
   public static void writeAttribute(StreamingBuffer buf, int type, String key, Object value) {
     byte[] keyUtf8 = keyUtf8(key);
     switch (type) {
-      case OtlpAttributeVisitor.STRING:
+      case STRING:
         writeStringAttribute(buf, keyUtf8, valueUtf8((String) value));
         break;
-      case OtlpAttributeVisitor.BOOLEAN:
+      case BOOLEAN:
         writeBooleanAttribute(buf, keyUtf8, (boolean) value);
         break;
-      case OtlpAttributeVisitor.LONG:
+      case LONG:
         writeLongAttribute(buf, keyUtf8, (long) value);
         break;
-      case OtlpAttributeVisitor.DOUBLE:
+      case DOUBLE:
         writeDoubleAttribute(buf, keyUtf8, (double) value);
         break;
-      case OtlpAttributeVisitor.STRING_ARRAY:
+      case STRING_ARRAY:
         writeStringArrayAttribute(buf, keyUtf8, (List<String>) value);
         break;
-      case OtlpAttributeVisitor.BOOLEAN_ARRAY:
+      case BOOLEAN_ARRAY:
         writeBooleanArrayAttribute(buf, keyUtf8, (List<Boolean>) value);
         break;
-      case OtlpAttributeVisitor.LONG_ARRAY:
+      case LONG_ARRAY:
         writeLongArrayAttribute(buf, keyUtf8, (List<Long>) value);
         break;
-      case OtlpAttributeVisitor.DOUBLE_ARRAY:
+      case DOUBLE_ARRAY:
         writeDoubleArrayAttribute(buf, keyUtf8, (List<Double>) value);
         break;
       default:

dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceProto.java

@@ -18,8 +18,6 @@
 public final class OtlpResourceProto {
   private OtlpResourceProto() {}
 
-  public static final byte[] RESOURCE_MESSAGE = buildResourceMessage(Config.get());
-
   private static final Set<String> IGNORED_GLOBAL_TAGS =
       new HashSet<>(
           Arrays.asList(
@@ -30,6 +28,8 @@ private OtlpResourceProto() {}
               "deployment.environment.name",
               "service.version"));
 
+  public static final byte[] RESOURCE_MESSAGE = buildResourceMessage(Config.get());
+
   static byte[] buildResourceMessage(Config config) {
     GrowableBuffer buf = new GrowableBuffer(512);