Skip to content

Commit 8f9cb1f

Browse files
lauritlaurit
authored
Update otel sdk to 1.62.0 (#2815)
* Update otel sdk to 1.62.0 * update licenses
1 parent 57c9f6f commit 8f9cb1f

24 files changed

Lines changed: 102 additions & 83 deletions

File tree

‎agent/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ tasks {
9999
exclude("META-INF/LICENSE.txt")
100100
exclude("LICENSE.txt")
101101
exclude("THIRD_PARTY_LICENSES.txt")
102+
exclude("META-INF/maven/**")
103+
exclude("META-INF/versions/*/OSGI-INF/MANIFEST.MF")
102104
}
103105

104106
// 2. the Splunk javaagent libs are then isolated - moved to the inst/ directory

‎custom/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies {
88
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
99
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1010
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
11+
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")
1112
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
1213
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1314
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
@@ -28,6 +29,7 @@ dependencies {
2829
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
2930
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
3031
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
32+
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")
3133
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
3234
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
3335
testImplementation("io.opentelemetry.instrumentation:opentelemetry-resources")

‎custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProvider.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
import com.google.auto.service.AutoService;
2222
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
2323
import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
24-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
25-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
26-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
27-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel;
28-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
29-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
24+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
25+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
26+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
27+
import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel;
28+
import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel;
29+
import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel;
30+
import java.util.ArrayList;
31+
import java.util.List;
3032

3133
@AutoService(DeclarativeConfigurationCustomizerProvider.class)
3234
public final class AppdBonusConfigurationCustomizerProvider
@@ -49,7 +51,12 @@ public void customize(DeclarativeConfigurationCustomizer autoConfiguration) {
4951
if (model.getTracerProvider() == null) {
5052
model.withTracerProvider(new TracerProviderModel());
5153
}
52-
model.getTracerProvider().getProcessors().add(appdSpanProcessorModel);
54+
List<SpanProcessorModel> processors = model.getTracerProvider().getProcessors();
55+
if (processors == null) {
56+
processors = new ArrayList<>();
57+
model.getTracerProvider().withProcessors(processors);
58+
}
59+
processors.add(appdSpanProcessorModel);
5360

5461
return model;
5562
});

‎custom/src/main/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProvider.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
package com.splunk.opentelemetry.webengine;
1818

1919
import com.google.auto.service.AutoService;
20-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
21-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
22-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
20+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
21+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
22+
import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel;
23+
import java.util.ArrayList;
24+
import java.util.List;
2325
import java.util.logging.Logger;
2426

2527
@AutoService(DeclarativeConfigurationCustomizerProvider.class)
@@ -34,14 +36,15 @@ public void customize(DeclarativeConfigurationCustomizer autoConfiguration) {
3436
model -> {
3537
if (model.getTracerProvider() != null) {
3638
logger.fine("Adding webengine span processor to the configuration");
37-
model
38-
.getTracerProvider()
39-
.getProcessors()
40-
.add(
41-
0,
42-
new SpanProcessorModel()
43-
.withAdditionalProperty(
44-
WebengineSpanProcessorComponentProvider.NAME, null));
39+
List<SpanProcessorModel> processors = model.getTracerProvider().getProcessors();
40+
if (processors == null) {
41+
processors = new ArrayList<>();
42+
model.getTracerProvider().withProcessors(processors);
43+
}
44+
processors.add(
45+
0,
46+
new SpanProcessorModel()
47+
.withAdditionalProperty(WebengineSpanProcessorComponentProvider.NAME, null));
4548
}
4649
return model;
4750
});

‎custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
2525
import io.opentelemetry.common.ComponentLoader;
2626
import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
27+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.YamlDeclarativeConfigProperties;
2728
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
28-
import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
29-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DistributionModel;
30-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DistributionPropertyModel;
31-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
29+
import io.opentelemetry.sdk.declarativeconfig.internal.model.DistributionModel;
30+
import io.opentelemetry.sdk.declarativeconfig.internal.model.DistributionPropertyModel;
31+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
3232
import io.opentelemetry.sdk.resources.Resource;
3333
import java.util.Map;
3434
import java.util.stream.Collectors;

‎custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.splunk.opentelemetry.testing.declarativeconfig.DeclarativeConfigTestUtil.parseAndCustomizeModel;
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

22-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
22+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
2323
import org.junit.jupiter.api.Test;
2424

2525
class AppdBonusConfigurationCustomizerProviderTest {

‎custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.splunk.opentelemetry.testing.declarativeconfig.DeclarativeConfigTestUtil.parseAndCustomizeModel;
2020
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2121

22-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
22+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
2323
import org.junit.jupiter.api.Test;
2424

2525
class WebengineSpanProcessorCustomizerProviderTest {

‎custom/src/testFixtures/java/com/splunk/opentelemetry/testing/declarativeconfig/DeclarativeConfigTestUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
2424
import io.opentelemetry.javaagent.extension.instrumentation.internal.AgentDistributionConfig;
2525
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
26-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
27-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationBuilder;
28-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
29-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
26+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
27+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationBuilder;
28+
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
29+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
3030
import java.io.ByteArrayInputStream;
3131
import java.io.IOException;
3232
import java.io.InputStream;

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-platform`
33
}
44

5-
val otelVersion = "1.61.0"
5+
val otelVersion = "1.62.0"
66
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
77
val otelInstrumentationVersion = "2.28.0-SNAPSHOT"
88
val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

‎instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.github.netmikey.logunit.api.LogCapturer;
2727
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
2828
import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
29-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
29+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
3030
import java.util.List;
3131
import org.junit.jupiter.api.Test;
3232
import org.junit.jupiter.api.extension.RegisterExtension;

0 commit comments

Comments
 (0)