Skip to content

Commit 9249653

Browse files
vasanttejavasantteja
authored
Adding model as suffix to generated classes. (#6721)
1 parent d899702 commit 9249653

File tree

48 files changed

+627
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+627
-603
lines changed

‎sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile(ConfigPrope
551551
Object model = parse.invoke(null, fis);
552552
Class<?> openTelemetryConfiguration =
553553
Class.forName(
554-
"io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfiguration");
554+
"io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel");
555555
Method create = configurationFactory.getMethod("create", openTelemetryConfiguration);
556556
OpenTelemetrySdk sdk = (OpenTelemetrySdk) create.invoke(null, model);
557557
Method toConfigProperties =

‎sdk-extensions/incubator/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ jsonSchema2Pojo {
100100
// Force java 9+ @Generated annotation, since java 8 @Generated annotation isn't detected by
101101
// jsonSchema2Pojo and annotation is skipped altogether
102102
targetVersion = "1.9"
103+
104+
// Append Model as suffix to the generated classes.
105+
classNameSuffix = "Model"
103106
}
104107

105108
val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo")

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactory.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
99
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
10-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Aggregation;
11-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Base2ExponentialBucketHistogram;
12-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogram;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel;
11+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Base2ExponentialBucketHistogramModel;
12+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramModel;
1313
import java.io.Closeable;
1414
import java.util.List;
1515

1616
final class AggregationFactory
17-
implements Factory<Aggregation, io.opentelemetry.sdk.metrics.Aggregation> {
17+
implements Factory<AggregationModel, io.opentelemetry.sdk.metrics.Aggregation> {
1818

1919
private static final AggregationFactory INSTANCE = new AggregationFactory();
2020

@@ -26,7 +26,7 @@ static AggregationFactory getInstance() {
2626

2727
@Override
2828
public io.opentelemetry.sdk.metrics.Aggregation create(
29-
Aggregation model, SpiHelper spiHelper, List<Closeable> closeables) {
29+
AggregationModel model, SpiHelper spiHelper, List<Closeable> closeables) {
3030
if (model.getDrop() != null) {
3131
return io.opentelemetry.sdk.metrics.Aggregation.drop();
3232
}
@@ -36,7 +36,7 @@ public io.opentelemetry.sdk.metrics.Aggregation create(
3636
if (model.getLastValue() != null) {
3737
return io.opentelemetry.sdk.metrics.Aggregation.lastValue();
3838
}
39-
Base2ExponentialBucketHistogram exponentialBucketHistogram =
39+
Base2ExponentialBucketHistogramModel exponentialBucketHistogram =
4040
model.getBase2ExponentialBucketHistogram();
4141
if (exponentialBucketHistogram != null) {
4242
Integer maxScale = exponentialBucketHistogram.getMaxScale();
@@ -54,7 +54,7 @@ public io.opentelemetry.sdk.metrics.Aggregation create(
5454
throw new ConfigurationException("Invalid exponential bucket histogram", e);
5555
}
5656
}
57-
ExplicitBucketHistogram explicitBucketHistogram = model.getExplicitBucketHistogram();
57+
ExplicitBucketHistogramModel explicitBucketHistogram = model.getExplicitBucketHistogram();
5858
if (explicitBucketHistogram != null) {
5959
List<Double> boundaries = explicitBucketHistogram.getBoundaries();
6060
if (boundaries == null) {

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributesFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import io.opentelemetry.api.common.AttributesBuilder;
1212
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
14-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Attributes;
14+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributesModel;
1515
import java.io.Closeable;
1616
import java.util.List;
1717

1818
final class AttributesFactory
19-
implements Factory<Attributes, io.opentelemetry.api.common.Attributes> {
19+
implements Factory<AttributesModel, io.opentelemetry.api.common.Attributes> {
2020

2121
private static final AttributesFactory INSTANCE = new AttributesFactory();
2222

@@ -28,7 +28,7 @@ static AttributesFactory getInstance() {
2828

2929
@Override
3030
public io.opentelemetry.api.common.Attributes create(
31-
Attributes model, SpiHelper spiHelper, List<Closeable> closeables) {
31+
AttributesModel model, SpiHelper spiHelper, List<Closeable> closeables) {
3232
AttributesBuilder builder = io.opentelemetry.api.common.Attributes.builder();
3333

3434
String serviceName = model.getServiceName();

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfiguration.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
1515
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1616
import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
17-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfiguration;
18-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Sampler;
17+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
18+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
1919
import java.io.Closeable;
2020
import java.io.IOException;
2121
import java.io.InputStream;
@@ -68,12 +68,12 @@ public final class FileConfiguration {
6868
private FileConfiguration() {}
6969

7070
/**
71-
* Combines {@link #parse(InputStream)} and {@link #create(OpenTelemetryConfiguration)}.
71+
* Combines {@link #parse(InputStream)} and {@link #create(OpenTelemetryConfigurationModel)}.
7272
*
7373
* @throws ConfigurationException if unable to parse or interpret
7474
*/
7575
public static OpenTelemetrySdk parseAndCreate(InputStream inputStream) {
76-
OpenTelemetryConfiguration configurationModel = parse(inputStream);
76+
OpenTelemetryConfigurationModel configurationModel = parse(inputStream);
7777
return create(configurationModel);
7878
}
7979

@@ -85,22 +85,22 @@ public static OpenTelemetrySdk parseAndCreate(InputStream inputStream) {
8585
* @return the {@link OpenTelemetrySdk}
8686
* @throws ConfigurationException if unable to interpret
8787
*/
88-
public static OpenTelemetrySdk create(OpenTelemetryConfiguration configurationModel) {
88+
public static OpenTelemetrySdk create(OpenTelemetryConfigurationModel configurationModel) {
8989
return createAndMaybeCleanup(
9090
OpenTelemetryConfigurationFactory.getInstance(),
9191
SpiHelper.create(FileConfiguration.class.getClassLoader()),
9292
configurationModel);
9393
}
9494

9595
/**
96-
* Parse the {@code configuration} YAML and return the {@link OpenTelemetryConfiguration}.
96+
* Parse the {@code configuration} YAML and return the {@link OpenTelemetryConfigurationModel}.
9797
*
9898
* <p>Before parsing, environment variable substitution is performed as described in {@link
9999
* EnvSubstitutionConstructor}.
100100
*
101101
* @throws ConfigurationException if unable to parse
102102
*/
103-
public static OpenTelemetryConfiguration parse(InputStream configuration) {
103+
public static OpenTelemetryConfigurationModel parse(InputStream configuration) {
104104
try {
105105
return parse(configuration, System.getenv());
106106
} catch (RuntimeException e) {
@@ -109,10 +109,10 @@ public static OpenTelemetryConfiguration parse(InputStream configuration) {
109109
}
110110

111111
// Visible for testing
112-
static OpenTelemetryConfiguration parse(
112+
static OpenTelemetryConfigurationModel parse(
113113
InputStream configuration, Map<String, String> environmentVariables) {
114114
Object yamlObj = loadYaml(configuration, environmentVariables);
115-
return MAPPER.convertValue(yamlObj, OpenTelemetryConfiguration.class);
115+
return MAPPER.convertValue(yamlObj, OpenTelemetryConfigurationModel.class);
116116
}
117117

118118
// Visible for testing
@@ -128,7 +128,8 @@ static Object loadYaml(InputStream inputStream, Map<String, String> environmentV
128128
* @param model the configuration model
129129
* @return a generic {@link StructuredConfigProperties} representation of the model
130130
*/
131-
public static StructuredConfigProperties toConfigProperties(OpenTelemetryConfiguration model) {
131+
public static StructuredConfigProperties toConfigProperties(
132+
OpenTelemetryConfigurationModel model) {
132133
return toConfigProperties((Object) model);
133134
}
134135

@@ -150,18 +151,18 @@ static StructuredConfigProperties toConfigProperties(Object model) {
150151
}
151152

152153
/**
153-
* Create a {@link Sampler} from the {@code samplerModel} representing the sampler config.
154+
* Create a {@link SamplerModel} from the {@code samplerModel} representing the sampler config.
154155
*
155156
* <p>This is used when samplers are composed, with one sampler accepting one or more additional
156157
* samplers as config properties. The {@link ComponentProvider} implementation can call this to
157-
* configure a delegate {@link Sampler} from the {@link StructuredConfigProperties} corresponding
158-
* to a particular config property.
158+
* configure a delegate {@link SamplerModel} from the {@link StructuredConfigProperties}
159+
* corresponding to a particular config property.
159160
*/
160161
// TODO(jack-berg): add create methods for all SDK extension components supported by
161162
// ComponentProvider
162163
public static io.opentelemetry.sdk.trace.samplers.Sampler createSampler(
163164
StructuredConfigProperties genericSamplerModel) {
164-
Sampler samplerModel = convertToModel(genericSamplerModel, Sampler.class);
165+
SamplerModel samplerModel = convertToModel(genericSamplerModel, SamplerModel.class);
165166
return createAndMaybeCleanup(
166167
SamplerFactory.getInstance(),
167168
SpiHelper.create(FileConfiguration.class.getClassLoader()),

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
99
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
10-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Selector;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SelectorModel;
1111
import io.opentelemetry.sdk.metrics.InstrumentSelector;
1212
import io.opentelemetry.sdk.metrics.InstrumentSelectorBuilder;
1313
import io.opentelemetry.sdk.metrics.InstrumentType;
1414
import java.io.Closeable;
1515
import java.util.List;
1616

17-
final class InstrumentSelectorFactory implements Factory<Selector, InstrumentSelector> {
17+
final class InstrumentSelectorFactory implements Factory<SelectorModel, InstrumentSelector> {
1818

1919
private static final InstrumentSelectorFactory INSTANCE = new InstrumentSelectorFactory();
2020

@@ -26,7 +26,7 @@ static InstrumentSelectorFactory getInstance() {
2626

2727
@Override
2828
public InstrumentSelector create(
29-
Selector model, SpiHelper spiHelper, List<Closeable> closeables) {
29+
SelectorModel model, SpiHelper spiHelper, List<Closeable> closeables) {
3030
InstrumentSelectorBuilder builder = InstrumentSelector.builder();
3131
if (model.getInstrumentName() != null) {
3232
builder.setName(model.getInstrumentName());

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.sdk.extension.incubator.fileconfig;
77

88
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
9-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimits;
10-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimits;
9+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel;
1111
import io.opentelemetry.sdk.logs.LogLimits;
1212
import io.opentelemetry.sdk.logs.LogLimitsBuilder;
1313
import java.io.Closeable;
@@ -28,7 +28,7 @@ public LogLimits create(
2828
LogRecordLimitsAndAttributeLimits model, SpiHelper spiHelper, List<Closeable> closeables) {
2929
LogLimitsBuilder builder = LogLimits.builder();
3030

31-
AttributeLimits attributeLimitsModel = model.getAttributeLimits();
31+
AttributeLimitsModel attributeLimitsModel = model.getAttributeLimits();
3232
if (attributeLimitsModel != null) {
3333
if (attributeLimitsModel.getAttributeCountLimit() != null) {
3434
builder.setMaxNumberOfAttributes(attributeLimitsModel.getAttributeCountLimit());
@@ -38,7 +38,7 @@ public LogLimits create(
3838
}
3939
}
4040

41-
LogRecordLimits logRecordLimitsModel = model.getLogRecordLimits();
41+
LogRecordLimitsModel logRecordLimitsModel = model.getLogRecordLimits();
4242
if (logRecordLimitsModel != null) {
4343
if (logRecordLimitsModel.getAttributeCountLimit() != null) {
4444
builder.setMaxNumberOfAttributes(logRecordLimitsModel.getAttributeCountLimit());

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactory.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99

1010
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
12-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Otlp;
12+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
13+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpModel;
1314
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
1415
import java.io.Closeable;
1516
import java.util.List;
1617
import java.util.Map;
1718

18-
final class LogRecordExporterFactory
19-
implements Factory<
20-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporter,
21-
LogRecordExporter> {
19+
final class LogRecordExporterFactory implements Factory<LogRecordExporterModel, LogRecordExporter> {
2220

2321
private static final LogRecordExporterFactory INSTANCE = new LogRecordExporterFactory();
2422

@@ -30,10 +28,8 @@ static LogRecordExporterFactory getInstance() {
3028

3129
@Override
3230
public LogRecordExporter create(
33-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporter model,
34-
SpiHelper spiHelper,
35-
List<Closeable> closeables) {
36-
Otlp otlpModel = model.getOtlp();
31+
LogRecordExporterModel model, SpiHelper spiHelper, List<Closeable> closeables) {
32+
OtlpModel otlpModel = model.getOtlp();
3733
if (otlpModel != null) {
3834
model.getAdditionalProperties().put("otlp", otlpModel);
3935
}

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordLimitsAndAttributeLimits.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
package io.opentelemetry.sdk.extension.incubator.fileconfig;
77

88
import com.google.auto.value.AutoValue;
9-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimits;
10-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimits;
9+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel;
1111
import javax.annotation.Nullable;
1212

1313
@AutoValue
1414
abstract class LogRecordLimitsAndAttributeLimits {
1515

1616
static LogRecordLimitsAndAttributeLimits create(
17-
@Nullable AttributeLimits attributeLimits, @Nullable LogRecordLimits spanLimits) {
17+
@Nullable AttributeLimitsModel attributeLimits, @Nullable LogRecordLimitsModel spanLimits) {
1818
return new AutoValue_LogRecordLimitsAndAttributeLimits(attributeLimits, spanLimits);
1919
}
2020

2121
@Nullable
22-
abstract AttributeLimits getAttributeLimits();
22+
abstract AttributeLimitsModel getAttributeLimits();
2323

2424
@Nullable
25-
abstract LogRecordLimits getLogRecordLimits();
25+
abstract LogRecordLimitsModel getLogRecordLimits();
2626
}

‎sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99

1010
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
12-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporter;
12+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel;
13+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
14+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel;
15+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel;
1316
import io.opentelemetry.sdk.logs.LogRecordProcessor;
1417
import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
1518
import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessorBuilder;
@@ -20,9 +23,7 @@
2023
import java.util.Map;
2124

2225
final class LogRecordProcessorFactory
23-
implements Factory<
24-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessor,
25-
LogRecordProcessor> {
26+
implements Factory<LogRecordProcessorModel, LogRecordProcessor> {
2627

2728
private static final LogRecordProcessorFactory INSTANCE = new LogRecordProcessorFactory();
2829

@@ -34,13 +35,10 @@ static LogRecordProcessorFactory getInstance() {
3435

3536
@Override
3637
public LogRecordProcessor create(
37-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessor model,
38-
SpiHelper spiHelper,
39-
List<Closeable> closeables) {
40-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessor
41-
batchModel = model.getBatch();
38+
LogRecordProcessorModel model, SpiHelper spiHelper, List<Closeable> closeables) {
39+
BatchLogRecordProcessorModel batchModel = model.getBatch();
4240
if (batchModel != null) {
43-
LogRecordExporter exporterModel =
41+
LogRecordExporterModel exporterModel =
4442
FileConfigUtil.requireNonNull(
4543
batchModel.getExporter(), "batch log record processor exporter");
4644

@@ -62,10 +60,9 @@ public LogRecordProcessor create(
6260
return FileConfigUtil.addAndReturn(closeables, builder.build());
6361
}
6462

65-
io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessor
66-
simpleModel = model.getSimple();
63+
SimpleLogRecordProcessorModel simpleModel = model.getSimple();
6764
if (simpleModel != null) {
68-
LogRecordExporter exporterModel =
65+
LogRecordExporterModel exporterModel =
6966
FileConfigUtil.requireNonNull(
7067
simpleModel.getExporter(), "simple log record processor exporter");
7168
io.opentelemetry.sdk.logs.export.LogRecordExporter logRecordExporter =

0 commit comments

Comments
 (0)