add metric annotation instrumentation

Author: Duncan-tree-zhou

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -25,10 +25,10 @@ Comparing source compatibility of  against
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW INTERFACE: java.lang.annotation.Annotation
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String[] attributes()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String[] additionalAttributes()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String description()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String returnValueAttribute()
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.concurrent.TimeUnit unit()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String unit()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
 	+++  NEW ANNOTATION: java.lang.annotation.Target
 		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.CONSTRUCTOR (+)

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

@@ -10,7 +10,7 @@
 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.instrumentation.annotations.WithSpan;
 // import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
 // import
 // io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
@@ -20,8 +20,8 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.internal.StringUtils;
-import io.opentelemetry.api.metrics.DoubleHistogram;
 import io.opentelemetry.api.metrics.LongCounter;
+import io.opentelemetry.api.metrics.LongHistogram;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.api.annotation.support.MethodSpanAttributesExtractor;
@@ -46,7 +46,7 @@ public final class AnnotationSingletons {
       createInstrumenterWithAttributes();
   private static final SpanAttributesExtractor ATTRIBUTES = createAttributesExtractor();
 
-  private static final ConcurrentMap<String, DoubleHistogram> HISTOGRAMS =
+  private static final ConcurrentMap<String, LongHistogram> HISTOGRAMS =
       new ConcurrentHashMap<>();
 
   private static final ConcurrentMap<String, LongCounter> COUNTERS = new ConcurrentHashMap<>();
@@ -206,14 +206,15 @@ private static String spanNameFromMethod(Method method) {
     return spanName;
   }
 
-  private static DoubleHistogram getHistogram(Timed timedAnnotation) {
+  private static LongHistogram 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());

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

@@ -8,14 +8,14 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 
-import application.io.opentelemetry.instrumentation.annotations.Counted;
+//import application.io.opentelemetry.instrumentation.annotations.Counted;
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@AutoService(CountedInstrumentationsModule.class)
+@AutoService(InstrumentationModule.class)
 public class CountedInstrumentationsModule extends InstrumentationModule {
 
   public CountedInstrumentationsModule() {

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

@@ -8,14 +8,14 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 
-import application.io.opentelemetry.instrumentation.annotations.Timed;
+//import application.io.opentelemetry.instrumentation.annotations.Timed;
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@AutoService(TimedInstrumentationsModule.class)
+@AutoService(InstrumentationModule.class)
 public class TimedInstrumentationsModule extends InstrumentationModule {
 
   public TimedInstrumentationsModule() {