Skip to content

New - Upgrade upstream agent to v2.29.0 #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cleverchuk merged 4 commits into from
Jul 8, 2026
Merged

New - Upgrade upstream agent to v2.29.0 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38802f5
Bump io.opentelemetry.semconv:opentelemetry-semconv
dependabot[bot] Jun 17, 2026
e51d886
Use stable semconv keys to avoid deprecated warnings
Copilot Jul 6, 2026
bb83bb4
bump upstream and update apis and configs
cleverchuk Jul 7, 2026
1f06652
bump netty
cleverchuk Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions custom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")

compileOnly("io.opentelemetry:opentelemetry-api-incubator")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")

compileOnly("com.google.code.gson:gson")
Expand All @@ -52,7 +52,7 @@ dependencies {
testImplementation(project(":libs:core"))

testImplementation("io.opentelemetry:opentelemetry-api-incubator")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
}

Expand Down
12 changes: 6 additions & 6 deletions custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.semconv.ContainerAttributes;
import io.opentelemetry.semconv.K8sAttributes;
import io.opentelemetry.semconv.ServiceAttributes;
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes;
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
import io.opentelemetry.semconv.incubating.K8sIncubatingAttributes;
import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;

public final class HostIdResourceUtil {
Expand All @@ -35,7 +35,7 @@ public static Attributes createAttribute() {
AttributesBuilder builder = Attributes.builder();

HostId hostId = ServerHostInfoReader.INSTANCE.getHostId();
builder.put(ContainerIncubatingAttributes.CONTAINER_ID, hostId.getDockerContainerId());
builder.put(ContainerAttributes.CONTAINER_ID, hostId.getDockerContainerId());
builder.put(ProcessIncubatingAttributes.PROCESS_PID, (long) hostId.getPid());
builder.put(AttributeKey.stringArrayKey("mac.addresses"), hostId.getMacAddresses());

Expand All @@ -49,9 +49,9 @@ public static Attributes createAttribute() {

HostId.K8sMetadata k8sMetadata = hostId.getK8sMetadata();
if (k8sMetadata != null) {
builder.put(K8sIncubatingAttributes.K8S_POD_UID, k8sMetadata.getPodUid());
builder.put(K8sIncubatingAttributes.K8S_NAMESPACE_NAME, k8sMetadata.getNamespace());
builder.put(K8sIncubatingAttributes.K8S_POD_NAME, k8sMetadata.getPodName());
builder.put(K8sAttributes.K8S_POD_UID, k8sMetadata.getPodUid());
builder.put(K8sAttributes.K8S_NAMESPACE_NAME, k8sMetadata.getNamespace());
builder.put(K8sAttributes.K8S_POD_NAME, k8sMetadata.getPodName());
}

HostId.AwsMetadata awsMetadata = hostId.getAwsMetadata();
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.solarwinds.joboe.logging.Logger;
import com.solarwinds.joboe.logging.LoggerFactory;
import com.solarwinds.joboe.sampling.Settings;
import io.opentelemetry.api.internal.InstrumentationUtil;
import io.opentelemetry.api.impl.InstrumentationUtil;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
Expand Down
18 changes: 9 additions & 9 deletions ...m/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

import com.google.auto.service.AutoService;
import com.solarwinds.joboe.config.JavaRuntimeVersionChecker;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...m/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import com.solarwinds.joboe.config.ConfigProperty;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.joboe.config.ProxyConfig;
import com.solarwinds.joboe.sampling.Settings;
import io.opentelemetry.api.internal.InstrumentationUtil;
import io.opentelemetry.api.impl.InstrumentationUtil;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...m/solarwinds/opentelemetry/extensions/config/parser/yaml/ProfilingSettingsParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.joboe.core.profiler.ProfilerSetting;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
Expand Down
17 changes: 11 additions & 6 deletions ...larwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
import static org.mockito.Mockito.mockStatic;

import com.solarwinds.joboe.config.JavaRuntimeVersionChecker;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -59,7 +60,9 @@ void verifyThatProfilingProcessorIsAddedWhenJdkVersionIsSupported() {
.thenReturn(true);

OpenTelemetryConfigurationModel openTelemetryConfigurationModel =
new OpenTelemetryConfigurationModel().withTracerProvider(new TracerProviderModel());
new OpenTelemetryConfigurationModel()
.withTracerProvider(
new TracerProviderModel().withProcessors(Collections.emptyList()));

doNothing()
.when(declarativeConfigurationCustomizerMock)
Expand Down Expand Up @@ -89,7 +92,9 @@ void verifyThatProfilingProcessorIsNotAddedWhenJdkVersionIsNotSupported() {
.thenReturn(false);

OpenTelemetryConfigurationModel openTelemetryConfigurationModel =
new OpenTelemetryConfigurationModel().withTracerProvider(new TracerProviderModel());
new OpenTelemetryConfigurationModel()
.withTracerProvider(
new TracerProviderModel().withProcessors(Collections.emptyList()));

doNothing()
.when(declarativeConfigurationCustomizerMock)
Expand Down
10 changes: 5 additions & 5 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ plugins {
`java-platform`
}

val otelAgentVersion = "2.27.0"
val otelSdkVersion = "1.61.0"
val otelAgentVersion = "2.29.0"
val otelSdkVersion = "1.63.0"

val mockitoVersion = "5.2.0"
val byteBuddyVersion = "1.18.8"

val opentelemetryJavaagentAlpha = "$otelAgentVersion-alpha"
val opentelemetryAlpha = "$otelSdkVersion-alpha"
val opentelemetrySemconv = "1.40.0"
val opentelemetrySemconv = "1.42.0"
val opentelemetrySemconvAlpha = "$opentelemetrySemconv-alpha"

val autoservice = "1.1.1"
Expand All @@ -25,7 +25,7 @@ javaPlatform {
}

dependencies {
api(platform("io.netty:netty-bom:4.1.133.Final"))
api(platform("io.netty:netty-bom:4.1.135.Final"))

constraints {
api("org.mockito:mockito-core:$mockitoVersion")
Expand Down Expand Up @@ -69,7 +69,7 @@ dependencies {

api("io.opentelemetry:opentelemetry-api-incubator:$opentelemetryAlpha")
api("io.opentelemetry:opentelemetry-exporter-otlp:$otelSdkVersion")
api("io.opentelemetry:opentelemetry-sdk-extension-incubator:$opentelemetryAlpha")
api("io.opentelemetry:opentelemetry-sdk-extension-declarative-config:$opentelemetryAlpha")

api("org.junit.jupiter:junit-jupiter-params:$junit5")
api("dev.cel:cel:0.13.0")
Expand Down
2 changes: 1 addition & 1 deletion libs/core/src/main/java/com/solarwinds/joboe/core/util/ServerHostInfoReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.solarwinds.joboe.core.HostId;
import com.solarwinds.joboe.logging.Logger;
import com.solarwinds.joboe.logging.LoggerFactory;
import io.opentelemetry.api.internal.InstrumentationUtil;
import io.opentelemetry.api.impl.InstrumentationUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
Expand Down
2 changes: 1 addition & 1 deletion libs/core/src/main/java/com/solarwinds/joboe/core/util/UamsClientIdReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.solarwinds.joboe.logging.Logger;
import com.solarwinds.joboe.logging.LoggerFactory;
import io.opentelemetry.api.internal.InstrumentationUtil;
import io.opentelemetry.api.impl.InstrumentationUtil;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions libs/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {

compileOnly("io.opentelemetry:opentelemetry-api-incubator")
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")

testImplementation("org.json:json")
testImplementation(project(":libs:config"))
Expand All @@ -62,7 +62,7 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")

testImplementation("io.opentelemetry:opentelemetry-api-incubator")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-declarative-config")
}

val otelAgentVersion: String by rootProject.extra
Expand Down
50 changes: 25 additions & 25 deletions ...m/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@
import com.solarwinds.joboe.config.ServiceKeyUtils;
import com.solarwinds.opentelemetry.extensions.config.parser.yaml.ProxyParser;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel;
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PropagatorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -79,7 +79,7 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
LoggerProviderModel loggerProvider = configurationModel.getLoggerProvider();

if (meterProvider == null) {
meterProvider = new MeterProviderModel();
meterProvider = new MeterProviderModel().withReaders(Collections.emptyList());
configurationModel.withMeterProvider(meterProvider);
try {
ConfigManager.setConfig(ConfigProperty.AGENT_EXPORT_METRICS_ENABLED, false);
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.solarwinds.joboe.logging.LogSetting;
import com.solarwinds.joboe.logging.Logger;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import org.junit.jupiter.api.BeforeAll;
Expand Down
2 changes: 1 addition & 1 deletion ...m/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlQueryMaxLengthParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import com.solarwinds.joboe.config.InvalidConfigException;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import com.solarwinds.joboe.config.InvalidConfigException;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...om/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import com.solarwinds.joboe.config.InvalidConfigException;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.joboe.sampling.TracingMode;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import org.junit.jupiter.api.BeforeAll;
Expand Down
2 changes: 1 addition & 1 deletion ...winds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.opentelemetry.extensions.TransactionNamingScheme;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...inds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.joboe.sampling.TraceConfigs;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.util.stream.Stream;
Expand Down
Loading
Loading