From da6dd00ea1823a4373f93c0e5c57bb04b6c46fb2 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Fri, 19 Aug 2022 10:42:42 -0700
Subject: [PATCH] Update SDK to 1.17.0 (#420)

* Update SDK to 1.17.0

* Fix
---
 dependencyManagement/build.gradle.kts                         | 2 +-
 runtime-attach/runtime-attach/build.gradle.kts                | 2 +-
 .../io/opentelemetry/contrib/attach/AgentDisabledTest.java    | 2 +-
 .../opentelemetry/contrib/attach/RunTimeAttachBasicTest.java  | 2 +-
 .../staticinstrumenter/config/StaticPackagesConfigurer.java   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index a028f70ec..0eaa0d6c4 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // 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(
     "com.fasterxml.jackson:jackson-bom:2.13.2.20220328",
diff --git a/runtime-attach/runtime-attach/build.gradle.kts b/runtime-attach/runtime-attach/build.gradle.kts
index 2581e1625..4bdd97d0d 100644
--- a/runtime-attach/runtime-attach/build.gradle.kts
+++ b/runtime-attach/runtime-attach/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
   compileOnly("com.google.code.findbugs:annotations")
 
   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-pioneer:junit-pioneer")
   testImplementation("org.assertj:assertj-core")
diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
index 5dcc2dbea..402fe3966 100644
--- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
+++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
@@ -7,7 +7,7 @@
 
 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.junitpioneer.jupiter.SetEnvironmentVariable;
 import org.junitpioneer.jupiter.SetSystemProperty;
diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
index 0e5e83300..3f0436472 100644
--- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
+++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
@@ -7,7 +7,7 @@
 
 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;
 
 public class RunTimeAttachBasicTest extends AbstractAttachmentTest {
diff --git a/static-instrumenter/agent-extension/src/main/java/io/opentelemetry/contrib/staticinstrumenter/config/StaticPackagesConfigurer.java b/static-instrumenter/agent-extension/src/main/java/io/opentelemetry/contrib/staticinstrumenter/config/StaticPackagesConfigurer.java
index a313343a2..6887db0ef 100644
--- a/static-instrumenter/agent-extension/src/main/java/io/opentelemetry/contrib/staticinstrumenter/config/StaticPackagesConfigurer.java
+++ b/static-instrumenter/agent-extension/src/main/java/io/opentelemetry/contrib/staticinstrumenter/config/StaticPackagesConfigurer.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.contrib.staticinstrumenter.config;
 
 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.BootstrapPackagesConfigurer;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 /**
  * Makes classes from {@link io.opentelemetry.contrib.staticinstrumenter.agent.main} package
@@ -18,7 +18,7 @@
 public class StaticPackagesConfigurer implements BootstrapPackagesConfigurer {
 
   @Override
-  public void configure(Config config, BootstrapPackagesBuilder builder) {
+  public void configure(BootstrapPackagesBuilder builder, ConfigProperties config) {
     builder.add("io.opentelemetry.contrib.staticinstrumenter.agent.main");
   }
 }