Skip to content

Commit c972bb6

Browse files
jack-bergjack-berg
committed
Changes as of 03/04/2025
1 parent e98de18 commit c972bb6

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ 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 = "c8014d610e6923f51708dd24787231f1796eafdc"
63+
val configurationRef = "bd511a6a16b321a7bb3135fa783dda1fbd40706f"
6464
val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
6565
val buildDirectory = layout.buildDirectory.asFile.get()
6666

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
1212
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
13+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileExporterModel;
1314
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
14-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpFileExporterModel;
1515
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel;
1616
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel;
1717
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
@@ -40,8 +40,8 @@ public LogRecordExporter create(
4040
if (otlpGrpcModel != null) {
4141
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4242
}
43-
OtlpFileExporterModel otlpFileExporterModel = model.getOtlpFile();
44-
if (model.getOtlpFile() != null) {
43+
ExperimentalOtlpFileExporterModel otlpFileExporterModel = model.getOtlpFileDevelopment();
44+
if (otlpFileExporterModel != null) {
4545
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
4646
}
4747

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +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;
12+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileMetricExporterModel;
1313
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcMetricExporterModel;
1414
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel;
1515
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel;
@@ -39,8 +39,8 @@ public MetricExporter create(
3939
if (otlpGrpcModel != null) {
4040
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4141
}
42-
OtlpFileMetricExporterModel otlpFileExporterModel = model.getOtlpFile();
43-
if (model.getOtlpFile() != null) {
42+
ExperimentalOtlpFileMetricExporterModel otlpFileExporterModel = model.getOtlpFileDevelopment();
43+
if (otlpFileExporterModel != null) {
4444
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
4545
}
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +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;
12+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileExporterModel;
1313
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel;
1414
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel;
1515
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
@@ -40,8 +40,8 @@ public SpanExporter create(
4040
if (otlpGrpcModel != null) {
4141
model.getAdditionalProperties().put("otlp_grpc", otlpGrpcModel);
4242
}
43-
OtlpFileExporterModel otlpFileExporterModel = model.getOtlpFile();
44-
if (model.getOtlpFile() != null) {
43+
ExperimentalOtlpFileExporterModel otlpFileExporterModel = model.getOtlpFileDevelopment();
44+
if (otlpFileExporterModel != null) {
4545
model.getAdditionalProperties().put("otlp_file", otlpFileExporterModel);
4646
}
4747

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ClientModel;
2020
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
2121
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorsModel;
22+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalGeneralInstrumentationModel;
23+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalHttpInstrumentationModel;
24+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
25+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalPeerInstrumentationModel;
2226
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramAggregationModel;
23-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GeneralInstrumentationModel;
24-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.HttpInstrumentationModel;
2527
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel;
2628
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
27-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LanguageSpecificInstrumentationModel;
2829
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
2930
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel;
3031
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel;
@@ -38,7 +39,6 @@
3839
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel;
3940
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel;
4041
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ParentBasedSamplerModel;
41-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeerInstrumentationModel;
4242
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel;
4343
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PrometheusMetricExporterModel;
4444
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel;
@@ -376,9 +376,9 @@ void parse_KitchenSinkExampleFile() throws IOException {
376376
InstrumentationModel instrumentation =
377377
new InstrumentationModel()
378378
.withGeneral(
379-
new GeneralInstrumentationModel()
379+
new ExperimentalGeneralInstrumentationModel()
380380
.withPeer(
381-
new PeerInstrumentationModel()
381+
new ExperimentalPeerInstrumentationModel()
382382
.withServiceMapping(
383383
Arrays.asList(
384384
new ServiceMappingModel()
@@ -388,7 +388,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
388388
.withPeer("2.3.4.5")
389389
.withService("BarService"))))
390390
.withHttp(
391-
new HttpInstrumentationModel()
391+
new ExperimentalHttpInstrumentationModel()
392392
.withClient(
393393
new ClientModel()
394394
.withRequestCapturedHeaders(
@@ -402,50 +402,50 @@ void parse_KitchenSinkExampleFile() throws IOException {
402402
.withResponseCapturedHeaders(
403403
Arrays.asList("Content-Type", "Content-Encoding")))))
404404
.withCpp(
405-
new LanguageSpecificInstrumentationModel()
405+
new ExperimentalLanguageSpecificInstrumentationModel()
406406
.withAdditionalProperty(
407407
"example", Collections.singletonMap("property", "value")))
408408
.withDotnet(
409-
new LanguageSpecificInstrumentationModel()
409+
new ExperimentalLanguageSpecificInstrumentationModel()
410410
.withAdditionalProperty(
411411
"example", Collections.singletonMap("property", "value")))
412412
.withErlang(
413-
new LanguageSpecificInstrumentationModel()
413+
new ExperimentalLanguageSpecificInstrumentationModel()
414414
.withAdditionalProperty(
415415
"example", Collections.singletonMap("property", "value")))
416416
.withGo(
417-
new LanguageSpecificInstrumentationModel()
417+
new ExperimentalLanguageSpecificInstrumentationModel()
418418
.withAdditionalProperty(
419419
"example", Collections.singletonMap("property", "value")))
420420
.withJava(
421-
new LanguageSpecificInstrumentationModel()
421+
new ExperimentalLanguageSpecificInstrumentationModel()
422422
.withAdditionalProperty(
423423
"example", Collections.singletonMap("property", "value")))
424424
.withJs(
425-
new LanguageSpecificInstrumentationModel()
425+
new ExperimentalLanguageSpecificInstrumentationModel()
426426
.withAdditionalProperty(
427427
"example", Collections.singletonMap("property", "value")))
428428
.withPhp(
429-
new LanguageSpecificInstrumentationModel()
429+
new ExperimentalLanguageSpecificInstrumentationModel()
430430
.withAdditionalProperty(
431431
"example", Collections.singletonMap("property", "value")))
432432
.withPython(
433-
new LanguageSpecificInstrumentationModel()
433+
new ExperimentalLanguageSpecificInstrumentationModel()
434434
.withAdditionalProperty(
435435
"example", Collections.singletonMap("property", "value")))
436436
.withRuby(
437-
new LanguageSpecificInstrumentationModel()
437+
new ExperimentalLanguageSpecificInstrumentationModel()
438438
.withAdditionalProperty(
439439
"example", Collections.singletonMap("property", "value")))
440440
.withRust(
441-
new LanguageSpecificInstrumentationModel()
441+
new ExperimentalLanguageSpecificInstrumentationModel()
442442
.withAdditionalProperty(
443443
"example", Collections.singletonMap("property", "value")))
444444
.withSwift(
445-
new LanguageSpecificInstrumentationModel()
445+
new ExperimentalLanguageSpecificInstrumentationModel()
446446
.withAdditionalProperty(
447447
"example", Collections.singletonMap("property", "value")));
448-
expected.withInstrumentation(instrumentation);
448+
expected.withInstrumentationDevelopment(instrumentation);
449449
// end instrumentation config
450450

451451
try (FileInputStream configExampleFile =
@@ -478,7 +478,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
478478
assertThat(configMeterProvider.getViews()).isEqualTo(Collections.singletonList(view));
479479

480480
// Instrumentation config
481-
InstrumentationModel configInstrumentation = config.getInstrumentation();
481+
InstrumentationModel configInstrumentation = config.getInstrumentationDevelopment();
482482
assertThat(configInstrumentation).isEqualTo(instrumentation);
483483

484484
// All configuration

0 commit comments

Comments
 (0)