From 12f7871848407b353ab6c2e1634d2d00ed0f96b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:06:57 +0100 Subject: [PATCH] Bump byteBuddyVersion from 1.12.18 to 1.12.19 in /dependencyManagement (#7231) Bumps `byteBuddyVersion` from 1.12.18 to 1.12.19. Updates `byte-buddy` from 1.12.18 to 1.12.19
Release notes

Sourced from byte-buddy's releases.

Byte Buddy 1.12.19

Changelog

Sourced from byte-buddy's changelog.

Byte Buddy release notes

Commits

Updates `byte-buddy-dep` from 1.12.18 to 1.12.19
Release notes

Sourced from byte-buddy-dep's releases.

Byte Buddy 1.12.19

Changelog

Sourced from byte-buddy-dep's changelog.

Byte Buddy release notes

Commits

Updates `byte-buddy-agent` from 1.12.18 to 1.12.19
Release notes

Sourced from byte-buddy-agent's releases.

Byte Buddy 1.12.19

Changelog

Sourced from byte-buddy-agent's changelog.

Byte Buddy release notes

Commits

Updates `byte-buddy-gradle-plugin` from 1.12.18 to 1.12.19
Release notes

Sourced from byte-buddy-gradle-plugin's releases.

Byte Buddy 1.12.19

Changelog

Sourced from byte-buddy-gradle-plugin's changelog.

Byte Buddy release notes

Commits

You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mateusz Rzeszutek --- dependencyManagement/build.gradle.kts | 2 +- .../tooling/field/FieldAccessorInterfacesGenerator.java | 4 ++-- .../javaagent/tooling/field/RealFieldInjector.java | 2 +- .../META-INF/LICENSE | 0 .../META-INF/NOTICE | 0 licenses/licenses.md | 8 ++++---- .../tooling/muzzle/AgentCachingPoolStrategy.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename licenses/{byte-buddy-dep-1.12.18.jar => byte-buddy-dep-1.12.19.jar}/META-INF/LICENSE (100%) rename licenses/{byte-buddy-dep-1.12.18.jar => byte-buddy-dep-1.12.19.jar}/META-INF/NOTICE (100%) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 92b8976726..8d8bf25393 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -44,7 +44,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.0.1" val autoValueVersion = "1.10.1" val errorProneVersion = "2.16" -val byteBuddyVersion = "1.12.18" +val byteBuddyVersion = "1.12.19" val jmhVersion = "1.36" val mockitoVersion = "4.9.0" val slf4jVersion = "2.0.4" diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java index 3b563dc2f0..c25d50a631 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java @@ -50,7 +50,7 @@ final class FieldAccessorInterfacesGenerator { String typeName, String fieldTypeName) { // We are using Object class name instead of fieldTypeName here because this gets injected // onto the bootstrap class loader where context class may be unavailable - TypeDescription fieldTypeDesc = TypeDescription.OBJECT; + TypeDescription fieldTypeDesc = TypeDescription.ForLoadedType.of(Object.class); return byteBuddy .makeInterface() .merge(SyntheticState.SYNTHETIC) @@ -64,7 +64,7 @@ final class FieldAccessorInterfacesGenerator { .withoutCode() .defineMethod( getRealSetterName(typeName, fieldTypeName), - TypeDescription.VOID, + TypeDescription.ForLoadedType.of(void.class), Visibility.PUBLIC, SyntheticState.SYNTHETIC) .withParameter(fieldTypeDesc, "value") diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java index 156ae4a6dd..def17d01f6 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java @@ -67,7 +67,7 @@ final class RealFieldInjector implements AsmVisitorWrapper { return new ClassVisitor(Opcodes.ASM7, classVisitor) { // We are using Object class name instead of fieldTypeName here because this gets // injected onto the bootstrap class loader where context class may be unavailable - private final TypeDescription fieldType = TypeDescription.OBJECT; + private final TypeDescription fieldType = TypeDescription.ForLoadedType.of(Object.class); private final String fieldName = getRealFieldName(typeName, fieldTypeName); private final String getterMethodName = getRealGetterName(typeName, fieldTypeName); private final String setterMethodName = getRealSetterName(typeName, fieldTypeName); diff --git a/licenses/byte-buddy-dep-1.12.18.jar/META-INF/LICENSE b/licenses/byte-buddy-dep-1.12.19.jar/META-INF/LICENSE similarity index 100% rename from licenses/byte-buddy-dep-1.12.18.jar/META-INF/LICENSE rename to licenses/byte-buddy-dep-1.12.19.jar/META-INF/LICENSE diff --git a/licenses/byte-buddy-dep-1.12.18.jar/META-INF/NOTICE b/licenses/byte-buddy-dep-1.12.19.jar/META-INF/NOTICE similarity index 100% rename from licenses/byte-buddy-dep-1.12.18.jar/META-INF/NOTICE rename to licenses/byte-buddy-dep-1.12.19.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index bd27b37234..206c5449f7 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ #javaagent ##Dependency License Report -_2022-11-18 11:33:55 CET_ +_2022-11-18 13:45:45 CET_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -155,10 +155,10 @@ _2022-11-18 11:33:55 CET_ > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-2.23.2.jar/META-INF/LICENSE](zipkin-2.23.2.jar/META-INF/LICENSE) -**35** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.12.18` +**35** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.12.19` > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [byte-buddy-dep-1.12.18.jar/META-INF/LICENSE](byte-buddy-dep-1.12.18.jar/META-INF/LICENSE) - - [byte-buddy-dep-1.12.18.jar/META-INF/NOTICE](byte-buddy-dep-1.12.18.jar/META-INF/NOTICE) +> - **Embedded license files**: [byte-buddy-dep-1.12.19.jar/META-INF/LICENSE](byte-buddy-dep-1.12.19.jar/META-INF/LICENSE) + - [byte-buddy-dep-1.12.19.jar/META-INF/NOTICE](byte-buddy-dep-1.12.19.jar/META-INF/NOTICE) **36** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java index 4e8191514d..574eee9c85 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java @@ -251,7 +251,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy { private static final class SharedResolutionCacheAdapter implements TypePool.CacheProvider { private static final String OBJECT_NAME = "java.lang.Object"; private static final TypePool.Resolution OBJECT_RESOLUTION = - new TypePool.Resolution.Simple(TypeDescription.OBJECT); + new TypePool.Resolution.Simple(TypeDescription.ForLoadedType.of(Object.class)); private final int loaderHash; private final WeakReference loaderRef;