change MetricsAttribute to Attritbute

Author: Duncan-tree-zhou

.fossa.yml

@@ -7,6 +7,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation-annotations'
+    - type: gradle
+      path: ./
+      target: ':instrumentation-annotations-incubator'
     - type: gradle
       path: ./
       target: ':instrumentation-annotations-support'
@@ -202,9 +205,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-extension-kotlin-1.0:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-instrumentation-api:javaagent'
@@ -763,6 +763,15 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-1.16:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-incubator:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

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

@@ -26,7 +26,7 @@
  */
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface MetricAttribute {
+public @interface Attribute {
 
   /**
    * Optional name of the attribute.

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/MetricAttributeForReturnValue.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/AttributeForReturnValue.java

@@ -26,7 +26,7 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface MetricAttributeForReturnValue {
+public @interface AttributeForReturnValue {
 
   /**
    * Attribute name for the return value.

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticMetricAttribute.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticAttribute.java

@@ -24,8 +24,8 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-@Repeatable(StaticMetricAttributes.class)
-public @interface StaticMetricAttribute {
+@Repeatable(StaticAttributes.class)
+public @interface StaticAttribute {
 
   /** Name of the attribute. */
   String name();

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticMetricAttributes.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticAttributes.java

@@ -23,8 +23,8 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface StaticMetricAttributes {
+public @interface StaticAttributes {
 
-  /** Array of {@link StaticMetricAttribute} annotations describing the added attributes. */
-  StaticMetricAttribute[] value();
+  /** Array of {@link StaticAttribute} annotations describing the added attributes. */
+  StaticAttribute[] value();
 }

instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/incubator/CountedUsageExamples.java

@@ -11,6 +11,5 @@ public class CountedUsageExamples {
   public void method() {}
 
   @Counted("methodWithAttributes")
-  public void attributes(
-      @MetricAttribute String attribute1, @MetricAttribute("attribute2") long attribute2) {}
+  public void attributes(@Attribute String attribute1, @Attribute("attribute2") long attribute2) {}
 }

instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/incubator/TimedUsageExamples.java

@@ -11,6 +11,5 @@ public class TimedUsageExamples {
   public void method() {}
 
   @Timed("methodWithAttributes")
-  public void attributes(
-      @MetricAttribute String attribute1, @MetricAttribute("attribute2") long attribute2) {}
+  public void attributes(@Attribute String attribute1, @Attribute("attribute2") long attribute2) {}
 }

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

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
 
-import application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute;
-import application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttributeForReturnValue;
-import application.io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
+import application.io.opentelemetry.instrumentation.annotations.incubator.Attribute;
+import application.io.opentelemetry.instrumentation.annotations.incubator.AttributeForReturnValue;
+import application.io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -38,16 +38,15 @@ static void addStaticAttributes(Method method, AttributesBuilder attributesBuild
         CodeIncubatingAttributes.CODE_NAMESPACE, method.getDeclaringClass().getName());
     attributesBuilder.put(CodeIncubatingAttributes.CODE_FUNCTION_NAME, method.getName());
 
-    StaticMetricAttribute[] staticMetricAttributes =
-        method.getDeclaredAnnotationsByType(StaticMetricAttribute.class);
-    for (StaticMetricAttribute staticMetricAttribute : staticMetricAttributes) {
-      attributesBuilder.put(staticMetricAttribute.name(), staticMetricAttribute.value());
+    StaticAttribute[] staticAttributes = method.getDeclaredAnnotationsByType(StaticAttribute.class);
+    for (StaticAttribute staticAttribute : staticAttributes) {
+      attributesBuilder.put(staticAttribute.name(), staticAttribute.value());
     }
   }
 
   @Nullable
   private static String attributeName(Parameter parameter) {
-    MetricAttribute annotation = parameter.getDeclaredAnnotation(MetricAttribute.class);
+    Attribute annotation = parameter.getDeclaredAnnotation(Attribute.class);
     if (annotation == null) {
       return null;
     }
@@ -68,8 +67,8 @@ static class MetricAttributeHelper {
 
     MetricAttributeHelper(Method method) {
       bindParameters = MethodBinder.bindParameters(method, PARAMETER_ATTRIBUTE_NAMES_EXTRACTOR);
-      MetricAttributeForReturnValue returnValueAttribute =
-          method.getAnnotation(MetricAttributeForReturnValue.class);
+      AttributeForReturnValue returnValueAttribute =
+          method.getAnnotation(AttributeForReturnValue.class);
       bindReturn =
           returnValueAttribute != null
               ? MethodBinder.bindReturnValue(method, returnValueAttribute.value())

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

@@ -9,7 +9,7 @@
 import static java.util.Arrays.asList;
 
 import application.io.opentelemetry.instrumentation.annotations.incubator.Counted;
-import application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute;
+import application.io.opentelemetry.instrumentation.annotations.incubator.Attribute;
 import application.io.opentelemetry.instrumentation.annotations.incubator.Timed;
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -19,7 +19,7 @@
 
 /**
  * Instrumentation for methods annotated with {@link Counted}, {@link Timed} and {@link
- * MetricAttribute} annotations.
+ * Attribute} annotations.
  */
 @AutoService(InstrumentationModule.class)
 public class MetricsAnnotationInstrumentationModule extends InstrumentationModule {

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/counted/CountedExample.java

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted;
 
+import io.opentelemetry.instrumentation.annotations.incubator.AttributeForReturnValue;
 import io.opentelemetry.instrumentation.annotations.incubator.Counted;
-import io.opentelemetry.instrumentation.annotations.incubator.MetricAttributeForReturnValue;
-import io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
+import io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import java.util.concurrent.CompletableFuture;
 
 public class CountedExample {
@@ -27,13 +27,13 @@ public void exampleWithDescription() {}
   public void exampleWithUnit() {}
 
   @Counted("example.with.attributes.count")
-  @StaticMetricAttribute(name = "key1", value = "value1")
-  @StaticMetricAttribute(name = "key2", value = "value2")
-  @StaticMetricAttribute(name = "key2", value = "value2")
+  @StaticAttribute(name = "key1", value = "value1")
+  @StaticAttribute(name = "key2", value = "value2")
+  @StaticAttribute(name = "key2", value = "value2")
   public void exampleWithAdditionalAttributes1() {}
 
   @Counted(value = "example.with.return.count")
-  @MetricAttributeForReturnValue("returnValue")
+  @AttributeForReturnValue("returnValue")
   public ReturnObject exampleWithReturnValueAttribute() {
     return new ReturnObject();
   }
@@ -47,7 +47,7 @@ public void exampleWithException() {
   public void exampleIgnore() {}
 
   @Counted(value = "example.completable.future.count")
-  @MetricAttributeForReturnValue("returnValue")
+  @AttributeForReturnValue("returnValue")
   public CompletableFuture<String> completableFuture(CompletableFuture<String> future) {
     return future;
   }

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

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed;
 
-import io.opentelemetry.instrumentation.annotations.incubator.MetricAttributeForReturnValue;
-import io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
+import io.opentelemetry.instrumentation.annotations.incubator.AttributeForReturnValue;
+import io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import io.opentelemetry.instrumentation.annotations.incubator.Timed;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -28,8 +28,8 @@ public void exampleWithUnit() throws InterruptedException {
   }
 
   @Timed("example.with.attributes.duration")
-  @StaticMetricAttribute(name = "key1", value = "value1")
-  @StaticMetricAttribute(name = "key2", value = "value2")
+  @StaticAttribute(name = "key1", value = "value1")
+  @StaticAttribute(name = "key2", value = "value2")
   public void exampleWithAdditionalAttributes1() {}
 
   @Timed("example.ignore.duration")
@@ -41,13 +41,13 @@ public void exampleWithException() {
   }
 
   @Timed(value = "example.with.return.duration")
-  @MetricAttributeForReturnValue("returnValue")
+  @AttributeForReturnValue("returnValue")
   public ReturnObject exampleWithReturnValueAttribute() {
     return new ReturnObject();
   }
 
   @Timed(value = "example.completable.future.duration")
-  @MetricAttributeForReturnValue("returnValue")
+  @AttributeForReturnValue("returnValue")
   public CompletableFuture<String> completableFuture(CompletableFuture<String> future) {
     return future;
   }