Skip to content

Commit e19d99c

Browse files
slight change on annotations
1 parent 65403e2 commit e19d99c

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
* `javac`, the parameter name will be used instead. If the parameter name is not available, e.g.,
3333
* because the code was not compiled with that flag, the attribute will be ignored.
3434
*
35-
* <p> Warning: be careful to fill it because it might cause an explosion of the cardinality on your metric
35+
* <p>Warning: be careful to fill it because it might cause an explosion of the cardinality on
36+
* your metric
3637
*/
3738
String value() default "";
3839
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
*
8484
* <p>By default, the instrument will not have an attribute with the return value.
8585
*
86-
* <p>Warning: be careful to fill it because it might cause an explosion of the cardinality on your metric
86+
* <p>Warning: be careful to fill it because it might cause an explosion of the cardinality on
87+
* your metric
8788
*/
8889
String returnValueAttribute() default "";
8990
}

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

+5-10
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@
1111
import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
1212
import application.io.opentelemetry.instrumentation.annotations.Timed;
1313
import application.io.opentelemetry.instrumentation.annotations.WithSpan;
14-
import io.opentelemetry.api.metrics.DoubleHistogram;
15-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
16-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
17-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Timed;
1814
import com.google.common.base.Stopwatch;
1915
import io.opentelemetry.api.GlobalOpenTelemetry;
2016
import io.opentelemetry.api.common.Attributes;
2117
import io.opentelemetry.api.common.AttributesBuilder;
2218
import io.opentelemetry.api.internal.StringUtils;
19+
import io.opentelemetry.api.metrics.DoubleHistogram;
2320
import io.opentelemetry.api.metrics.LongCounter;
2421
import io.opentelemetry.api.metrics.Meter;
2522
import io.opentelemetry.api.trace.SpanKind;
@@ -70,9 +67,8 @@ public static void recordHistogramWithAttributes(
7067
AttributesBuilder attributesBuilder = Attributes.builder();
7168
extractMetricAttributes(methodRequest, attributesBuilder);
7269
extractAdditionAttributes(timedAnnotation.additionalAttributes(), attributesBuilder);
73-
double duration = ((double)stopwatch.stop().elapsed().toMillis())/1000;
74-
getHistogram(timedAnnotation)
75-
.record(duration, attributesBuilder.build());
70+
double duration = ((double) stopwatch.stop().elapsed().toMillis()) / 1000;
71+
getHistogram(timedAnnotation).record(duration, attributesBuilder.build());
7672
}
7773

7874
private static void extractMetricAttributes(
@@ -98,9 +94,8 @@ public static void recordHistogram(Method method, Stopwatch stopwatch) {
9894
Timed timedAnnotation = method.getAnnotation(Timed.class);
9995
AttributesBuilder attributesBuilder = Attributes.builder();
10096
extractAdditionAttributes(timedAnnotation.additionalAttributes(), attributesBuilder);
101-
double duration = ((double)stopwatch.stop().elapsed().toMillis())/1000;
102-
getHistogram(timedAnnotation)
103-
.record(duration, attributesBuilder.build());
97+
double duration = ((double) stopwatch.stop().elapsed().toMillis()) / 1000;
98+
getHistogram(timedAnnotation).record(duration, attributesBuilder.build());
10499
}
105100

106101
private static void extractAdditionAttributes(

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

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
1010

11-
//import application.io.opentelemetry.instrumentation.annotations.Counted;
1211
import com.google.auto.service.AutoService;
1312
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1413
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

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

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
1010

11-
//import application.io.opentelemetry.instrumentation.annotations.Timed;
1211
import com.google.auto.service.AutoService;
1312
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1413
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

0 commit comments

Comments
 (0)