Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cf30b77
temp
trask Jan 30, 2025
c4f034c
Update semconv submodule to v1.34.0
opentelemetrybot May 20, 2025
8813ef8
Update semconv submodule to v1.34.0-2-g9f5f2c2d
opentelemetrybot May 21, 2025
d70575d
Update semconv submodule to v1.34.0-3-gcab0665e
opentelemetrybot May 22, 2025
3a3356a
Update semconv submodule to v1.34.0-4-gab88f2a4
opentelemetrybot May 23, 2025
7251e27
Update semconv submodule to v1.34.0-5-gca0c5ada
opentelemetrybot May 27, 2025
ade0970
Update semconv submodule to v1.34.0-6-gd1d43c3b
opentelemetrybot May 28, 2025
65dfaf9
Update semconv submodule to v1.34.0-9-g778afe4e
opentelemetrybot May 29, 2025
6c6959e
Update semconv submodule to v1.34.0-16-g28c92e2f
opentelemetrybot May 30, 2025
cbe8da1
Update semconv submodule to v1.34.0-17-g2bc97890
opentelemetrybot Jun 1, 2025
b85cfc3
Update semconv submodule to v1.34.0-18-g9a226d41
opentelemetrybot Jun 4, 2025
71fb9a4
Update semconv submodule to v1.34.0-21-g14eacc86
opentelemetrybot Jun 5, 2025
5fde739
Update semconv submodule to v1.34.0-23-g2353261c
opentelemetrybot Jun 7, 2025
89975e3
Update semconv submodule to v1.34.0-24-g157ece3b
opentelemetrybot Jun 10, 2025
e6329f6
Update semconv submodule to v1.34.0-25-gd97527f2
opentelemetrybot Jun 11, 2025
de35d70
Update semconv submodule to v1.34.0-26-g8fc9768d
opentelemetrybot Jun 13, 2025
9b0260b
Update semconv submodule to v1.34.0-27-g204c9674
opentelemetrybot Jun 16, 2025
fe4aeb2
Update semconv submodule to v1.34.0-32-gcf8a17df
opentelemetrybot Jun 17, 2025
28a1ba8
Update semconv submodule to v1.34.0-34-g723789b8
opentelemetrybot Jun 18, 2025
403a79d
Update semconv submodule to v1.34.0-35-g37fc32d3
opentelemetrybot Jun 19, 2025
cddf37f
Update semconv submodule to v1.34.0-37-g4e7c077d
opentelemetrybot Jun 20, 2025
067983c
Update semconv submodule to v1.34.0-40-gc182d6cd
opentelemetrybot Jun 24, 2025
ad41714
Update semconv submodule to v1.34.0-41-ged153363
opentelemetrybot Jun 25, 2025
16b661b
Update semconv submodule to v1.34.0-43-g06071f2a
opentelemetrybot Jun 26, 2025
2cd1117
Update semconv submodule to v1.34.0-44-g6fc0e4d3
opentelemetrybot Jun 27, 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.34.0-44-g6fc0e4d3
[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