Skip to content

Commit 15bd160

Browse files
jack-bergjack-berg
committed
changes as of 1/15/25
1 parent 83a09a1 commit 15bd160

File tree

13 files changed

+51
-42
lines changed

13 files changed

+51
-42
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ dependencies {
6060
// it was needed after 0.3.0 release because file_format in the examples weren't updated prior to the release tag
6161
// val configurationTag = "0.3.0"
6262
// val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA to point to experiment with a specific commit
63-
val configurationRef = "44cf609538b0d55f29cbb55aee9cfce1e66804b8"
64-
val configurationRepoZip = "https://github.com/jack-berg/opentelemetry-configuration/archive/$configurationRef.zip"
63+
val configurationRef = "041ff2539bbdf2bf71f27305da83cde90968eff7"
64+
val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
6565
val buildDirectory = layout.buildDirectory.asFile.get()
6666

6767
val downloadConfigurationSchema by tasks.registering(Download::class) {

‎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.SelectorModel;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel;
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<SelectorModel, InstrumentSelector> {
17+
final class InstrumentSelectorFactory implements Factory<ViewSelectorModel, 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-
SelectorModel model, SpiHelper spiHelper, List<Closeable> closeables) {
29+
ViewSelectorModel 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/LogRecordExporterFactory.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
1212
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
1313
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
14+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpFileExporterModel;
1415
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel;
1516
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel;
1617
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
@@ -35,11 +36,14 @@ public LogRecordExporter create(
3536
if (otlpHttpModel != null) {
3637
model.getAdditionalProperties().put("otlp_http", otlpHttpModel);
3738
}
38-
3939
OtlpGrpcExporterModel otlpGrpcModel = model.getOtlpGrpc();
4040
if (otlpGrpcModel != null) {
4141
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4242
}
43+
OtlpFileExporterModel otlpFileExporterModel = model.getOtlpFile();
44+
if (model.getOtlpFile() != null) {
45+
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
46+
}
4347

4448
ConsoleExporterModel consoleModel = model.getConsole();
4549
if (consoleModel != null) {
@@ -67,7 +71,7 @@ public LogRecordExporter create(
6771
exporterKeyValue.getValue());
6872
return FileConfigUtil.addAndReturn(closeables, logRecordExporter);
6973
} else {
70-
throw new ConfigurationException("log exporter must be set");
74+
throw new ConfigurationException("log record exporter must be set");
7175
}
7276
}
7377
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1111
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel;
1212
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel;
13-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SelectorModel;
14-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.StreamModel;
1513
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel;
14+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel;
15+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel;
1616
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
1717
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
1818
import io.opentelemetry.sdk.metrics.export.MetricReader;
@@ -50,8 +50,8 @@ public SdkMeterProviderBuilder create(
5050
if (viewModels != null) {
5151
viewModels.forEach(
5252
viewModel -> {
53-
SelectorModel selector = requireNonNull(viewModel.getSelector(), "view selector");
54-
StreamModel stream = requireNonNull(viewModel.getStream(), "view stream");
53+
ViewSelectorModel selector = requireNonNull(viewModel.getSelector(), "view selector");
54+
ViewStreamModel stream = requireNonNull(viewModel.getStream(), "view stream");
5555
builder.registerView(
5656
InstrumentSelectorFactory.getInstance().create(selector, spiHelper, closeables),
5757
ViewFactory.getInstance().create(stream, spiHelper, closeables));

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
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.OtlpFileMetricExporterModel;
1213
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcMetricExporterModel;
1314
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel;
1415
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel;
@@ -38,6 +39,10 @@ public MetricExporter create(
3839
if (otlpGrpcModel != null) {
3940
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4041
}
42+
OtlpFileMetricExporterModel otlpFileExporterModel = model.getOtlpFile();
43+
if (model.getOtlpFile() != null) {
44+
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
45+
}
4146

4247
if (model.getConsole() != null) {
4348
model.getAdditionalProperties().put("console", model.getConsole());

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
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.OtlpFileExporterModel;
1213
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel;
1314
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel;
1415
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
@@ -39,6 +40,10 @@ public SpanExporter create(
3940
if (otlpGrpcModel != null) {
4041
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4142
}
43+
OtlpFileExporterModel otlpFileExporterModel = model.getOtlpFile();
44+
if (model.getOtlpFile() != null) {
45+
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
46+
}
4247

4348
if (model.getConsole() != null) {
4449
model.getAdditionalProperties().put("console", model.getConsole());

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

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

88
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
99
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel;
10-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.StreamModel;
10+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel;
1111
import io.opentelemetry.sdk.metrics.View;
1212
import io.opentelemetry.sdk.metrics.ViewBuilder;
1313
import java.io.Closeable;
@@ -16,7 +16,7 @@
1616
import java.util.Set;
1717
import javax.annotation.Nullable;
1818

19-
final class ViewFactory implements Factory<StreamModel, View> {
19+
final class ViewFactory implements Factory<ViewStreamModel, View> {
2020

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

@@ -27,7 +27,7 @@ static ViewFactory getInstance() {
2727
}
2828

2929
@Override
30-
public View create(StreamModel model, SpiHelper spiHelper, List<Closeable> closeables) {
30+
public View create(ViewStreamModel model, SpiHelper spiHelper, List<Closeable> closeables) {
3131
ViewBuilder builder = View.builder();
3232
if (model.getName() != null) {
3333
builder.setName(model.getName());

‎sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationCreateTest.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,8 @@ void parseAndCreate_Examples(@TempDir Path tempDir)
6464
assertThat(examplesDir.isDirectory()).isTrue();
6565

6666
for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
67-
// Skip anchors.yaml because support for merge (i.e. "<<: *anchor") was explicitly removed in
68-
// snakeyaml-engine:
69-
// https://bitbucket.org/snakeyaml/snakeyaml-engine/issues/18/merge-tag-support
70-
// As discussed in this issue merge is supported in snakeyaml:
71-
// https://bitbucket.org/snakeyaml/snakeyaml-engine/issues/14/read-in-yaml-with-merge-then-dump-strips
72-
// TODO(jack-berg): decide if we should try to support anchors, or remove anchors example from
73-
// opentelemetry-configuration
74-
if (example.getName().equals("anchors.yaml")) {
67+
// TODO: remove once support is added for otlp_file exporters
68+
if (example.getName().equals("kitchen-sink.yaml")) {
7569
continue;
7670
}
7771

‎sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigurationParseTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@
4747
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel;
4848
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel;
4949
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
50-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SelectorModel;
5150
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ServerModel;
5251
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ServiceMappingModel;
5352
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel;
5453
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel;
5554
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
5655
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel;
5756
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
58-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.StreamModel;
5957
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceIdRatioBasedSamplerModel;
6058
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
6159
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel;
60+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel;
61+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel;
6262
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ZipkinSpanExporterModel;
6363
import java.io.ByteArrayInputStream;
6464
import java.io.FileInputStream;
@@ -342,15 +342,15 @@ void parse_KitchenSinkExampleFile() throws IOException {
342342
ViewModel view =
343343
new ViewModel()
344344
.withSelector(
345-
new SelectorModel()
345+
new ViewSelectorModel()
346346
.withInstrumentName("my-instrument")
347-
.withInstrumentType(SelectorModel.InstrumentType.HISTOGRAM)
347+
.withInstrumentType(ViewSelectorModel.InstrumentType.HISTOGRAM)
348348
.withUnit("ms")
349349
.withMeterName("my-meter")
350350
.withMeterVersion("1.0.0")
351351
.withMeterSchemaUrl("https://opentelemetry.io/schemas/1.16.0"))
352352
.withStream(
353-
new StreamModel()
353+
new ViewStreamModel()
354354
.withName("new_instrument_name")
355355
.withDescription("new_description")
356356
.withAggregation(

‎sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactoryTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

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.SelectorModel;
14+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel;
1515
import io.opentelemetry.sdk.metrics.InstrumentSelector;
1616
import io.opentelemetry.sdk.metrics.InstrumentType;
1717
import java.util.Collections;
@@ -24,7 +24,8 @@ void create_Defaults() {
2424
assertThatThrownBy(
2525
() ->
2626
InstrumentSelectorFactory.getInstance()
27-
.create(new SelectorModel(), mock(SpiHelper.class), Collections.emptyList()))
27+
.create(
28+
new ViewSelectorModel(), mock(SpiHelper.class), Collections.emptyList()))
2829
.isInstanceOf(ConfigurationException.class)
2930
.hasMessage("Invalid selector");
3031
}
@@ -34,9 +35,9 @@ void create() {
3435
assertThat(
3536
InstrumentSelectorFactory.getInstance()
3637
.create(
37-
new SelectorModel()
38+
new ViewSelectorModel()
3839
.withInstrumentName("instrument-name")
39-
.withInstrumentType(SelectorModel.InstrumentType.COUNTER)
40+
.withInstrumentType(ViewSelectorModel.InstrumentType.COUNTER)
4041
.withMeterName("meter-name")
4142
.withMeterSchemaUrl("https://opentelemetry.io/schemas/1.16.0")
4243
.withMeterVersion("1.0.0"),

0 commit comments

Comments
 (0)