Skip to content

Commit 556a796

Browse files
ezeqmeezeqme
authored
Merge branch 'main' into update_otelcol_build_doc
2 parents ee3c378 + 0d38602 commit 556a796

Some content is hidden

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

52 files changed

+2475
-1309
lines changed

‎.cspell/pt-palavras.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
desserializa
22
desserializar
33
autoinstrumentação
4+
autoinstrumentações
45
autoconsistentes
56
serialização
67
verbosidade

‎.github/workflows/build-dev.yml

-9
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ on:
77
description: Regex of submodule paths to update to HEAD before building.
88
default: content-modules
99
type: string
10-
workflow_call:
11-
inputs:
12-
submodule_path_regex:
13-
type: string
14-
required: true
15-
skip_ref_cache_check:
16-
type: boolean
17-
default: false
1810

1911
jobs:
2012
build-and-test:
@@ -60,7 +52,6 @@ jobs:
6052
name: REFCACHE updates?
6153
needs: build-and-test
6254
runs-on: ubuntu-latest
63-
if: ${{ !inputs.skip_ref_cache_check }}
6455
steps:
6556
- uses: actions/checkout@v4
6657
- uses: actions/download-artifact@v4

‎.github/workflows/build-semconv-daily.yml

-26
This file was deleted.

‎.github/workflows/check-links.yml

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Links
22

3+
# cSpell:ignore nvmrc opentelemetrybot
34
on:
45
merge_group:
56
pull_request:
@@ -44,10 +45,28 @@ jobs:
4445
4546
- run: npm run log:check:links
4647
continue-on-error: true
47-
- name: Any files need updating?
48+
49+
- name: Push changes if any, and fail check
4850
run: |
49-
echo "If the diff fails due to .htmltest, then either run 'npm run fix:htmltest-config' locally or '/fix:htmltest-config' in GitHub"
50-
npm run _diff:fail
51+
if [[ $(git status --porcelain) ]]; then
52+
echo "Changes detected in the refcache etc:"
53+
git status --short
54+
55+
echo "\nPushing changes to PR."
56+
git config --local user.email "$USER_EMAIL"
57+
git config --local user.name "$USER_NAME"
58+
git add -A
59+
git commit -m "Updates from build-and-check-links workflow"
60+
git push
61+
62+
echo "Failing workflow so that changes can be reviewed, and checks rerun."
63+
exit 1
64+
fi
65+
env:
66+
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
67+
USER_EMAIL: [email protected]
68+
USER_NAME: opentelemetrybot
69+
5170
- uses: actions/upload-artifact@v4
5271
with:
5372
name: build-log-etc

‎.github/workflows/reusable-workflow-notification.yml

-59
This file was deleted.

‎.github/workflows/update-semconv-integration-branch.yml

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: Update semconv integration branch
2+
3+
on:
4+
schedule:
5+
# daily at 10:24 UTC
6+
- cron: '24 10 * * *'
7+
workflow_dispatch:
8+
9+
jobs:
10+
update-semconv-integration-branch:
11+
runs-on: ubuntu-latest
12+
if: github.repository == 'open-telemetry/opentelemetry.io'
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
# this is needed in order to do the rebase below
17+
fetch-depth: 0
18+
# this is needed in order to trigger workflows when pushing new commits to the PR
19+
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
20+
21+
- name: Set environment variables
22+
env:
23+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
run: |
25+
branch_prefix="opentelemetrybot/semconv-integration"
26+
27+
version=$(git branch -r \
28+
| grep "^ *origin/$branch_prefix-v[0-9]+\.[0-9]+\..*-dev" \
29+
| sed "s|^ *origin/$branch_prefix-||" \
30+
| sed "s|-dev$||")
31+
32+
if [[ -z "$versions" ]]; then
33+
latest_version=$(gh release view \
34+
--repo open-telemetry/semantic-conventions \
35+
--json tagName \
36+
--jq .tagName)
37+
if [[ $latest_version =~ ^v([0-9]+)\.([0-9]+)\. ]]; then
38+
major="${BASH_REMATCH[1]}"
39+
minor="${BASH_REMATCH[2]}"
40+
version="v$major.$((minor + 1)).0"
41+
else
42+
echo "unexpected version: $latest_version"
43+
exit 1
44+
fi
45+
fi
46+
47+
echo "VERSION=$version" >> $GITHUB_ENV
48+
echo "BRANCH=$branch_prefix-$version-dev" >> $GITHUB_ENV
49+
50+
- name: Checkout or create branch
51+
run: |
52+
if ! git ls-remote --exit-code --heads origin $BRANCH; then
53+
git checkout -b $BRANCH origin/main
54+
git push -u origin $BRANCH
55+
else
56+
git checkout $BRANCH
57+
fi
58+
59+
- name: Use CLA approved github bot
60+
run: |
61+
git config user.name opentelemetrybot
62+
git config user.email [email protected]
63+
64+
- name: Merge from main
65+
run: |
66+
previous=$(git rev-parse HEAD)
67+
git fetch origin
68+
git merge origin/main
69+
if [ "$(git rev-parse HEAD)" != "$previous" ]; then
70+
git push
71+
fi
72+
73+
- name: Update submodule
74+
run: |
75+
git submodule update --init content-modules/semantic-conventions
76+
cd content-modules/semantic-conventions
77+
78+
if git ls-remote --exit-code --tags origin $VERSION; then
79+
git reset --hard $VERSION
80+
else
81+
git reset --hard origin/main
82+
fi
83+
84+
commit_desc=$(git describe --tags)
85+
cd ../..
86+
87+
sed -i "s/^\tsemconv-pin = .*/\tsemconv-pin = $commit_desc/" .gitmodules
88+
89+
if ! git diff-index --quiet HEAD; then
90+
git commit -am "Update semconv submodule to $commit_desc"
91+
git push
92+
fi
93+
94+
- name: Create pull request if needed
95+
env:
96+
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
97+
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
98+
run: |
99+
prs=$(gh pr list --state open --head $BRANCH)
100+
if [ -z "$prs" ]; then
101+
gh pr create --title "Update semantic conventions to $VERSION-dev" \
102+
--body "This PR updates the semantic conventions to $VERSION-dev." \
103+
--draft
104+
fi

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[submodule "themes/docsy"]
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
5-
docsy-pin = v0.11.0-37-ga854cb31
5+
docsy-pin = v0.11.0-38-g77da7e49
66
docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
77
docsy-reminder = "Ensure that any tag referenced by `docsy-pin` is present in the remote repo (url), otherwise add (push) the tags to the repo."
88
[submodule "content-modules/opentelemetry-specification"]

‎.htmltest.yml

+7-19
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,23 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
3434

3535
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
3636
- ^https://www\.googletagmanager\.com
37+
- ^(https:)?//translate.google.com
3738

38-
- ^https?://localhost\b
39+
# Don't ignore `:1313` since it is often a docs link copy-paste error, e.g.:
40+
# https://github.com/open-telemetry/opentelemetry.io/pull/6123
41+
- ^https?://localhost(:([^1]|16*)|(/.*)?$)
3942
- ^https?://127\.0\.0\.1\b
4043
- ^https?://(otel-demo|traefik)\.localhost
4144

4245
# OpAMP spec:
4346
- ^https://pdf.sciencedirectassets.com/280203/1-s2.0-S1877050919X0006X/1-s2.0-S1877050919303576/main.pdf\?
4447

4548
# Sites that deny access, always yielding 401, 403 Forbidden, 406, or other:
46-
- ^https://(www\.)?linkedin\.com\b # 999 Request Denied
47-
- ^https://(www\.)?mvnrepository\.com
48-
- ^https://(www\.|eng\.)?uber\.com/(blog|flipr)/ # 406
49-
- ^https://kofo.dev
50-
- ^https://platform.openai.com
51-
- ^https://openai.com
52-
- ^https://star-history.com
49+
- ^https://platform.openai.com # Really hard to trick into giving a 200 when using a script; manually verify links
50+
- ^https://star-history.com # link contain ampersands in URL anchor part, which htmltest escapes, so it's not found
5351
- ^https://twitter.com
54-
- ^https://www.chathamhouse.org
55-
- ^https://www.farfetch.com
56-
- ^https://www.zocdoc.com
52+
- ^https://www.youtube.com/playlist\?list= # htmltest doesn't process query parameters
5753
- ^https://x.com
58-
- ^https://maven.org
59-
# OTel Google calendar - curl returns 200, but the link checker gets a 401:
60-
- ^https://calendar.google.com/calendar/embed\?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com
61-
# YouTube playlists sometimes give a 404, although they give a 200 when accessed via browser:
62-
- ^https://www.youtube.com/playlist\?list=
6354

6455
# Ignore Docsy-generated GitHub links for now, until
6556
# https://github.com/google/docsy/issues/1432 is fixed
@@ -72,9 +63,6 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
7263
# FIXME: same issue as for the OTel spec mentioned above:
7364
- ^https://github.com/open-telemetry/semantic-conventions/tree/main
7465

75-
# Ignore some links to GH repo content for now, most 4XX
76-
- ^https?://github\.com/open-telemetry/opentelemetry-demo/blob/main/src/(imageprovider|loadgenerator|otelcollector|.*service)
77-
7866
# Too many redirects as the server tries to figure out the country and language,
7967
# e.g.: https://www.microsoft.com/en-ca/sql-server.
8068
- ^https://www.microsoft.com/sql-server$

‎assets/scss/_styles_project.scss

+12
Original file line numberDiff line numberDiff line change
@@ -323,3 +323,15 @@ details {
323323
overflow-y: auto;
324324
}
325325
}
326+
327+
// Google translate select / dropdown
328+
329+
.goog-te-gadget {
330+
// cSpell:ignore goog
331+
padding-top: 1rem;
332+
margin-bottom: -0.5rem;
333+
334+
@include media-breakpoint-up(md) {
335+
padding-left: 0.6rem;
336+
}
337+
}

‎content/en/blog/2023/testing-otel-demo/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ screenshot of a trace for this operation:
211211
In this operation, we can see inner calls to multiple services, like
212212
[Frontend](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/frontend),
213213
[CheckoutService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/checkoutservice),
214-
[CartService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/cartservice),
214+
[CartService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/cart/),
215215
[ProductCatalogService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/productcatalogservice),
216216
[CurrencyService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/currencyservice),
217217
and others.
@@ -233,7 +233,7 @@ triggered during the checkout:
233233
[ShippingService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/shippingservice)
234234
was called and emitted spans correctly;
235235
- _“The cart was emptied”_, checking if the
236-
[CartService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/cartservice)
236+
[CartService](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/cart/)
237237
was called and emitted spans correctly.
238238

239239
The final result was the following test YAML, which triggers the Checkout

0 commit comments

Comments
 (0)