From 4eb3b1b8dca861d007e91c680dd286ed8a3b739d Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Fri, 13 Feb 2026 11:51:15 -0500 Subject: [PATCH] bump upstream to latest --- README.md | 2 +- .../extensions/config/DeclarativeLoaderTest.java | 2 +- dependencyManagement/build.gradle.kts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 11df24e0..3ca7740c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Status](https://img.shields.io/badge/status-stable-informational?style=for-the-badge)](https://github.com/solarwinds/apm-java) -[![OTEL](https://img.shields.io/badge/otel-2.24.0-blueviolet?style=for-the-badge)](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.24.0) +[![OTEL](https://img.shields.io/badge/otel-2.25.0-blueviolet?style=for-the-badge)](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.25.0) [![SWO](https://img.shields.io/github/v/release/solarwinds/apm-java?include_prereleases&style=for-the-badge)](https://github.com/solarwinds/apm-java/releases) [![SWO SDK](https://img.shields.io/maven-central/v/io.github.appoptics/solarwinds-otel-sdk?style=for-the-badge)](https://maven-badges.herokuapp.com/maven-central/io.github.appoptics/solarwinds-otel-sdk) [![License](https://img.shields.io/badge/License-Apache_2.0-red.svg?style=for-the-badge)](https://github.com/solarwinds/apm-java/blob/main/LICENSE) diff --git a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java index 672d9552..ceb61a3a 100644 --- a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java +++ b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java @@ -24,9 +24,9 @@ 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.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; +import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index d6aaa067..26db8338 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,8 +2,8 @@ plugins { `java-platform` } -val otelAgentVersion = "2.24.0" -val otelSdkVersion = "1.58.0" +val otelAgentVersion = "2.25.0" +val otelSdkVersion = "1.59.0" val mockitoVersion = "4.11.0" val byteBuddyVersion = "1.18.4"