slight change on annotations

Author: Duncan-tree-zhou

instrumentation-annotations/src/main/java/io/opentelemetry/instrumentation/annotations/Counted.java

@@ -41,9 +41,9 @@
    * <p>The name should follow the instrument naming rule: <a
    * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-naming-rule">https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-naming-rule</a>
    *
-   * <p>The default name is {@code method.invocations.total}.
+   * <p>The default name is {@code method.invocation.count}.
    */
-  String value() default "method.invocations.total";
+  String value() default "method.invocation.count";
 
   /**
    * Description of the instrument.
@@ -59,7 +59,7 @@
    * <p>Unit strings should follow the instrument unit rules: <a
    * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-unit">https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-unit</a>
    */
-  String unit() default "1";
+  String unit() default "{invocation}";
 
   /**
    * List of key-value pairs to supply additional attributes.

instrumentation-annotations/src/main/java/io/opentelemetry/instrumentation/annotations/MetricAttribute.java

@@ -31,6 +31,8 @@
    * <p>If not specified and the code is compiled using the `{@code -parameters}` argument to
    * `javac`, the parameter name will be used instead. If the parameter name is not available, e.g.,
    * because the code was not compiled with that flag, the attribute will be ignored.
+   *
+   * <p> Warning: be careful to fill it because it might cause an explosion of the cardinality on your metric
    */
   String value() default "";
 }

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

@@ -43,7 +43,7 @@
    *
    * <p>The default name is {@code method.invocations.duration}.
    */
-  String value() default "method.invocations.duration";
+  String value() default "method.invocation.duration";
 
   /**
    * Description for the instrument.
@@ -82,6 +82,8 @@
    * will be called on the return value to convert it to a String.
    *
    * <p>By default, the instrument will not have an attribute with the return value.
+   *
+   * <p>Warning: be careful to fill it because it might cause an explosion of the cardinality on your metric
    */
   String returnValueAttribute() default "";
 }

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java

@@ -7,14 +7,14 @@
 
 import static java.util.logging.Level.FINE;
 
-import application.io.opentelemetry.instrumentation.annotations.Counted;
-import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
-import application.io.opentelemetry.instrumentation.annotations.Timed;
-import io.opentelemetry.instrumentation.annotations.WithSpan;
-// import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
-// import
-// io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
-// import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Timed;
+//import application.io.opentelemetry.instrumentation.annotations.Counted;
+//import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
+//import application.io.opentelemetry.instrumentation.annotations.Timed;
+import application.io.opentelemetry.instrumentation.annotations.WithSpan;
+import io.opentelemetry.api.metrics.DoubleHistogram;
+import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
+import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
+import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Timed;
 import com.google.common.base.Stopwatch;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
@@ -46,7 +46,7 @@ public final class AnnotationSingletons {
       createInstrumenterWithAttributes();
   private static final SpanAttributesExtractor ATTRIBUTES = createAttributesExtractor();
 
-  private static final ConcurrentMap<String, LongHistogram> HISTOGRAMS =
+  private static final ConcurrentMap<String, DoubleHistogram> HISTOGRAMS =
       new ConcurrentHashMap<>();
 
   private static final ConcurrentMap<String, LongCounter> COUNTERS = new ConcurrentHashMap<>();
@@ -72,7 +72,7 @@ public static void recordHistogramWithAttributes(
     extractMetricAttributes(methodRequest, attributesBuilder);
     extractAdditionAttributes(timedAnnotation.additionalAttributes(), attributesBuilder);
     getHistogram(timedAnnotation)
-        .record(stopwatch.stop().elapsed().toMillis(), attributesBuilder.build());
+        .record(stopwatch.stop().elapsed().toMillis()/1000, attributesBuilder.build());
   }
 
   private static void extractMetricAttributes(
@@ -206,15 +206,14 @@ private static String spanNameFromMethod(Method method) {
     return spanName;
   }
 
-  private static LongHistogram getHistogram(Timed timedAnnotation) {
+  private static DoubleHistogram getHistogram(Timed timedAnnotation) {
     if (!HISTOGRAMS.containsKey(timedAnnotation.value())) {
       synchronized (timedAnnotation.value()) {
         if (!HISTOGRAMS.containsKey(timedAnnotation.value())) {
           HISTOGRAMS.put(
               timedAnnotation.value(),
               METER
                   .histogramBuilder(timedAnnotation.value())
-                  .ofLongs()
                   .setDescription(timedAnnotation.description())
                   .setUnit(timedAnnotation.unit())
                   .build());