Skip to content

Commit 216c9a3

Browse files
authored
Convert Android log substituation function to Kotlin (#1179)
* Convert Android log substituation function to Kotlin * Remove new detekt rules and update baseline exceptions
1 parent 565f728 commit 216c9a3

File tree

13 files changed

+292
-241
lines changed

13 files changed

+292
-241
lines changed

core/config/detekt/baseline.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,5 @@
1515
<ID>MagicNumber:DiskBufferingConfig.kt$DiskBufferingConfig.Companion$5</ID>
1616
<ID>MagicNumber:DiskManager.kt$DiskManager$3</ID>
1717
<ID>MagicNumber:SignalFromDiskExporter.kt$SignalFromDiskExporter$5</ID>
18-
<ID>MaxLineLength:BufferDelegatingLogExporter.kt$BufferDelegatingLogExporter$*</ID>
19-
<ID>MaxLineLength:BufferDelegatingMetricExporter.kt$BufferDelegatingMetricExporter$private var aggregationTemporalitySelector: AggregationTemporalitySelector = AggregationTemporalitySelector.alwaysCumulative()</ID>
20-
<ID>MaxLineLength:DiskBufferingConfig.kt$DiskBufferingConfig.Companion$Log.w(OTEL_RUM_LOG_TAG, "overriding minFileAgeForReadMillis from $minFileAgeForReadMillis to $minRead")</ID>
21-
<ID>MaxLineLength:GlobalAttributesSpanAppender.kt$GlobalAttributesSpanAppender$*</ID>
22-
<ID>MaxLineLength:GlobalAttributesSpanAppenderTest.kt$GlobalAttributesSpanAppenderTest$every { originalSupplier.get() } returns attrs andThenThrows RuntimeException("Should not have been called again.")</ID>
23-
<ID>MaxLineLength:NetworkAttributesSpanAppender.kt$NetworkAttributesSpanAppender.Companion$fun</ID>
24-
<ID>MaxLineLength:SessionIdRatioBasedSampler.kt$SessionIdRatioBasedSampler$*</ID>
25-
<ID>MaxLineLength:SignalFromDiskExporter.kt$SignalFromDiskExporter$*</ID>
2618
</CurrentIssues>
2719
</SmellBaseline>

instrumentation/android-instrumentation/config/detekt/baseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<SmellBaseline>
33
<ManuallySuppressedIssues/>
44
<CurrentIssues>
5-
<ID>MaxLineLength:AndroidInstrumentation.kt$AndroidInstrumentation$*</ID>
65
<ID>UseCheckOrError:AndroidInstrumentationLoaderImpl.kt$AndroidInstrumentationLoaderImpl$throw IllegalStateException("Instrumentation with type '${instrumentation::class.java}' already exists.")</ID>
76
</CurrentIssues>
87
</SmellBaseline>

instrumentation/android-log/library/api/library.api

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ public final class io/opentelemetry/instrumentation/library/log/AndroidLogInstru
44
public fun install (Lio/opentelemetry/android/instrumentation/InstallationContext;)V
55
}
66

7-
public class io/opentelemetry/instrumentation/library/log/AndroidLogSubstitutions {
8-
public static field TAG_KEY Lio/opentelemetry/api/common/AttributeKey;
9-
public fun <init> ()V
10-
public static fun substitutionForDebug (Ljava/lang/String;Ljava/lang/String;)I
11-
public static fun substitutionForDebug2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
12-
public static fun substitutionForError (Ljava/lang/String;Ljava/lang/String;)I
13-
public static fun substitutionForError2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
14-
public static fun substitutionForInfo (Ljava/lang/String;Ljava/lang/String;)I
15-
public static fun substitutionForInfo2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
16-
public static fun substitutionForVerbose (Ljava/lang/String;Ljava/lang/String;)I
17-
public static fun substitutionForVerbose2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
18-
public static fun substitutionForWarn (Ljava/lang/String;Ljava/lang/String;)I
19-
public static fun substitutionForWarn2 (Ljava/lang/String;Ljava/lang/Throwable;)I
20-
public static fun substitutionForWarn3 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
21-
public static fun substitutionForWtf (Ljava/lang/String;Ljava/lang/String;)I
22-
public static fun substitutionForWtf2 (Ljava/lang/String;Ljava/lang/Throwable;)I
23-
public static fun substitutionForWtf3 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
7+
public final class io/opentelemetry/instrumentation/library/log/AndroidLogSubstitutions {
8+
public static final field INSTANCE Lio/opentelemetry/instrumentation/library/log/AndroidLogSubstitutions;
9+
public final fun getTagKey ()Lio/opentelemetry/api/common/AttributeKey;
10+
public static final fun substitutionForDebug (Ljava/lang/String;Ljava/lang/String;)I
11+
public static final fun substitutionForDebug2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
12+
public static final fun substitutionForError (Ljava/lang/String;Ljava/lang/String;)I
13+
public static final fun substitutionForError2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
14+
public static final fun substitutionForInfo (Ljava/lang/String;Ljava/lang/String;)I
15+
public static final fun substitutionForInfo2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
16+
public static final fun substitutionForVerbose (Ljava/lang/String;Ljava/lang/String;)I
17+
public static final fun substitutionForVerbose2 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
18+
public static final fun substitutionForWarn (Ljava/lang/String;Ljava/lang/String;)I
19+
public static final fun substitutionForWarn2 (Ljava/lang/String;Ljava/lang/Throwable;)I
20+
public static final fun substitutionForWarn3 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
21+
public static final fun substitutionForWtf (Ljava/lang/String;Ljava/lang/String;)I
22+
public static final fun substitutionForWtf2 (Ljava/lang/String;Ljava/lang/Throwable;)I
23+
public static final fun substitutionForWtf3 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2424
}
2525

2626
public final class io/opentelemetry/instrumentation/library/log/internal/LogRecordBuilderCreator {
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" ?>
2+
<SmellBaseline>
3+
<ManuallySuppressedIssues/>
4+
<CurrentIssues>
5+
<ID>TooManyFunctions:AndroidLogSubstitutions.kt$AndroidLogSubstitutions</ID>
6+
</CurrentIssues>
7+
</SmellBaseline>

instrumentation/android-log/library/src/main/java/io/opentelemetry/instrumentation/library/log/AndroidLogSubstitutions.java

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)