Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
data class DependencySet(val group: String, val version: String, val modules: List<String>)

// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.50.0"
val otelSdkVersion = "1.51.0"
val otelContribVersion = "1.46.0-alpha"
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subprojects {
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.50.0",
opentelemetrySdk : "1.51.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.17.0-SNAPSHOT",
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ version '1.0'
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.50.0",
opentelemetrySdk : "1.51.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.17.0-SNAPSHOT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
class DeclarativeConfigPropertiesBridgeTest {

private static final String YAML =
"file_format: 0.3\n"
+ "instrumentation:\n"
"file_format: 0.4\n"
+ "instrumentation/development:\n"
+ " java:\n"
+ " common:\n"
+ " default-enabled: true\n"
Expand Down Expand Up @@ -61,7 +61,7 @@ void setup() {

OpenTelemetryConfigurationModel emptyModel =
new OpenTelemetryConfigurationModel()
.withAdditionalProperty("instrumentation", new InstrumentationModel());
.withAdditionalProperty("instrumentation/development", new InstrumentationModel());
SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
emptyBridge =
new DeclarativeConfigPropertiesBridge(
Expand Down
106 changes: 51 additions & 55 deletions licenses/licenses.md

Large diffs are not rendered by default.

Loading