Skip to content

Commit 2ac4524

Browse files
authored
Merge branch 'main' into jpmunz/react-native-example-docs
2 parents 9590a6b + 714d79e commit 2ac4524

File tree

456 files changed

+4752
-1285
lines changed

Some content is hidden

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

456 files changed

+4752
-1285
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Auto-update community members page
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# At 03:41, every day
7+
- cron: 41 3 * * *
8+
9+
jobs:
10+
auto-update-versions:
11+
name: Auto-update community members page
12+
runs-on: ubuntu-24.04
13+
# Remove the if statement below when testing againt a fork
14+
if: github.repository == 'open-telemetry/opentelemetry.io'
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Set up Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '22'
23+
24+
- name: Install dependencies
25+
working-directory: ./scripts/generate-community-data
26+
run: npm install
27+
28+
- name: Run script
29+
working-directory: ./scripts/generate-community-data
30+
run: node generate.js ../../data/community/members.yaml
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
33+
34+
- name: Create pull request
35+
uses: peter-evans/create-pull-request@v7
36+
with:
37+
add-paths: 'data/community/members.yaml'
38+
author:
39+
opentelemetrybot
40+
41+
committer:
42+
opentelemetrybot
43+
44+
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
45+
branch: update-community-members
46+
title: Update community members
47+
body: |
48+
This pull request contains automated updates to files by the GitHub Action.

.github/workflows/build-dev.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
submodule_path_regex:
7-
description:
8-
Regex of submodule paths to updated to HEAD before building.
7+
description: Regex of submodule paths to update to HEAD before building.
98
default: content-modules
109
type: string
1110

.github/workflows/check-format.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,19 @@ jobs:
2121
- name: Create NPM cache-hash input file
2222
run: |
2323
mkdir -p tmp
24-
jq '{devDependencies, dependencies, engines, gitHubActionCacheKey}' package.json > tmp/package-ci.json
24+
jq '{devDependencies, engines, gitHubActionCacheKey}' package.json > tmp/package-ci.json
2525
2626
- uses: actions/setup-node@v4
2727
with:
2828
node-version-file: .nvmrc
2929
cache: npm
3030
cache-dependency-path: tmp/package-ci.json
3131

32-
- name: Check file format
33-
run: npm run check:format --ignore-scripts
32+
- name: Install package(s)
33+
run: |
34+
PRETTIER_AT_VERS=@$(npm pkg get devDependencies.prettier | tr -d '^"')
35+
echo "PRETTIER_AT_VERS=$PRETTIER_AT_VERS" | tee -a $GITHUB_ENV
36+
npm install prettier$PRETTIER_AT_VERS --no-save
37+
set -x && npx prettier --version
38+
39+
- run: npm run check:format

.github/workflows/pr-actions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
PR_ACTION=$(echo $COMMENT | grep -oP '/fix:\K[-_0-9a-z]+')
3333
echo "Action is $PR_ACTION"
34-
ACTION_NAMES="all|dict|filenames|format|htmltest-config|i18n|markdown|refcache|submodules?|text"
34+
ACTION_NAMES="all|dict|expired|filenames|format|htmltest-config|i18n|markdown|refcache|submodules?|text"
3535
if [[ ! "$PR_ACTION" =~ ^($ACTION_NAMES)$ ]]; then
3636
echo "Invalid action name: $PR_ACTION"
3737
echo "Action name should be one of: $ACTION_NAMES"

.github/workflows/scripts/update-registry-versions.sh

+20-10
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ for yaml_file in ${FILES}; do
8282
echo "${yaml_file}: Package name and/or registry are missing in the YAML file."
8383
else
8484
# Get latest version
85-
latest_version=$(get_latest_version "$name" "$registry")
85+
latest_version=$(get_latest_version "$name" "$registry" || echo "Could not fetch version.")
8686

87-
if [ "$latest_version" == "Registry not supported." ]; then
87+
if [ "$latest_version" == "Could not fetch version." ]; then
88+
echo "${yaml_file} ($registry): Registry not supported.";
89+
elif [ "$latest_version" == "Registry not supported." ]; then
8890
echo "${yaml_file} ($registry): Registry not supported.";
8991
elif [ -z "$latest_version" ]; then
9092
echo "${yaml_file} ($registry): Could not get latest version from registry."
@@ -118,14 +120,22 @@ if [ "$existing_pr_count" -gt 0 ]; then
118120
exit 0
119121
fi
120122

121-
$NPM run fix:format
123+
if [[ -n $(git status --porcelain) ]]; then
124+
echo "Versions have been updated, formatting and pushing changes."
125+
126+
$NPM run fix:format
127+
128+
$GIT checkout -b "$branch"
129+
$GIT commit -a -m "$message"
130+
$GIT push --set-upstream origin "$branch"
122131

123-
$GIT checkout -b "$branch"
124-
$GIT commit -a -m "$message"
125-
$GIT push --set-upstream origin "$branch"
132+
body_file=$(mktemp)
133+
echo -en "${body}" >> "${body_file}"
126134

127-
body_file=$(mktemp)
128-
echo -en "${body}" >> "${body_file}"
135+
echo "Submitting auto-update PR '$message'."
136+
$GH pr create --title "$message" --body-file "${body_file}"
129137

130-
echo "Submitting auto-update PR '$message'."
131-
$GH pr create --title "$message" --body-file "${body_file}"
138+
else
139+
echo "No changes detected."
140+
exit 0
141+
fi

.gitmodules

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
[submodule "content-modules/opentelemetry-specification"]
88
path = content-modules/opentelemetry-specification
99
url = https://github.com/open-telemetry/opentelemetry-specification.git
10-
spec-pin = v1.39.0
10+
spec-pin = v1.40.0
1111
[submodule "content-modules/community"]
1212
path = content-modules/community
1313
url = https://github.com/open-telemetry/community
1414
community-pin = f16a58e
1515
[submodule "content-modules/opentelemetry-proto"]
1616
path = content-modules/opentelemetry-proto
1717
url = https://github.com/open-telemetry/opentelemetry-proto
18-
otlp-pin = v1.4.0
18+
otlp-pin = v1.5.0
1919
[submodule "content-modules/semantic-conventions"]
2020
path = content-modules/semantic-conventions
2121
url = https://github.com/open-telemetry/semantic-conventions
22-
semconv-pin = v1.28.0
22+
semconv-pin = v1.29.0
2323
[submodule "content-modules/opamp-spec"]
2424
path = content-modules/opamp-spec
2525
url = https://github.com/open-telemetry/opamp-spec
@@ -31,4 +31,4 @@
3131
[submodule "content-modules/opentelemetry-java-examples"]
3232
path = content-modules/opentelemetry-java-examples
3333
url = https://github.com/open-telemetry/opentelemetry-java-examples.git
34-
javaexamples-pin = f9553ef
34+
javaexamples-pin = 63cc9b4

.prettierignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
!/layouts/shortcodes
88
/layouts/shortcodes/*
99
!/layouts/shortcodes/docs
10-
/layouts/shortcodes/pt
10+
!/layouts/shortcodes/es
11+
!/layouts/shortcodes/pt
1112

1213
/content/ja
1314
/content/zh

assets/scss/_registry.scss

+23
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,26 @@
3939
.registry-entry {
4040
@extend .shadow;
4141
}
42+
43+
#searchForm .btn.btn-outline-success,
44+
.btn-outline-danger,
45+
.btn-outline-secondary {
46+
&:hover {
47+
color: var(--bs-white);
48+
}
49+
}
50+
51+
@include color-mode(dark) {
52+
@media (prefers-color-scheme: dark) {
53+
.border-default {
54+
border-color: #a3a3a3;
55+
}
56+
.card.registry-entry {
57+
box-shadow: 0 20px 50px rgba(0, 0, 0, 0.8) !important;
58+
}
59+
.card.registry-entry,
60+
.list-group > .list-group-item {
61+
background-color: #262d2c;
62+
}
63+
}
64+
}

content-modules/semantic-conventions

content/en/announcements/2024-community-awards.md

-9
This file was deleted.
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: Developer Experience Survey
3+
date: 2024-12-16
4+
expiryDate: 2025-01-31
5+
---
6+
7+
<i class="fas fa-bullhorn"></i> Help us [improve the developer experience] (5-10
8+
min). Survey closes January 31.
9+
10+
[improve the developer experience]:
11+
https://docs.google.com/forms/d/1orPz5ayzosFrgYRm3-y90UMrt2ZjvIBKMDL_a2E3Fq8/viewform

content/en/announcements/eBPF.md

-8
This file was deleted.

content/en/announcements/kubecon-china.md

-9
This file was deleted.

content/en/announcements/kubecon-na-2024.md

-9
This file was deleted.

content/en/announcements/otel-community-day.md

-10
This file was deleted.

content/en/announcements/otel-localized.md

-9
This file was deleted.

content/en/blog/2022/knative/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Distributed tracing in Knative
33
linkTitle: Tracing in Knative
44
date: 2022-04-12
5+
author: '[Pavol Loffay](https://github.com/pavolloffay)'
56
# prettier-ignore
67
cSpell:ignore: apng Cloudevents datacontenttype httpbody khtml knativearrivaltime pavolloffay spanid specversion traceid webp
7-
author: '[Pavol Loffay](https://github.com/pavolloffay)'
88
---
99

1010
In this article, you will learn how distributed tracing works in Knative and we

content/en/blog/2023/ecs-otel-semconv-convergence.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title:
44
Convention Convergence
55
linkTitle: ECS and OTel SemConv Convergence
66
date: 2023-04-17
7-
cSpell:ignore: ECS Reiley SemConv Yang
87
author: '[Reiley Yang](https://github.com/reyang)'
8+
cSpell:ignore: ECS Reiley SemConv Yang
99
---
1010

1111
Today, we're very excited to make a joint announcement with

content/en/blog/2023/exponential-histograms.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Exponential Histograms
33
date: 2023-05-22
44
author: '[Daniel Dyla](https://github.com/dyladan)'
5-
cSpell:ignore: Ganesh Ruslan subsetting Vernekar Vovalov
65
canonical_url: https://dyladan.me/histograms/2023/05/04/exponential-histograms/
6+
cSpell:ignore: Ganesh Ruslan subsetting Vernekar Vovalov
77
---
88

99
Previously, in [Why Histograms?][] and [Histograms vs Summaries][], I went over

content/en/blog/2023/histograms-vs-summaries/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Histograms vs Summaries
33
date: 2023-05-15
44
author: '[Daniel Dyla](https://github.com/dyladan)'
5-
cSpell:ignore: aggregatable Björn Ganesh Kovalov Rabenstein Ruslan Vernekar
65
canonical_url: https://dyladan.me/histograms/2023/05/03/histograms-vs-summaries/
6+
cSpell:ignore: aggregatable Björn Ganesh Kovalov Rabenstein Ruslan Vernekar
77
---
88

99
In many ways, histograms and summaries appear quite similar. They both roll up

content/en/blog/2023/kubecon-eu.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Join us for OpenTelemetry Talks and Activities at KubeCon EU 2023
33
linkTitle: KubeCon EU '23
44
date: 2023-04-03
5+
author: '[Severin Neumann](https://github.com/svrnm)'
56
# prettier-ignore
67
cSpell:ignore: Aiven Benedikt Bongartz Jaglowski Kowall observ Oliveira Pathak Vider Xiaochun
7-
author: '[Severin Neumann](https://github.com/svrnm)'
88
---
99

1010
The OpenTelemetry project maintainers, members of the governance committee, and

content/en/blog/2023/kubecon-na.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Join us for OpenTelemetry Talks and Activities at KubeCon NA 2023
33
linkTitle: KubeCon NA '23
44
date: 2023-10-02
5+
author: '[Severin Neumann](https://github.com/svrnm) (Cisco)'
56
# prettier-ignore
67
cSpell:ignore: Anusha Aronoff Benedikt Bongartz Broadbridge Contribfest Coralogix Danielson Endo Flamegraphs Hrabovcak Itiel Itoh Jaglowski Kanal Komodor Kota Masanori Matej Mirabella Narapureddy observ Ohly Pivotto Purvi Reddy Sharone Shishi Shivanshu Shrivastava Shwartz Zitzman
7-
author: '[Severin Neumann](https://github.com/svrnm) (Cisco)'
88
---
99

1010
The OpenTelemetry project maintainers, members of the governance committee, and

content/en/blog/2023/why-histograms/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Why Histograms?
33
date: 2023-05-08
44
author: '[Daniel Dyla](https://github.com/dyladan)'
5-
cSpell:ignore: reimplementation
65
canonical_url: https://dyladan.me/histograms/2023/05/02/why-histograms/
6+
cSpell:ignore: reimplementation
77
---
88

99
A histogram is a multi-value counter that summarizes the distribution of data

0 commit comments

Comments
 (0)