Skip to content

Commit 2059c4f

Browse files
committed
Fix doclint errors and enable doclint
Signed-off-by: Felix Barnsteiner <[email protected]>
1 parent aeb50e3 commit 2059c4f

File tree

33 files changed

+115
-132
lines changed

33 files changed

+115
-132
lines changed

apm-agent-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<modelVersion>4.0.0</modelVersion>
99

1010
<artifactId>apm-agent-api</artifactId>
11-
<name>${groupId}:${artifactId}</name>
11+
<name>${project.groupId}:${project.artifactId}</name>
1212

1313

1414
</project>

apm-agent-api/src/main/java/co/elastic/apm/api/ElasticApm.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,13 +29,12 @@
2929
* <pre>{@code
3030
* private static final ElasticApm elasticApm = ElasticApm.get();
3131
* }</pre>
32-
* <p>
32+
*
3333
* Then you can access the tracer to set a custom transaction name,
3434
* for example:
3535
* <pre>{@code
3636
* elasticApm.currentTransaction().setName("SuchController#muchMethod");
3737
* }</pre>
38-
* <p/>
3938
*/
4039
public class ElasticApm implements Tracer {
4140

@@ -55,7 +54,7 @@ private ElasticApm() {
5554
/**
5655
* Returns the tracer implementation.
5756
*
58-
* @return the tracer implementation (never <code>null</code>)
57+
* @return the tracer implementation (never {@code null})
5958
*/
6059
@Nonnull
6160
public static ElasticApm get() {
@@ -69,7 +68,7 @@ public static ElasticApm get() {
6968
* This method is called by the actual {@link Tracer} implementation.
7069
* </p>
7170
* <p>
72-
* Users are not supposed to set a custom instrumentation so this method must not be <code>public</code>.
71+
* Users are not supposed to set a custom instrumentation so this method must not be {@code public}.
7372
* Otherwise it would be part of the public API.
7473
* </p>
7574
* <p>
@@ -108,10 +107,10 @@ public Transaction startTransaction() {
108107
* Returns the currently running transaction.
109108
* <p>
110109
* If there is no current transaction, this method will return a noop transaction,
111-
* which means that you never have to check for <code>null</code> values.
110+
* which means that you never have to check for {@code null} values.
112111
* </p>
113112
*
114-
* @return The currently running transaction, or a noop transaction (never <code>null</code>).
113+
* @return The currently running transaction, or a noop transaction (never {@code null}).
115114
*/
116115
@Override
117116
@Nonnull
@@ -124,10 +123,10 @@ public Transaction currentTransaction() {
124123
* Returns the currently running span.
125124
* <p>
126125
* If there is no current span, this method will return a noop span,
127-
* which means that you never have to check for <code>null</code> values.
126+
* which means that you never have to check for {@code null} values.
128127
* </p>
129128
*
130-
* @return The currently running span, or a noop span (never <code>null</code>).
129+
* @return The currently running span, or a noop span (never {@code null}).
131130
*/
132131
@Override
133132
@Nonnull

apm-agent-api/src/main/java/co/elastic/apm/api/Tracer.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@ public interface Tracer {
6363
/**
6464
* Returns the currently active span
6565
*
66-
* @return The currently active span.
66+
* @return the currently active span
6767
*/
6868
@Nullable
6969
Span currentSpan();
@@ -82,12 +82,16 @@ public interface Tracer {
8282
* // do your thing...
8383
* }
8484
* </pre>
85+
*
86+
* @return the started span
8587
*/
8688
@Nonnull
8789
Span startSpan();
8890

8991
/**
9092
* Captures an exception and reports it to the APM server.
93+
*
94+
* @param e the exception to record
9195
*/
9296
void captureException(@Nonnull Exception e);
9397
}

apm-agent-api/src/main/java/co/elastic/apm/api/Transaction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -79,9 +79,9 @@ public interface Transaction extends AutoCloseable {
7979
* If an error is captured, the context from the active transaction is used as context for the captured error.
8080
* </p>
8181
*
82-
* @param id The user's id or <code>null</code>, if not applicable.
83-
* @param email The user's email address or <code>null</code>, if not applicable.
84-
* @param username The user's name or <code>null</code>, if not applicable.
82+
* @param id The user's id or {@code null}, if not applicable.
83+
* @param email The user's email address or {@code null}, if not applicable.
84+
* @param username The user's name or {@code null}, if not applicable.
8585
*/
8686
void setUser(String id, String email, String username);
8787

apm-agent-benchmarks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99

1010
<artifactId>apm-agent-benchmarks</artifactId>
11-
<name>${groupId}:${artifactId}</name>
11+
<name>${project.groupId}:${project.artifactId}</name>
1212
<packaging>jar</packaging>
1313

1414

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/AbstractHttpJacksonReporterBenchmark.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,8 +36,8 @@ public abstract class AbstractHttpJacksonReporterBenchmark extends AbstractHttpR
3636
/**
3737
* Convenience benchmark run method
3838
* <p>
39-
* For more accurate results, execute <code>mvn clean package</code> and run the benchmark via
40-
* <code>java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc</code>
39+
* For more accurate results, execute {@code mvn clean package} and run the benchmark via
40+
* {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
4141
*/
4242
public static void main(String[] args) throws RunnerException {
4343
new Runner(new OptionsBuilder()

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/HttpCborJacksonReporterBenchmark.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,8 +32,8 @@ public class HttpCborJacksonReporterBenchmark extends AbstractHttpJacksonReporte
3232
/**
3333
* Convenience benchmark run method
3434
* <p>
35-
* For more accurate results, execute <code>mvn clean package</code> and run the benchmark via
36-
* <code>java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc</code>
35+
* For more accurate results, execute {@code mvn clean package} and run the benchmark via
36+
* {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
3737
*/
3838
public static void main(String[] args) throws RunnerException {
3939
new Runner(new OptionsBuilder()

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/HttpMoshiReporterBenchmark.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,8 +31,8 @@ public class HttpMoshiReporterBenchmark extends AbstractHttpReporterBenchmark {
3131
/**
3232
* Convenience benchmark run method
3333
* <p>
34-
* For more accurate results, execute <code>mvn clean package</code> and run the benchmark via
35-
* <code>java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc</code>
34+
* For more accurate results, execute {@code mvn clean package} and run the benchmark via
35+
* {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
3636
*/
3737
public static void main(String[] args) throws RunnerException {
3838
new Runner(new OptionsBuilder()

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/HttpNoopJsonReporterBenchmark.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,8 +30,8 @@ public class HttpNoopJsonReporterBenchmark extends AbstractHttpReporterBenchmark
3030
/**
3131
* Convenience benchmark run method
3232
* <p>
33-
* For more accurate results, execute <code>mvn clean package</code> and run the benchmark via
34-
* <code>java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc</code>
33+
* For more accurate results, execute {@code mvn clean package} and run the benchmark via
34+
* {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
3535
*/
3636
public static void main(String[] args) throws RunnerException {
3737
new Runner(new OptionsBuilder()

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/HttpVanillaJacksonReporterBenchmark.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,8 +31,8 @@ public class HttpVanillaJacksonReporterBenchmark extends AbstractHttpJacksonRepo
3131
/**
3232
* Convenience benchmark run method
3333
* <p>
34-
* For more accurate results, execute <code>mvn clean package</code> and run the benchmark via
35-
* <code>java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc</code>
34+
* For more accurate results, execute {@code mvn clean package} and run the benchmark via
35+
* {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
3636
*/
3737
public static void main(String[] args) throws RunnerException {
3838
new Runner(new OptionsBuilder()

0 commit comments

Comments
 (0)