Skip to content

Commit 0d75482

Browse files
otelbot[bot]otelbot[bot]
committed
Merge remote-tracking branch 'origin/main' into otelbot/spec-integration-v1.55.0-dev
2 parents 378259a + 081d82b commit 0d75482

40 files changed

+446
-180
lines changed

‎.github/component-label-map.yml‎

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ registry:
88
- data/registry/**
99

1010
# Localization labels
11+
i18n:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- i18n/**
1115
lang:bn:
1216
- changed-files:
1317
- any-glob-to-any-file:
@@ -46,10 +50,27 @@ lang:zh:
4650
- content/zh/**
4751

4852
# Special Interest Groups labels
53+
sig:collector:
54+
- changed-files:
55+
- any-glob-to-any-file:
56+
- content/en/docs/collector/**
4957
sig:cpp:
5058
- changed-files:
5159
- any-glob-to-any-file:
5260
- content/en/docs/languages/cpp/**
61+
sig:demo:
62+
- changed-files:
63+
- any-glob-to-any-file:
64+
- content/en/docs/demo/**
65+
sig:dotnet:
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- content/en/docs/languages/net/**
69+
- content/en/docs/zero-code/net/**
70+
sig:enduser:
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- content/en/community/end-user/**
5374
sig:erlang:
5475
- changed-files:
5576
- any-glob-to-any-file:
@@ -59,6 +80,10 @@ sig:go:
5980
- any-glob-to-any-file:
6081
- content/en/docs/languages/go/**
6182
- content/en/docs/zero-code/go/**
83+
sig:helm:
84+
- changed-files:
85+
- any-glob-to-any-file:
86+
- content/en/docs/kubernetes/helm/**
6287
sig:java:
6388
- changed-files:
6489
- any-glob-to-any-file:
@@ -69,11 +94,18 @@ sig:javascript:
6994
- any-glob-to-any-file:
7095
- content/en/docs/languages/js/**
7196
- content/en/docs/zero-code/js/**
72-
sig:dotnet:
97+
sig:kotlin:
7398
- changed-files:
7499
- any-glob-to-any-file:
75-
- content/en/docs/languages/net/**
76-
- content/en/docs/zero-code/net/**
100+
- content/en/docs/languages/kotlin/**
101+
sig:obi:
102+
- changed-files:
103+
- any-glob-to-any-file:
104+
- content/en/docs/zero-code/obi/**
105+
sig:operator:
106+
- changed-files:
107+
- any-glob-to-any-file:
108+
- content/en/docs/kubernetes/operator/**
77109
sig:php:
78110
- changed-files:
79111
- any-glob-to-any-file:
@@ -92,39 +124,29 @@ sig:rust:
92124
- changed-files:
93125
- any-glob-to-any-file:
94126
- content/en/docs/languages/rust/**
95-
sig:swift:
96-
- changed-files:
97-
- any-glob-to-any-file:
98-
- content/en/docs/languages/swift/**
99-
sig:operator:
100-
- changed-files:
101-
- any-glob-to-any-file:
102-
- content/en/docs/kubernetes/operator/**
103-
sig:helm:
104-
- changed-files:
105-
- any-glob-to-any-file:
106-
- content/en/docs/kubernetes/helm/**
107127
sig:security:
108128
- changed-files:
109129
- any-glob-to-any-file:
110130
- content/en/docs/security/**
111-
sig:demo:
112-
- changed-files:
113-
- any-glob-to-any-file:
114-
- content/en/docs/demo/**
115-
sig:collector:
131+
sig:spec:
116132
- changed-files:
117133
- any-glob-to-any-file:
118-
- content/en/docs/collector/**
119-
sig:enduser:
134+
- content/en/docs/specs/**
135+
sig:swift:
120136
- changed-files:
121137
- any-glob-to-any-file:
122-
- content/en/community/end-user/**
123-
sig:spec:
138+
- content/en/docs/languages/swift/**
139+
140+
# CI & Infrastructure labels
141+
CI/infra:
124142
- changed-files:
125143
- any-glob-to-any-file:
126-
- content/en/docs/specs/**
127-
sig:obi:
144+
- .devcontainer/**
145+
- .github/**
146+
- config/**
147+
148+
dependencies:
128149
- changed-files:
129150
- any-glob-to-any-file:
130-
- content/en/docs/zero-code/obi/**
151+
- package.json
152+
- .gitmodules

‎.github/workflows/first-timer-response.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
)
2828
2929
steps:
30-
- uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
30+
- uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
3131
with:
3232
egress-policy: audit
3333

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.1
1818

19-
- uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
19+
- uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
2020
with:
2121
api-key: ${{secrets.FOSSA_API_KEY}}
2222
team: OpenTelemetry

.github/workflows/pr-approval-labels.yml renamed to .github/workflows/label-manager.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# To learn more about this workflow, see:
22
# https://opentelemetry.io/site/build/ci-workflows/#pr-approval-labels
3-
name: PR approval labels
3+
name: Label manager
44

55
on:
66
pull_request_target:
@@ -18,6 +18,19 @@ permissions:
1818
contents: read
1919

2020
jobs:
21+
add-component-labels:
22+
name: Add component labels
23+
if: github.event_name == 'pull_request_target'
24+
runs-on: ubuntu-latest
25+
permissions:
26+
contents: read
27+
pull-requests: write
28+
steps:
29+
- uses: actions/checkout@v6
30+
- uses: actions/labeler@v6
31+
with:
32+
configuration-path: '.github/component-label-map.yml'
33+
2134
update-approval-labels:
2235
name: Update approval labels
2336
runs-on: ubuntu-latest

‎.github/workflows/label-prs.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/workflows/pr-actions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
patch_skipped: ${{ steps.check_patch.outputs.skipped }}
3030

3131
steps:
32-
- uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
32+
- uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
3333
with:
3434
egress-policy: audit
3535

@@ -124,7 +124,7 @@ jobs:
124124
pull-requests: write
125125

126126
steps:
127-
- uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
127+
- uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
128128
with:
129129
egress-policy: audit
130130

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
55
# cSpell:disable-next-line
6-
docsy-pin = v0.14.3-25-gb219dab5
6+
docsy-pin = v0.14.3-34-g4db086c6
77
docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
88
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."
99
[submodule "content-modules/opentelemetry-specification"]

‎config/_default/hugo.yaml‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ languages:
1818
params:
1919
description: The OpenTelemetry Project Site
2020
bn:
21-
languageName: বাংলা (Bengali)
21+
languageName: বাংলা
2222
params:
2323
description: ওপেনটেলিমেট্রি প্রকল্পের সাইট
2424
es:
@@ -30,15 +30,15 @@ languages:
3030
params:
3131
description: Site du projet OpenTelemetry
3232
ja:
33-
languageName: 日本語 (Japanese)
33+
languageName: 日本語
3434
params:
3535
description: OpenTelemetryプロジェクト公式サイト
3636
notes:
3737
docker-compose-v2: |
3838
`docker-compose` は非推奨です. 詳細は、
3939
[Migrate to Compose V2](https://docs.docker.com/compose/) を確認してください。
4040
pl:
41-
languageName: Polski (Polish)
41+
languageName: Polski
4242
languageCode: pl-PL
4343
params:
4444
description: Strona projektu OpenTelemetry
@@ -48,17 +48,17 @@ languages:
4848
params:
4949
description: Site do Projeto OpenTelemetry
5050
ro:
51-
languageName: Română (Romanian)
51+
languageName: Română
5252
languageCode: ro-RO
5353
params:
5454
description: Site-ul proiectului OpenTelemetry
5555
uk:
56-
languageName: Українська (Ukrainian)
56+
languageName: Українська
5757
languageCode: uk-UA
5858
params:
5959
description: Сайт проєкту OpenTelemetry
6060
zh:
61-
languageName: 中文 (Chinese)
61+
languageName: 中文
6262
languageCode: zh-CN
6363
params:
6464
description: OpenTelemetry 项目网站
@@ -90,21 +90,37 @@ mediaTypes:
9090
text/netlify: {}
9191

9292
outputFormats:
93-
REDIRECTS:
93+
redirects:
9494
mediaType: text/netlify
9595
baseName: _redirects
9696
notAlternative: true
9797

9898
outputs:
99-
home: [HTML, RSS]
100-
section: [HTML]
99+
home: &home-outputs [HTML, RSS]
100+
section: &section-outputs [HTML]
101101

102102
services:
103103
rss: { limit: 20 }
104104

105105
cascade:
106-
build: { list: never, publishResources: false, render: never }
107-
_target: { path: '{,/**}/_includes{,/**}' }
106+
- build: { list: never, publishResources: false, render: never }
107+
target: { path: '{,/**}/_includes{,/**}' }
108+
109+
# Enable redirects for site root (and not locales)
110+
- outputs:
111+
# This must match the equivalent of [*home-outputs, redirects]
112+
[HTML, RSS, redirects]
113+
target:
114+
kind: home
115+
sites: { matrix: { languages: [en] } }
116+
117+
# Enable RSS for blog section
118+
- outputs:
119+
# This must match the equivalent of [*section-outputs, RSS]
120+
[HTML, RSS]
121+
target:
122+
kind: section
123+
path: '/blog'
108124

109125
params:
110126
copyright:

‎content/bn/_index.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
title: OpenTelemetry
33
description: >-
44
ইফেক্টিভ অবজারভেবিলিটির জন্য উচ্চ-মানের, সর্বজনীন ও পোর্টেবল টেলিমেট্রি প্রদান
5-
outputs:
6-
- HTML
75
developer_note:
86
The blocks/cover shortcode (used below) will use as a background image any
97
image file containing "background" in its name.

‎content/en/_index.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
---
22
title: OpenTelemetry
33
description: The open standard for telemetry
4-
outputs:
5-
- HTML
6-
# Include the following for `content/en` ONLY
7-
- REDIRECTS
8-
- RSS
9-
developer_note: >
4+
developer_note:
105
The blocks/cover shortcode (used below) will use as a background image any
116
image file containing "background" in its name.
127
params:

0 commit comments

Comments
 (0)
⚡