Skip to content

Commit 378259a

Browse files
committed
Merge remote-tracking branch 'origin/main' into otelbot/spec-integration-v1.55.0-dev
2 parents 559f663 + 576346c commit 378259a

File tree

66 files changed

+84
-53
lines changed

Some content is hidden

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

66 files changed

+84
-53
lines changed

.cspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ words:
9090
- desaturate
9191
- Docsy
9292
- errorf
93+
- favicons
9394
- Goldmark
9495
- htmltest
9596
- jsonify

.htmltest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ IgnoreURLs: # list of regexes of paths or URLs to be ignored
3333
- ^(/..)?/docs/languages/dotnet/(metrics-api|traces-api)/
3434
- ^((/..)?/docs/compatibility/migration/)?opencensus/$
3535
- ^/../docs/specs/?$ # non-default locale spec redirect
36+
# Temporary until the following is fixed and Docsy is updated:
37+
# https://github.com/google/docsy/issues/2595
38+
- ^/favicons
3639

3740
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
3841
- ^https://www\.googletagmanager\.com

config/_default/hugo.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ disableKinds: [taxonomy]
55
theme: [docsy]
66
disableAliases: true # We do redirects via Netlify's _redirects file
77
enableGitInfo: true
8+
enableRobotsTXT: true
89
ignoreLogs: []
910

1011
# Language settings

config/_default/module-template.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,11 @@ mounts:
188188
sites: *pt-matrix
189189

190190
## static
191-
- source: static
191+
- files: ['! favicons/**']
192+
source: static
193+
target: static
194+
# Mount favicons to the site root where they are expected
195+
- source: static/favicons
192196
target: static
193197
- source: content-modules/semantic-conventions/schemas
194198
target: static/schemas

content/ja/docs/languages/python/getting-started.md

Lines changed: 1 addition & 1 deletion

data/community/members.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,8 +1091,10 @@ maintainers:
10911091
- name: MikeGoldsmith
10921092
teams:
10931093
- javascript-contrib-triagers
1094+
- opentelemetry-python-contrib-approvers
10941095
- proto-go-approvers
10951096
- proto-go-maintainers
1097+
- python-approvers
10961098
- ruby-contrib-triagers
10971099
html_url: https://github.com/MikeGoldsmith
10981100
avatar_url: https://avatars.githubusercontent.com/u/3481731?v=4
@@ -3178,6 +3180,9 @@ members:
31783180
- name: ShaanveerS
31793181
html_url: https://github.com/ShaanveerS
31803182
avatar_url: https://avatars.githubusercontent.com/u/146979751?v=4
3183+
- name: shalk
3184+
html_url: https://github.com/shalk
3185+
avatar_url: https://avatars.githubusercontent.com/u/2435781?v=4
31813186
- name: shanduur
31823187
html_url: https://github.com/shanduur
31833188
avatar_url: https://avatars.githubusercontent.com/u/32583062?v=4

data/registry/collector-connector-count.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2025-03-26
1818
package:
1919
registry: go-collector
2020
name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector
21-
version: v0.147.0
21+
version: v0.149.0

data/registry/collector-connector-exceptions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ createdAt: 2025-03-26
1919
package:
2020
registry: go-collector
2121
name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector
22-
version: v0.147.0
22+
version: v0.149.0

data/registry/collector-connector-failover.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2025-03-26
1818
package:
1919
registry: go-collector
2020
name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector
21-
version: v0.147.0
21+
version: v0.149.0

data/registry/collector-connector-forward.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ createdAt: 2025-03-26
1717
package:
1818
registry: go-collector
1919
name: go.opentelemetry.io/collector/connector/forwardconnector
20-
version: v0.147.0
20+
version: v0.149.0

0 commit comments

Comments
 (0)