Skip to content

Commit fff3cfe

Browse files
committed
Merge PR #277: [WIP] Update processors module to follow style guide
2 parents c9f85dc + 9bec733 commit fff3cfe

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

processors/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ java {
1111
targetCompatibility = JavaVersion.VERSION_1_8
1212
}
1313

14+
// AutoService plugin is applied by otel.java-conventions, but we need to declare the dependency
15+
// to use @AutoService annotation
16+
1417
dependencies {
18+
annotationProcessor("com.google.auto.service:auto-service")
19+
1520
api("io.opentelemetry:opentelemetry-sdk")
21+
compileOnly("com.google.auto.service:auto-service")
1622
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1723
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1824

processors/src/main/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanEventBridgeComponentProvider.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.eventbridge.internal;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
910
import io.opentelemetry.contrib.eventbridge.EventToSpanEventBridge;
1011
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
@@ -16,6 +17,8 @@
1617
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
1718
* at any time.
1819
*/
20+
@AutoService(ComponentProvider.class)
21+
@SuppressWarnings("rawtypes")
1922
public class EventToSpanEventBridgeComponentProvider
2023
implements ComponentProvider<LogRecordProcessor> {
2124

processors/src/main/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import io.opentelemetry.sdk.logs.data.LogRecordData;
1212
import java.util.function.Predicate;
1313

14-
public class FilteringLogRecordProcessor implements LogRecordProcessor {
14+
public final class FilteringLogRecordProcessor implements LogRecordProcessor {
1515

16-
public final LogRecordProcessor delegate;
17-
public final Predicate<LogRecordData> predicate;
16+
private final LogRecordProcessor delegate;
17+
private final Predicate<LogRecordData> predicate;
1818

1919
public FilteringLogRecordProcessor(
2020
LogRecordProcessor delegate, Predicate<LogRecordData> predicate) {

processors/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ public class FilteringLogRecordProcessorTest {
3535

3636
private final InMemoryLogRecordExporter memoryLogRecordExporter =
3737
InMemoryLogRecordExporter.create();
38-
;
3938
private final LogRecordProcessor logRecordProcessor =
4039
SimpleLogRecordProcessor.create(memoryLogRecordExporter);
41-
;
4240
private final InMemorySpanExporter spansExporter = InMemorySpanExporter.create();
4341
private AutoConfiguredOpenTelemetrySdkBuilder sdkBuilder;
4442
private Logger logger;
@@ -79,7 +77,7 @@ public SdkLoggerProviderBuilder apply(
7977
logRecordData -> {
8078
SpanContext spanContext = logRecordData.getSpanContext();
8179
return spanContext.isSampled();
82-
}) {})
80+
}))
8381
.build()
8482
.get("TestScope");
8583
}

0 commit comments

Comments
 (0)