Merge remote-tracking branch 'upstream/main' into pr/6381

siyuniu-ms · Feb 21, 2023 · 25e474f · 25e474f
2 parents f597144 + 630f751
commit 25e474f
Show file tree

Hide file tree

Showing 263 changed files with 2,570 additions and 3,051 deletions.
diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
@@ -52,7 +52,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: gradle/[email protected].5
+      - uses: gradle/[email protected].6
 
   license-check:
     runs-on: ubuntu-latest
@@ -174,6 +174,12 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      # vaadin 14 tests fail with node 18
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
       # vaadin tests use pnpm
       - name: Cache pnpm modules
         uses: actions/cache@v3

diff --git a/.github/workflows/reusable-test-latest-deps.yml b/.github/workflows/reusable-test-latest-deps.yml
@@ -37,6 +37,12 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      # vaadin 14 tests fail with node 18
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
       # vaadin tests use pnpm
       - name: Cache pnpm modules
         uses: actions/cache@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -58,10 +58,10 @@ dependencies {
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1")
-  implementation("org.owasp:dependency-check-gradle:8.0.2")
+  implementation("org.owasp:dependency-check-gradle:8.1.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.13.0")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.14.0")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.8")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1")

diff --git 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 otelSdkVersion = "1.23.0"
+val otelSdkVersion = "1.23.1"
 
 // Need both BOM and groovy jars
 val groovyVersion = "4.0.9"
@@ -42,7 +42,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.0.1"
 val autoValueVersion = "1.10.1"
 val errorProneVersion = "2.18.0"
-val byteBuddyVersion = "1.13.0"
+val byteBuddyVersion = "1.14.0"
 val asmVersion = "9.4"
 val jmhVersion = "1.36"
 val mockitoVersion = "4.11.0"

diff --git a/docs/semantic-conventions.md b/docs/semantic-conventions.md
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:6.15.0"
     classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
-    classpath "io.opentelemetry.instrumentation:gradle-plugins:1.23.0-alpha-SNAPSHOT"
+    classpath "io.opentelemetry.instrumentation:gradle-plugins:1.24.0-alpha-SNAPSHOT"
   }
 }
 
@@ -27,13 +27,13 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.23.0",
+      opentelemetrySdk           : "1.23.1",
 
       // these lines are managed by .github/scripts/update-version.sh
-      opentelemetryJavaagent     : "1.23.0-SNAPSHOT",
-      opentelemetryJavaagentAlpha: "1.23.0-alpha-SNAPSHOT",
+      opentelemetryJavaagent     : "1.24.0-SNAPSHOT",
+      opentelemetryJavaagentAlpha: "1.24.0-alpha-SNAPSHOT",
 
-      bytebuddy                  : "1.13.0",
+      bytebuddy                  : "1.14.0",
       autoservice                : "1.0.1",
       junit                      : "5.9.2"
     ]

diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.17.6")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
-  testImplementation("com.google.protobuf:protobuf-java-util:3.21.12")
+  testImplementation("com.google.protobuf:protobuf-java-util:3.22.0")
   testImplementation("com.squareup.okhttp3:okhttp:4.10.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api:${versions.opentelemetry}")

diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -13,8 +13,8 @@ plugins {
   id "com.github.johnrengelman.shadow" version "7.1.2"
   id "com.diffplug.spotless" version "6.15.0"
 
-  id "io.opentelemetry.instrumentation.muzzle-generation" version "1.23.0-alpha-SNAPSHOT"
-  id "io.opentelemetry.instrumentation.muzzle-check" version "1.23.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-generation" version "1.24.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-check" version "1.24.0-alpha-SNAPSHOT"
 }
 
 group 'io.opentelemetry.example'
@@ -23,11 +23,11 @@ version '1.0'
 ext {
   versions = [
     // this line is managed by .github/scripts/update-sdk-version.sh
-    opentelemetrySdk           : "1.23.0",
+    opentelemetrySdk           : "1.23.1",
 
     // these lines are managed by .github/scripts/update-version.sh
-    opentelemetryJavaagent     : "1.23.0-SNAPSHOT",
-    opentelemetryJavaagentAlpha: "1.23.0-alpha-SNAPSHOT",
+    opentelemetryJavaagent     : "1.24.0-SNAPSHOT",
+    opentelemetryJavaagentAlpha: "1.24.0-alpha-SNAPSHOT",
 
     junit                      : "5.9.2"
   ]
@@ -101,7 +101,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.17.6")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
-  testImplementation("com.google.protobuf:protobuf-java-util:3.21.12")
+  testImplementation("com.google.protobuf:protobuf-java-util:3.22.0")
   testImplementation("com.squareup.okhttp3:okhttp:4.10.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha")

diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -23,7 +23,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.13.0"
+val byteBuddyVersion = "1.14.0"
 val aetherVersion = "1.1.0"
 
 dependencies {

diff --git a/...ain/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java b/...ain/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java
@@ -17,36 +17,8 @@
 public interface CodeAttributesGetter<REQUEST> {
 
   @Nullable
-  default Class<?> getCodeClass(REQUEST request) {
-    return codeClass(request);
-  }
+  Class<?> getCodeClass(REQUEST request);
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getCodeClass(Object)} instead.
-   */
-  @Deprecated
   @Nullable
-  default Class<?> codeClass(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  @Nullable
-  default String getMethodName(REQUEST request) {
-    return methodName(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMethodName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String methodName(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
+  String getMethodName(REQUEST request);
 }
diff --git a/...n/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java b/...n/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java
@@ -21,36 +21,8 @@
 public interface DbClientAttributesGetter<REQUEST> extends DbClientCommonAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getStatement(REQUEST request) {
-    return statement(request);
-  }
+  String getStatement(REQUEST request);
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getStatement(Object)} instead.
-   */
-  @Deprecated
   @Nullable
-  default String statement(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  @Nullable
-  default String getOperation(REQUEST request) {
-    return operation(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getOperation(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String operation(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
+  String getOperation(REQUEST request);
 }
diff --git a/.../io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java b/.../io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java
@@ -11,70 +11,14 @@
 public interface DbClientCommonAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getSystem(REQUEST request) {
-    return system(request);
-  }
+  String getSystem(REQUEST request);
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSystem(Object)} instead.
-   */
-  @Deprecated
   @Nullable
-  default String system(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
+  String getUser(REQUEST request);
 
   @Nullable
-  default String getUser(REQUEST request) {
-    return user(request);
-  }
+  String getName(REQUEST request);
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getUser(Object)} instead.
-   */
-  @Deprecated
   @Nullable
-  default String user(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  @Nullable
-  default String getName(REQUEST request) {
-    return name(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String name(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  @Nullable
-  default String getConnectionString(REQUEST request) {
-    return connectionString(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getConnectionString(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String connectionString(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
+  String getConnectionString(REQUEST request);
 }