Browse Source

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
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/releases">byte-buddy's
releases</a>.</em></p>
<blockquote>
<h2>Byte Buddy 1.12.19</h2>
<ul>
<li>Avoid possible lock through circular class loading of
<code>TypeDescription</code> subtypes.</li>
<li>Avoid access error when using unsafe API on Java 17 with an active
security manager.</li>
<li>Close URL class loader used in Gradle plugin.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/blob/master/release-notes.md">byte-buddy's
changelog</a>.</em></p>
<blockquote>
<h2>Byte Buddy release notes</h2>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c93425a1e92bd246c053968512226ff391c54b5c"><code>c93425a</code></a>
[maven-release-plugin] prepare release byte-buddy-1.12.19</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/b1f4e9b4ee3af704d1eb2ca9083a10b429d2a802"><code>b1f4e9b</code></a>
[release] New release</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/8d17e3a2a3ee4bb85b5f1cae829ddaea5e5ee147"><code>8d17e3a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/raphw/byte-buddy/issues/1359">#1359</a>
from eyalkoren/protection-domain</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c57139e69cbaae155eba59194d787e58e0a9e215"><code>c57139e</code></a>
Using explicit ProtectionDomain in dynamically loaded classes</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/ff8be9a91bf92d8e53517e276c29ac67c8c36236"><code>ff8be9a</code></a>
Attempt cloning protection domain from accessible object to avoid
security ma...</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/6fe45f76efa6e084efdeb3a937088cd1da79b9b6"><code>6fe45f7</code></a>
Make s in message optional.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/902350124381f387362385a2a6c160a649d2fbe3"><code>9023501</code></a>
Fix scope of summary variable.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/02091f13f40fe5c29926c4976e166f162d704ac2"><code>02091f1</code></a>
Update codeql-analysis.yml</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/628b6a90c503192f9987fc488421a19d7d331bd5"><code>628b6a9</code></a>
Close class loader in Gradle plugin, if possible.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/9a818565255791fed4d88c369a4dd3938693ff4c"><code>9a81856</code></a>
Remove unused import.</li>
<li>Additional commits viewable in <a
href="https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.18...byte-buddy-1.12.19">compare
view</a></li>
</ul>
</details>
<br />

Updates `byte-buddy-dep` from 1.12.18 to 1.12.19
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/releases">byte-buddy-dep's
releases</a>.</em></p>
<blockquote>
<h2>Byte Buddy 1.12.19</h2>
<ul>
<li>Avoid possible lock through circular class loading of
<code>TypeDescription</code> subtypes.</li>
<li>Avoid access error when using unsafe API on Java 17 with an active
security manager.</li>
<li>Close URL class loader used in Gradle plugin.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/blob/master/release-notes.md">byte-buddy-dep's
changelog</a>.</em></p>
<blockquote>
<h2>Byte Buddy release notes</h2>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c93425a1e92bd246c053968512226ff391c54b5c"><code>c93425a</code></a>
[maven-release-plugin] prepare release byte-buddy-1.12.19</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/b1f4e9b4ee3af704d1eb2ca9083a10b429d2a802"><code>b1f4e9b</code></a>
[release] New release</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/8d17e3a2a3ee4bb85b5f1cae829ddaea5e5ee147"><code>8d17e3a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/raphw/byte-buddy/issues/1359">#1359</a>
from eyalkoren/protection-domain</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c57139e69cbaae155eba59194d787e58e0a9e215"><code>c57139e</code></a>
Using explicit ProtectionDomain in dynamically loaded classes</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/ff8be9a91bf92d8e53517e276c29ac67c8c36236"><code>ff8be9a</code></a>
Attempt cloning protection domain from accessible object to avoid
security ma...</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/6fe45f76efa6e084efdeb3a937088cd1da79b9b6"><code>6fe45f7</code></a>
Make s in message optional.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/902350124381f387362385a2a6c160a649d2fbe3"><code>9023501</code></a>
Fix scope of summary variable.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/02091f13f40fe5c29926c4976e166f162d704ac2"><code>02091f1</code></a>
Update codeql-analysis.yml</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/628b6a90c503192f9987fc488421a19d7d331bd5"><code>628b6a9</code></a>
Close class loader in Gradle plugin, if possible.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/9a818565255791fed4d88c369a4dd3938693ff4c"><code>9a81856</code></a>
Remove unused import.</li>
<li>Additional commits viewable in <a
href="https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.18...byte-buddy-1.12.19">compare
view</a></li>
</ul>
</details>
<br />

Updates `byte-buddy-agent` from 1.12.18 to 1.12.19
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/releases">byte-buddy-agent's
releases</a>.</em></p>
<blockquote>
<h2>Byte Buddy 1.12.19</h2>
<ul>
<li>Avoid possible lock through circular class loading of
<code>TypeDescription</code> subtypes.</li>
<li>Avoid access error when using unsafe API on Java 17 with an active
security manager.</li>
<li>Close URL class loader used in Gradle plugin.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/blob/master/release-notes.md">byte-buddy-agent's
changelog</a>.</em></p>
<blockquote>
<h2>Byte Buddy release notes</h2>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c93425a1e92bd246c053968512226ff391c54b5c"><code>c93425a</code></a>
[maven-release-plugin] prepare release byte-buddy-1.12.19</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/b1f4e9b4ee3af704d1eb2ca9083a10b429d2a802"><code>b1f4e9b</code></a>
[release] New release</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/8d17e3a2a3ee4bb85b5f1cae829ddaea5e5ee147"><code>8d17e3a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/raphw/byte-buddy/issues/1359">#1359</a>
from eyalkoren/protection-domain</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c57139e69cbaae155eba59194d787e58e0a9e215"><code>c57139e</code></a>
Using explicit ProtectionDomain in dynamically loaded classes</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/ff8be9a91bf92d8e53517e276c29ac67c8c36236"><code>ff8be9a</code></a>
Attempt cloning protection domain from accessible object to avoid
security ma...</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/6fe45f76efa6e084efdeb3a937088cd1da79b9b6"><code>6fe45f7</code></a>
Make s in message optional.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/902350124381f387362385a2a6c160a649d2fbe3"><code>9023501</code></a>
Fix scope of summary variable.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/02091f13f40fe5c29926c4976e166f162d704ac2"><code>02091f1</code></a>
Update codeql-analysis.yml</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/628b6a90c503192f9987fc488421a19d7d331bd5"><code>628b6a9</code></a>
Close class loader in Gradle plugin, if possible.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/9a818565255791fed4d88c369a4dd3938693ff4c"><code>9a81856</code></a>
Remove unused import.</li>
<li>Additional commits viewable in <a
href="https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.18...byte-buddy-1.12.19">compare
view</a></li>
</ul>
</details>
<br />

Updates `byte-buddy-gradle-plugin` from 1.12.18 to 1.12.19
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/releases">byte-buddy-gradle-plugin's
releases</a>.</em></p>
<blockquote>
<h2>Byte Buddy 1.12.19</h2>
<ul>
<li>Avoid possible lock through circular class loading of
<code>TypeDescription</code> subtypes.</li>
<li>Avoid access error when using unsafe API on Java 17 with an active
security manager.</li>
<li>Close URL class loader used in Gradle plugin.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/raphw/byte-buddy/blob/master/release-notes.md">byte-buddy-gradle-plugin's
changelog</a>.</em></p>
<blockquote>
<h2>Byte Buddy release notes</h2>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c93425a1e92bd246c053968512226ff391c54b5c"><code>c93425a</code></a>
[maven-release-plugin] prepare release byte-buddy-1.12.19</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/b1f4e9b4ee3af704d1eb2ca9083a10b429d2a802"><code>b1f4e9b</code></a>
[release] New release</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/8d17e3a2a3ee4bb85b5f1cae829ddaea5e5ee147"><code>8d17e3a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/raphw/byte-buddy/issues/1359">#1359</a>
from eyalkoren/protection-domain</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/c57139e69cbaae155eba59194d787e58e0a9e215"><code>c57139e</code></a>
Using explicit ProtectionDomain in dynamically loaded classes</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/ff8be9a91bf92d8e53517e276c29ac67c8c36236"><code>ff8be9a</code></a>
Attempt cloning protection domain from accessible object to avoid
security ma...</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/6fe45f76efa6e084efdeb3a937088cd1da79b9b6"><code>6fe45f7</code></a>
Make s in message optional.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/902350124381f387362385a2a6c160a649d2fbe3"><code>9023501</code></a>
Fix scope of summary variable.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/02091f13f40fe5c29926c4976e166f162d704ac2"><code>02091f1</code></a>
Update codeql-analysis.yml</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/628b6a90c503192f9987fc488421a19d7d331bd5"><code>628b6a9</code></a>
Close class loader in Gradle plugin, if possible.</li>
<li><a
href="https://github.com/raphw/byte-buddy/commit/9a818565255791fed4d88c369a4dd3938693ff4c"><code>9a81856</code></a>
Remove unused import.</li>
<li>Additional commits viewable in <a
href="https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.18...byte-buddy-1.12.19">compare
view</a></li>
</ul>
</details>
<br />


You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
dependabot[bot] 2 years ago
parent
commit
12f7871848

+ 1 - 1
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"

+ 2 - 2
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")

+ 1 - 1
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);

+ 0 - 0
licenses/byte-buddy-dep-1.12.18.jar/META-INF/LICENSE → licenses/byte-buddy-dep-1.12.19.jar/META-INF/LICENSE


+ 0 - 0
licenses/byte-buddy-dep-1.12.18.jar/META-INF/NOTICE → licenses/byte-buddy-dep-1.12.19.jar/META-INF/NOTICE


+ 4 - 4
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)

+ 1 - 1
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<ClassLoader> loaderRef;