Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

semconv: Add metric generation #4880

Merged
merged 27 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fb8d9f2
Adds some basic constants for metrics utilizing a new jinja template
carrbs Feb 2, 2024
67eff23
Merge branch 'main' into 4528-semconv-add-metrics
carrbs Feb 6, 2024
bd60b70
Updates generated comments with more explicit nomenclature; Adds Unit…
carrbs Feb 6, 2024
d778687
Update CHANGELOG
carrbs Feb 7, 2024
3701d37
fix merge conflicts from upstream
carrbs Feb 20, 2024
58ff3f0
fix overlooked merge conflict
carrbs Feb 20, 2024
35d6077
change the types of generated consts to string; format generation to …
carrbs Feb 22, 2024
a2943d4
Merge branch 'main' into 4528-semconv-add-metrics
carrbs Feb 22, 2024
e396ef9
trim trailing (repeated) periods in the description
carrbs Feb 22, 2024
c54516b
Merge branch 'main' into 4528-semconv-add-metrics
carrbs Feb 22, 2024
b6a005f
Merge branch 'main' into 4528-semconv-add-metrics
carrbs Feb 22, 2024
4c12cc5
Merge branch '4528-semconv-add-metrics' of github.com:carrbs/opentele…
carrbs Feb 22, 2024
f702f77
fix merge conflicts in CHANGELOG
carrbs Mar 13, 2024
14b878e
manual formatting of some proper nouns; simplify the license header
carrbs Mar 13, 2024
dccb44d
update metrics file with concise generated license header
carrbs Mar 14, 2024
2177316
revert special formatting logic for JVM and ASPNETCore
carrbs Mar 15, 2024
83f8bc4
fix merge conflicts in CHANGELOG
carrbs Mar 15, 2024
2a5c712
Update CHANGELOG.md
pellared Mar 15, 2024
e4b3c7a
Merge branch 'main' into 4528-semconv-add-metrics
XSAM Mar 18, 2024
070dbfc
Merge branch 'main' into 4528-semconv-add-metrics
pellared Mar 27, 2024
1545359
Merge branch 'main' into 4528-semconv-add-metrics
pellared Mar 28, 2024
3d492f6
Fixes a bad CHANGELOG merge conflict on a previous commit
carrbs Apr 3, 2024
296624e
Update CHANGELOG.md
pellared Apr 4, 2024
a6b7315
Merge branch 'main' into 4528-semconv-add-metrics
pellared Apr 4, 2024
fc08d9c
Merge branch 'main' into 4528-semconv-add-metrics
pellared Apr 4, 2024
bb71975
Merge branch 'main' into 4528-semconv-add-metrics
pellared Apr 4, 2024
04f11d0
Merge branch 'main' into 4528-semconv-add-metrics
MrAlias Apr 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflicts from upstream
  • Loading branch information
carrbs committed Feb 20, 2024
commit 3701d37928494fa7e0bd58eb8c215c1699cf6639
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.