Skip to content

Commit ac8ba46

Browse files
authored
Merge branch 'main' into docs/contributing
2 parents 3af4144 + b68054b commit ac8ba46

File tree

29 files changed

+1121
-121
lines changed

29 files changed

+1121
-121
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/reusable-workflow-notification.yml

-59
This file was deleted.
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

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ 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

3839
- ^https?://localhost\b
3940
- ^https?://127\.0\.0\.1\b
@@ -72,9 +73,6 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
7273
# FIXME: same issue as for the OTel spec mentioned above:
7374
- ^https://github.com/open-telemetry/semantic-conventions/tree/main
7475

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-
7876
# Too many redirects as the server tries to figure out the country and language,
7977
# e.g.: https://www.microsoft.com/en-ca/sql-server.
8078
- ^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

content/en/docs/demo/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ found here:
5454
- [Quote Service](services/quote/)
5555
- [Recommendation Service](services/recommendation/)
5656
- [Shipping Service](services/shipping/)
57-
- [Image Provider Service](services/imageprovider/)
57+
- [Image Provider Service](services/image-provider/)
5858
- [React Native App](services/react-native-app/)
5959

6060
## Scenarios

content/en/docs/demo/docker-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ configuration from two files:
109109
- `otelcol-config-extras.yml`
110110

111111
To add your backend, open the file
112-
[src/otelcollector/otelcol-config-extras.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otelcollector/otelcol-config-extras.yml)
112+
[src/otel-collector/otelcol-config-extras.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otel-collector/otelcol-config-extras.yml)
113113
with an editor.
114114

115115
- Start by adding a new exporter. For example, if your backend supports OTLP

content/en/docs/demo/services/cart/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ aliases: [cartservice]
77
This service maintains items placed in the shopping cart by users. It interacts
88
with a Redis caching service for fast access to shopping cart data.
99

10-
[Cart service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/cartservice/)
10+
[Cart service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/cart/)
1111

1212
> **Note** OpenTelemetry for .NET uses the `System.Diagnostic.DiagnosticSource`
1313
> library as its API instead of the standard OpenTelemetry API for Traces and
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
---
22
title: Image Provider Service
33
linkTitle: Image Provider
4+
aliases: [imageprovider] # cSpell:disable-line
45
---
56

67
This service provides the images which are used in the frontend. The images are
78
statically hosted on a NGINX instance. The NGINX server is instrumented with the
89
[nginx-otel module](https://github.com/nginxinc/nginx-otel/tree/main).
910

10-
[Image Provider service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/imageprovider/)
11+
For details, see the
12+
[image provider service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/image-provider/).

content/en/docs/languages/java/api.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -912,8 +912,7 @@ The instrument APIs have share a variety of features:
912912
- Record values which are `long` or `double`, which is configured via the
913913
builder.
914914

915-
See
916-
[metric guidelines](http://localhost:1313/docs/specs/semconv/general/metrics/#general-guidelines)
915+
See [metric guidelines](/docs/specs/semconv/general/metrics/#general-guidelines)
917916
for details on metric naming and units.
918917

919918
See

content/es/docs/demo/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ en cada servicio aquí:
5454
- [Servicio de Cotizaciones](services/quote/)
5555
- [Servicio de Recomendaciones](services/recommendation/)
5656
- [Servicio de Envío](services/shipping/)
57-
- [Servicio Proveedor de Imágenes](services/imageprovider/)
57+
- [Servicio Proveedor de Imágenes](services/image-provider/?i18n-patch)
5858

5959
## Escenarios
6060

content/ja/docs/demo/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ default_lang_commit: 1e69c8f94a605ce5624c6b6657080d98f633ac7b
5151
- [見積サービス](services/quote/)
5252
- [レコメンデーションサービス](services/recommendation/)
5353
- [配送サービス](services/shipping/)
54-
- [画像プロバイダーサービス](services/imageprovider/)
54+
- [画像プロバイダーサービス](services/image-provider/?i18n-patch)
5555

5656
## シナリオ {#scenarios}
5757

content/ja/docs/demo/architecture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ classDef typescript fill:#e98516,color:black;
119119

120120
デモアプリケーションの[メトリック](/docs/demo/telemetry-features/metric-coverage/)[トレース](/docs/demo/telemetry-features/trace-coverage/) の計装の現状については、リンクをご確認ください。
121121

122-
コレクターの設定は [otelcol-config.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otelcollector/otelcol-config.yml) で行われており、代替のエクスポーターをここで設定することができます。
122+
コレクターの設定は [otelcol-config.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otel-collector/otelcol-config.yml?i18n-patch) で行われており、代替のエクスポーターをここで設定することができます。
123123

124124
```mermaid
125125
graph TB
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
title: Primeiros Passos
3+
aliases: [/docs/js/getting_started]
4+
weight: 10
5+
description: Comece a utilizar OpenTelemetry em Node.js e no navegador.
6+
default_lang_commit: 06837fe15457a584f6a9e09579be0f0400593d57
7+
---
8+
9+
Estes dois guias para Node.js e para o navegador utilizam exemplos básicos em
10+
JavaScript para ajudá-lo a começar com o OpenTelemetry.

0 commit comments

Comments
 (0)