Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cf30b77
temp
trask Jan 30, 2025
3658b6d
Update semconv submodule to v1.32.0
opentelemetrybot Apr 1, 2025
12d967d
Update semconv submodule to v1.32.0-2-gbb96516c
opentelemetrybot Apr 8, 2025
04945ba
Update semconv submodule to v1.32.0-7-g87cef1eb
opentelemetrybot Apr 9, 2025
043b900
Update semconv submodule to v1.32.0-14-ge26493f5
opentelemetrybot Apr 10, 2025
0556cbf
Update semconv submodule to v1.32.0-16-g64a47136
opentelemetrybot Apr 11, 2025
f1f47d0
Update semconv submodule to v1.32.0-17-g37aa2771
opentelemetrybot Apr 12, 2025
4d44f63
Update semconv submodule to v1.32.0-28-g0c0b799c
opentelemetrybot Apr 14, 2025
a97cd88
Update semconv submodule to v1.32.0-32-g52053d4f
opentelemetrybot Apr 15, 2025
b9e9503
Update semconv submodule to v1.32.0-43-g2d05f4d0
opentelemetrybot Apr 16, 2025
23dcaf1
Update semconv submodule to v1.32.0-47-g379d13f8
opentelemetrybot Apr 17, 2025
87b2404
Update semconv submodule to v1.32.0-49-g55009b32
opentelemetrybot Apr 18, 2025
64e4234
Update semconv submodule to v1.32.0-53-g2b2e1565
opentelemetrybot Apr 19, 2025
ecf6e03
Update semconv submodule to v1.32.0-59-g69fae285
opentelemetrybot Apr 22, 2025
f6f7765
Update semconv submodule to v1.32.0-61-gb40b5f3a
opentelemetrybot Apr 23, 2025
79c1b3a
Update semconv submodule to v1.32.0-62-g4676c009
opentelemetrybot Apr 24, 2025
371506b
Update semconv submodule to v1.32.0-63-g3e0a34a2
opentelemetrybot Apr 25, 2025
6e2b949
Update semconv submodule to v1.32.0-64-ga286dc42
opentelemetrybot Apr 27, 2025
ecab295
Update semconv submodule to v1.32.0-72-gc2efc505
opentelemetrybot Apr 29, 2025
fb939d2
Update semconv submodule to v1.32.0-77-gc0e7d69c
opentelemetrybot Apr 30, 2025
91a9926
Update semconv submodule to v1.32.0-84-g7ab7a384
opentelemetrybot May 1, 2025
468b38c
Update semconv submodule to v1.32.0-91-gb1bfa2ea
opentelemetrybot May 2, 2025
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
8 changes: 5 additions & 3 deletions .github/workflows/update-semconv-integration-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ on:
jobs:
update-semconv-integration-branch:
runs-on: ubuntu-latest
if: github.repository == 'open-telemetry/opentelemetry.io'
#if: github.repository == 'open-telemetry/opentelemetry.io'
steps:
- uses: actions/checkout@v4
with:
# this is needed in order to do the rebase below
fetch-depth: 0
# this is needed in order to trigger workflows when pushing new commits to the PR
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
#token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

- name: Set environment variables
env:
Expand Down Expand Up @@ -86,7 +86,9 @@ jobs:

sed -i "s/^\tsemconv-pin = .*/\tsemconv-pin = $commit_desc/" .gitmodules

if ! git diff-index --quiet HEAD; then
git add content-modules/semantic-conventions .gitmodules

if ! git diff-index --quiet --cached HEAD; then
git commit -am "Update semconv submodule to $commit_desc"
git push
fi
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "content-modules/semantic-conventions"]
path = content-modules/semantic-conventions
url = https://github.com/open-telemetry/semantic-conventions
semconv-pin = v1.30.0
semconv-pin = v1.32.0-91-gb1bfa2ea
[submodule "content-modules/opamp-spec"]
path = content-modules/opamp-spec
url = https://github.com/open-telemetry/opamp-spec
Expand Down
2 changes: 1 addition & 1 deletion content-modules/semantic-conventions