Skip to content

Commit 33492e1

Browse files
otelbot[bot]trask
andauthored
Code review sweep (run 25199276408) (#18475)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent a88311e commit 33492e1

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/agents/knowledge/testing-general-patterns.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
`hasAttributesSatisfyingExactly(...)` in the same assertion chain, because the exact
8484
variant already validates the total attribute count. Remove the `hasTotalAttributeCount`
8585
call.
86+
- These rules apply to **span** attribute assertions only. Metric point assertions are
87+
different: metric point assertions do not have a `hasTotalAttributeCount(...)` method, so
88+
the span guidance about preferring `hasTotalAttributeCount(0)` for zero-attribute checks
89+
does not apply. For metric points, used `point.hasAttributes(Attributes.empty())` — it
90+
reads more clearly than the no-arg `hasAttributesSatisfyingExactly()` form.
8691
- For non-semconv attribute keys in `equalTo(...)`, use inline `AttributeKey` factory
8792
methods — `longKey("name")`, `stringKey("name")`, etc. — directly in the assertion.
8893
Do **not** extract them into class-level `private static final AttributeKey<T>` constants.

instrumentation/logback/logback-mdc-1.0/library/src/addBaggageTest/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/LogbackWithBaggageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class LogbackWithBaggageTest extends AbstractLogbackTest {
1313

1414
@RegisterExtension
15-
static InstrumentationExtension testing = LibraryInstrumentationExtension.create();
15+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1616

1717
@Override
1818
protected InstrumentationExtension getInstrumentationExtension() {

instrumentation/logback/logback-mdc-1.0/library/src/loggingKeysTest/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/LogbackWithLoggingKeysTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class LogbackWithLoggingKeysTest extends AbstractLogbackTest {
1313

1414
@RegisterExtension
15-
static InstrumentationExtension testing = LibraryInstrumentationExtension.create();
15+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1616

1717
@Override
1818
protected InstrumentationExtension getInstrumentationExtension() {

instrumentation/logback/logback-mdc-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/OpenTelemetryAppender.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
import java.util.HashMap;
2222
import java.util.Iterator;
2323
import java.util.Map;
24+
import javax.annotation.Nullable;
2425

2526
public class OpenTelemetryAppender extends UnsynchronizedAppenderBase<ILoggingEvent>
2627
implements AppenderAttachable<ILoggingEvent> {
27-
private static final Field MDC_MAP_FIELD;
28+
@Nullable private static final Field MDC_MAP_FIELD;
2829

2930
static {
3031
Field field;

instrumentation/logback/logback-mdc-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/LogbackTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class LogbackTest extends AbstractLogbackTest {
1717

1818
@RegisterExtension
19-
static InstrumentationExtension testing = LibraryInstrumentationExtension.create();
19+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
2020

2121
@Override
2222
protected InstrumentationExtension getInstrumentationExtension() {

instrumentation/micrometer/micrometer-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/TimeUnitParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
import static java.util.concurrent.TimeUnit.SECONDS;
1515
import static java.util.logging.Level.WARNING;
1616

17-
import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
1817
import java.util.Locale;
1918
import java.util.concurrent.TimeUnit;
2019
import java.util.logging.Logger;
2120
import javax.annotation.Nullable;
2221

2322
final class TimeUnitParser {
2423

25-
private static final Logger logger = Logger.getLogger(OpenTelemetryMeterRegistry.class.getName());
24+
private static final Logger logger = Logger.getLogger(TimeUnitParser.class.getName());
2625

2726
static TimeUnit parseConfigValue(@Nullable String value) {
2827
if (value == null) {

instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies {
2222
testLibrary("org.mongodb:mongodb-driver-reactivestreams:4.0.0")
2323

2424
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
25-
testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5")
2625

2726
testInstrumentation(project(":instrumentation:mongo:mongo-async-3.3:javaagent"))
2827
testInstrumentation(project(":instrumentation:mongo:mongo-3.1:javaagent"))

0 commit comments

Comments
 (0)