open-telemetry
/
opentelemetry-java-contrib
mirror of https://github.com/open-telemetry/opentelemetry-java-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SDK to 1.17.0 (#420) 

* Update SDK to 1.17.0

* Fix
This commit is contained in:
Trask Stalnaker 2022-08-19 10:42:42 -07:00 committed by GitHub
parent 71cac47c3e
commit da6dd00ea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencyManagement/build.gradle.kts
View File

@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions rootProject.extra["versions"] = dependencyVersions
// this line is managed by .github/scripts/update-sdk-version.sh // this line is managed by .github/scripts/update-sdk-version.sh
val otelVersion = "1.16.0" val otelVersion = "1.17.0"
val DEPENDENCY_BOMS = listOf( val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.13.2.20220328", "com.fasterxml.jackson:jackson-bom:2.13.2.20220328",

2
runtime-attach/runtime-attach/build.gradle.kts
View File

@ -18,7 +18,7 @@ dependencies {
compileOnly("com.google.code.findbugs:annotations") compileOnly("com.google.code.findbugs:annotations")
testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent") testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent")
testImplementation("io.opentelemetry:opentelemetry-extension-annotations") testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")
testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit-pioneer:junit-pioneer") testImplementation("org.junit-pioneer:junit-pioneer")
testImplementation("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")

2
runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
View File

@ -7,7 +7,7 @@ package io.opentelemetry.contrib.attach;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.extension.annotations.WithSpan; import io.opentelemetry.instrumentation.annotations.WithSpan;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.SetEnvironmentVariable; import org.junitpioneer.jupiter.SetEnvironmentVariable;
import org.junitpioneer.jupiter.SetSystemProperty; import org.junitpioneer.jupiter.SetSystemProperty;

2
runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
View File

@ -7,7 +7,7 @@ package io.opentelemetry.contrib.attach;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.extension.annotations.WithSpan; import io.opentelemetry.instrumentation.annotations.WithSpan;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class RunTimeAttachBasicTest extends AbstractAttachmentTest { public class RunTimeAttachBasicTest extends AbstractAttachmentTest {

4
static-instrumenter/agent-extension/src/main/java/io/opentelemetry/contrib/staticinstrumenter/config/StaticPackagesConfigurer.java
View File

@ -6,9 +6,9 @@
package io.opentelemetry.contrib.staticinstrumenter.config; package io.opentelemetry.contrib.staticinstrumenter.config;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.instrumentation.api.config.Config;
import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesBuilder; import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesBuilder;
import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer; import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
/** /**
* Makes classes from {@link io.opentelemetry.contrib.staticinstrumenter.agent.main} package * Makes classes from {@link io.opentelemetry.contrib.staticinstrumenter.agent.main} package
@ -18,7 +18,7 @@ import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer;
public class StaticPackagesConfigurer implements BootstrapPackagesConfigurer { public class StaticPackagesConfigurer implements BootstrapPackagesConfigurer {
@Override @Override
public void configure(Config config, BootstrapPackagesBuilder builder) { public void configure(BootstrapPackagesBuilder builder, ConfigProperties config) {
builder.add("io.opentelemetry.contrib.staticinstrumenter.agent.main"); builder.add("io.opentelemetry.contrib.staticinstrumenter.agent.main");
} }
} }