Skip to content

Commit 701fb60

Browse files
harrryrzzhlogin
andauthored
Merge contents of release/v2.0.x to main (#1028)
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]>
1 parent 31ef125 commit 701fb60

File tree

59 files changed

+8444
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+8444
-530
lines changed

.github/patches/opentelemetry-java-instrumentation.patch

Lines changed: 931 additions & 148 deletions
Large diffs are not rendered by default.

licenses/jackson-annotations-2.18.1.jar/META-INF/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

licenses/jackson-annotations-2.18.1.jar/META-INF/NOTICE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)