Skip to content

Commit

Permalink
Merge contents of release/v2.0.x to main (#1028)
Browse files Browse the repository at this point in the history
Merging Adot V2 contents to main branch

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Co-authored-by: zzhlogin <[email protected]>
  • Loading branch information
harrryr and zzhlogin authored Mar 3, 2025
1 parent 31ef125 commit 701fb60
Show file tree
Hide file tree
Showing 59 changed files with 8,444 additions and 530 deletions.
1,079 changes: 931 additions & 148 deletions .github/patches/opentelemetry-java-instrumentation.patch

Large diffs are not rendered by default.

202 changes: 202 additions & 0 deletions licenses/jackson-annotations-2.18.1.jar/META-INF/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions licenses/jackson-annotations-2.18.1.jar/META-INF/NOTICE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 701fb60

Please sign in to comment.