remove timed.unit

Author: Duncan-tree-zhou

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/Timed.java

@@ -9,7 +9,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.concurrent.TimeUnit;
 
 /**
  * This annotation creates a {@link io.opentelemetry.api.metrics.DoubleHistogram Histogram}
@@ -50,11 +49,4 @@
    * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-description">https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-description</a>
    */
   String description() default "";
-
-  /**
-   * The unit for the metric.
-   *
-   * <p>Default is seconds.
-   */
-  TimeUnit unit() default TimeUnit.SECONDS;
 }

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/TimedHelper.java

@@ -57,51 +57,30 @@ private static MethodTimer getMethodTimer(Method method) {
     return timers.get(method.getDeclaringClass()).computeIfAbsent(method, MethodTimer::new);
   }
 
-  private static String timeUnitToString(TimeUnit timeUnit) {
-    switch (timeUnit) {
-      case NANOSECONDS:
-        return "ns";
-      case MICROSECONDS:
-        return "us";
-      case MILLISECONDS:
-        return "ms";
-      case SECONDS:
-        return "s";
-      case MINUTES:
-        return "min";
-      case HOURS:
-        return "h";
-      case DAYS:
-        return "d";
-    }
-    throw new IllegalArgumentException("Unsupported time unit " + timeUnit);
-  }
-
-  private static double getDuration(long startNanoTime, TimeUnit unit) {
+  private static double getDurationInSecond(long startNanoTime) {
     long nanoDelta = System.nanoTime() - startNanoTime;
-    return (double) nanoDelta / NANOSECONDS.convert(1, unit);
+    return (double) nanoDelta / NANOSECONDS.convert(1, TimeUnit.SECONDS);
   }
 
   private static class MethodTimer {
-    private final TimeUnit unit;
     private final DoubleHistogram histogram;
     private final MetricAttributeHelper attributeHelper;
 
     MethodTimer(Method method) {
       Timed timedAnnotation = method.getAnnotation(Timed.class);
-      unit = timedAnnotation.unit();
       histogram =
           METER
               .histogramBuilder(timedAnnotation.value())
               .setDescription(timedAnnotation.description())
-              .setUnit(timeUnitToString(unit))
+              .setUnit("s")
               .build();
       attributeHelper = new MetricAttributeHelper(method);
     }
 
     void record(Object returnValue, Object[] arguments, Throwable throwable, long startNanoTime) {
-      double duration = getDuration(startNanoTime, unit);
-      histogram.record(duration, attributeHelper.getAttributes(returnValue, arguments, throwable));
+      double durationInSecond = getDurationInSecond(startNanoTime);
+      histogram.record(
+          durationInSecond, attributeHelper.getAttributes(returnValue, arguments, throwable));
     }
   }
 

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/timed/TimedExample.java

@@ -10,7 +10,6 @@
 import io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import io.opentelemetry.instrumentation.annotations.incubator.Timed;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
 public class TimedExample {
   public static final String METRIC_NAME = "name.duration";
@@ -23,11 +22,6 @@ public void exampleWithName() {}
   @Timed(value = "example.with.description.duration", description = METRIC_DESCRIPTION)
   public void exampleWithDescription() {}
 
-  @Timed(value = "example.with.unit.duration", unit = TimeUnit.MILLISECONDS)
-  public void exampleWithUnit() throws InterruptedException {
-    Thread.sleep(2000);
-  }
-
   @Timed("example.with.static.attributes.duration")
   @StaticAttribute(name = "key1", value = "value1")
   @StaticAttribute(name = "key2", value = "value2")

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/timed/TimedInstrumentationTest.java

@@ -41,21 +41,6 @@ void testExampleWithDescription() {
             metric.hasName("example.with.description.duration").hasDescription(METRIC_DESCRIPTION));
   }
 
-  @Test
-  void testExampleWithUnit() throws InterruptedException {
-    new TimedExample().exampleWithUnit();
-    testing.waitAndAssertMetrics(
-        TIMED_INSTRUMENTATION_NAME,
-        metric ->
-            metric
-                .hasName("example.with.unit.duration")
-                .hasUnit("ms")
-                .satisfies(
-                    metricData ->
-                        assertThat(metricData.getHistogramData().getPoints())
-                            .allMatch(p -> p.getMax() < 5000 && p.getMin() > 0)));
-  }
-
   @Test
   void testExampleWithStaticAttributes() {
     new TimedExample().exampleWithStaticAttributes();