From 348c0bee99769cedbfd6d2f97d4ed47c4a3bdf90 Mon Sep 17 00:00:00 2001 From: Kamal Narayan Date: Fri, 17 Mar 2023 17:08:50 -0700 Subject: [PATCH] Address comments --- .../protobuf/OpenCensusProtobufReader.java | 4 ++-- ...eader.java => AbstractProtobufReader.java} | 6 +++--- .../OpenTelemetryMetricsProtobufReader.java | 4 ++-- ...penTelemetryTracesProtobufInputFormat.java | 20 +++++++++---------- .../OpenTelemetryTracesProtobufReader.java | 4 ++-- pom.xml | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) rename extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/{OpenXProtobufReader.java => AbstractProtobufReader.java} (94%) diff --git a/extensions-contrib/opencensus-extensions/src/main/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufReader.java b/extensions-contrib/opencensus-extensions/src/main/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufReader.java index bccb59cf098a..ad4f6a12df55 100644 --- a/extensions-contrib/opencensus-extensions/src/main/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufReader.java +++ b/extensions-contrib/opencensus-extensions/src/main/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufReader.java @@ -32,7 +32,7 @@ import org.apache.druid.data.input.MapBasedInputRow; import org.apache.druid.data.input.impl.ByteEntity; import org.apache.druid.data.input.impl.DimensionsSpec; -import org.apache.druid.data.input.opentelemetry.protobuf.OpenXProtobufReader; +import org.apache.druid.data.input.opentelemetry.protobuf.AbstractProtobufReader; import org.apache.druid.indexing.seekablestream.SettableByteEntity; import org.apache.druid.utils.CollectionUtils; @@ -44,7 +44,7 @@ import java.util.Map; import java.util.Set; -public class OpenCensusProtobufReader extends OpenXProtobufReader +public class OpenCensusProtobufReader extends AbstractProtobufReader { private static final String SEPARATOR = "-"; private static final String VALUE_COLUMN = "value"; diff --git a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/OpenXProtobufReader.java b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/AbstractProtobufReader.java similarity index 94% rename from extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/OpenXProtobufReader.java rename to extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/AbstractProtobufReader.java index b3924676b5e1..4b0ef07c9bf0 100644 --- a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/OpenXProtobufReader.java +++ b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/AbstractProtobufReader.java @@ -41,14 +41,14 @@ import java.util.Map; -public abstract class OpenXProtobufReader implements InputEntityReader +public abstract class AbstractProtobufReader implements InputEntityReader { protected final SettableByteEntity source; protected final DimensionsSpec dimensionsSpec; - public OpenXProtobufReader(DimensionsSpec dimensionsSpec, - SettableByteEntity source) + public AbstractProtobufReader(DimensionsSpec dimensionsSpec, + SettableByteEntity source) { this.dimensionsSpec = dimensionsSpec; this.source = source; diff --git a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/metrics/OpenTelemetryMetricsProtobufReader.java b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/metrics/OpenTelemetryMetricsProtobufReader.java index 20d1a3a1d916..e569000b00d7 100644 --- a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/metrics/OpenTelemetryMetricsProtobufReader.java +++ b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/metrics/OpenTelemetryMetricsProtobufReader.java @@ -27,7 +27,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.impl.ByteEntity; import org.apache.druid.data.input.impl.DimensionsSpec; -import org.apache.druid.data.input.opentelemetry.protobuf.OpenXProtobufReader; +import org.apache.druid.data.input.opentelemetry.protobuf.AbstractProtobufReader; import org.apache.druid.data.input.opentelemetry.protobuf.Utils; import org.apache.druid.indexing.seekablestream.SettableByteEntity; import org.apache.druid.java.util.common.logger.Logger; @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -public class OpenTelemetryMetricsProtobufReader extends OpenXProtobufReader +public class OpenTelemetryMetricsProtobufReader extends AbstractProtobufReader { private static final Logger log = new Logger(OpenTelemetryMetricsProtobufReader.class); private final String metricDimension; diff --git a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufInputFormat.java b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufInputFormat.java index 42b110f999bf..92d588ba09e5 100644 --- a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufInputFormat.java +++ b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufInputFormat.java @@ -122,12 +122,12 @@ private String validateDimensionName(String input, String dimensionName) if (!resourceAttributePrefix.isEmpty()) { Preconditions.checkArgument(!input.startsWith(resourceAttributePrefix), - " dimension name cannot start with resourceAttributePrefix"); + " cannot start with resourceAttributePrefix"); } if (!spanAttributePrefix.isEmpty()) { Preconditions.checkArgument(!input.startsWith(spanAttributePrefix), - " dimension name cannot start with spanAttributePrefix"); + " cannot start with spanAttributePrefix"); } return input; } @@ -150,21 +150,21 @@ public OpenTelemetryTracesProtobufInputFormat( this.resourceAttributePrefix = resourceAttributePrefix == null ? DEFAULT_RESOURCE_ATTR_PREFIX : resourceAttributePrefix; this.spanNameDimension = spanNameDimension == null ? DEFAULT_SPAN_NAME_DIMENSION : - validateDimensionName(spanNameDimension, "Span Name"); + validateDimensionName(spanNameDimension, "spanNameDimension"); this.spanIdDimension = spanIdDimension == null ? DEFAULT_SPAN_ID_DIMENSION : - validateDimensionName(spanIdDimension, "Span Id"); + validateDimensionName(spanIdDimension, "spanIdDimension"); this.parentSpanIdDimension = parentSpanIdDimension == null ? DEFAULT_PARENT_SPAN_ID_DIMENSION : - validateDimensionName(parentSpanIdDimension, "Parent Span Id"); + validateDimensionName(parentSpanIdDimension, "parentSpanIdDimension"); this.traceIdDimension = traceIdDimension == null ? DEFAULT_TRACE_ID_DIMENSION : - validateDimensionName(traceIdDimension, "Trace Id"); + validateDimensionName(traceIdDimension, "traceIdDimension"); this.endTimeDimension = endTimeDimension == null ? DEFAULT_END_TIME_DIMENSION : - validateDimensionName(endTimeDimension, "End Time"); + validateDimensionName(endTimeDimension, "endTimeDimension"); this.statusCodeDimension = statusCodeDimension == null ? DEFAULT_STATUS_CODE_DIMENSION : - validateDimensionName(statusCodeDimension, "Status Code"); + validateDimensionName(statusCodeDimension, "statusCodeDimension"); this.statusMessageDimension = statusMessageDimension == null ? DEFAULT_STATUS_MESSAGE_DIMENSION : - validateDimensionName(statusMessageDimension, "Status Message"); + validateDimensionName(statusMessageDimension, "statusMessageDimension"); this.kindDimension = kindDimension == null ? DEFAULT_KIND_DIMENSION : - validateDimensionName(kindDimension, "Kind"); + validateDimensionName(kindDimension, "kindDimension"); } diff --git a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufReader.java b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufReader.java index 5e5f36109fd3..339508de6f4a 100644 --- a/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufReader.java +++ b/extensions-contrib/opentelemetry-extensions/src/main/java/org/apache/druid/data/input/opentelemetry/protobuf/traces/OpenTelemetryTracesProtobufReader.java @@ -27,7 +27,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.impl.ByteEntity; import org.apache.druid.data.input.impl.DimensionsSpec; -import org.apache.druid.data.input.opentelemetry.protobuf.OpenXProtobufReader; +import org.apache.druid.data.input.opentelemetry.protobuf.AbstractProtobufReader; import org.apache.druid.data.input.opentelemetry.protobuf.Utils; import org.apache.druid.indexing.seekablestream.SettableByteEntity; @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -public class OpenTelemetryTracesProtobufReader extends OpenXProtobufReader +public class OpenTelemetryTracesProtobufReader extends AbstractProtobufReader { private final String spanAttributePrefix; private final String resourceAttributePrefix; diff --git a/pom.xml b/pom.xml index 7d0d385b4549..af65b1482cbe 100644 --- a/pom.xml +++ b/pom.xml @@ -212,9 +212,9 @@ extensions-contrib/aliyun-oss-extensions extensions-contrib/prometheus-emitter extensions-contrib/opentelemetry-emitter + extensions-contrib/opentelemetry-extensions extensions-contrib/opencensus-extensions extensions-contrib/confluent-extensions - extensions-contrib/opentelemetry-extensions distribution