Skip to content

Commit 24df9d6

Browse files
authored
Merge branch 'main' into update-community-members
2 parents 36407ed + 02c97e5 commit 24df9d6

15 files changed

+111
-27
lines changed

.github/workflows/auto-update-community-members.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update community members page
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

.github/workflows/auto-update-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update registry versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

.github/workflows/auto-update-versions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
if: github.repository == 'open-telemetry/opentelemetry.io'
1414
env:
1515
DEPTH: --depth 999 # submodule clone depth

.htmltest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ IgnoreDirs:
2525
IgnoreInternalURLs: # list of paths
2626
IgnoreURLs: # list of regexs of paths or URLs to be ignored
2727
- /index.xml$ # Ignore rel="alternative" links to RSS feeds
28-
- ^/api$
28+
- ^/api/?$
2929
- ^((/..)?/docs/languages/\w+|\.\.)/(api|examples|registry)/$
3030
- ^(/..)?/docs/collector/registry/$
3131
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Styles for docs-like pages without left sidebar
2+
3+
.td-no-left-sidebar .td-main {
4+
// Hide left sidebar
5+
.td-sidebar {
6+
display: none !important;
7+
}
8+
9+
// Adjust ToC sidebar, e.g., to fill Bootstrap columns that the left sidebar
10+
// would have taken was using.
11+
.td-sidebar-toc {
12+
@include media-breakpoint-up(md) {
13+
display: block !important;
14+
}
15+
16+
// Always 2 col wide (unless hidden)
17+
@extend .col-md-2;
18+
19+
// Don't scroll with the page (otherwise, for short pages, the ToC hides
20+
// behind the top navbar).
21+
position: fixed;
22+
right: 0;
23+
24+
// Ensure ToC doesn't overlap with the footer
25+
z-index: -1;
26+
}
27+
28+
// The <main> element sibling of the ToC sidebar
29+
> div > main {
30+
// Always 10 col wide (unless the ToC sidebar is hidden)
31+
@extend .col-md-10;
32+
@extend .col-xl-10;
33+
34+
@include media-breakpoint-up(md) {
35+
padding-right: 3rem;
36+
}
37+
38+
@include media-breakpoint-up(lg) {
39+
// Center content on larger screens
40+
41+
.td-content {
42+
max-width: 80%;
43+
margin-left: auto;
44+
margin-right: auto;
45+
46+
// Cancel .td-max-width-on-larger-screens
47+
> * {
48+
max-width: 100%;
49+
}
50+
}
51+
}
52+
}
53+
}

assets/scss/_styles_project.scss

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* Docsy-delta full file override: we're not tracking changes to the Docsy file of the same name. */
2-
// cSpell:ignore cncf docsy
2+
// cSpell:ignore cncf docsy otca
33

44
@import 'registry';
55
@import 'tabs';
66
@import 'external_link';
77
@import 'td/code-dark';
8+
@import '_page_no_left_sidebar';
89

910
.td-home {
1011
.otel-logo {
@@ -335,3 +336,21 @@ details {
335336
padding-left: 0.6rem;
336337
}
337338
}
339+
340+
.ot-training {
341+
@extend .td-no-left-sidebar;
342+
343+
.otca img {
344+
border-style: none !important;
345+
max-width: 244px;
346+
margin: auto;
347+
}
348+
}
349+
350+
// TODO: upstream to Docsy
351+
352+
.hk-no-external-icon {
353+
a.external-link:after {
354+
display: none !important;
355+
}
356+
}

content/en/status.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ title: Status
33
menu: { main: { weight: 30 } }
44
aliases: [/project-status, /releases]
55
description: Maturity-level of the main OpenTelemetry components
6+
type: docs
7+
body_class: td-no-left-sidebar
68
---
79

8-
{{% blocks/section color="white" %}}
9-
10-
## {{% param title %}}
11-
1210
OpenTelemetry is made up of [several components](/docs/concepts/components/),
1311
some language-specific and others language-agnostic. When looking for a
1412
[status](/docs/specs/otel/versioning-and-stability/), make sure to look for the
@@ -50,5 +48,3 @@ state with components in `v1alpha1` and `v1beta1` states.
5048
For the development status, or maturity level, of the
5149
[specification](/docs/specs/otel/), see the following:
5250
[Specification Status Summary](/docs/specs/status/).
53-
54-
{{% /blocks/section %}}

content/en/training/_index.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
22
title: Training
33
menu: { main: { weight: 45 } }
4-
description: Training programs and certifications for OpenTelemetry
4+
description: OpenTelemetry certifications and courses
5+
type: docs
6+
body_class: ot-training
7+
hide_feedback: true
58
cSpell:ignore: otca
69
---
710

8-
{{% blocks/section color="white" %}}
9-
10-
## {{% param title %}}
11-
1211
This page showcases training resources for the OpenTelemetry project. Check back
1312
often for updates!
1413

@@ -17,12 +16,13 @@ often for updates!
1716
Demonstrate your expertise in OpenTelemetry by becoming an OpenTelemetry
1817
Certified Associate.
1918

20-
<a href="https://www.cncf.io/training/certification/otca/">
21-
<img src="lft-badge-opentelemetry-associate2.svg" style="width: 250px; height: auto;" alt="OTCA Badge">
22-
</a>
19+
<!-- prettier-ignore -->
20+
[![OTCA badge]][OTCA URL]
21+
{.otca .hk-no-external-icon}
2322

24-
### Training programs
23+
[OTCA badge]: lft-badge-opentelemetry-associate2.svg
24+
[OTCA URL]: https://www.cncf.io/training/certification/otca/
2525

26-
Coming soon!
26+
### Courses
2727

28-
{{% /blocks/section %}}
28+
Coming soon!

data/ecosystem/distributions.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
url: https://aws.amazon.com/otel/
88
docsUrl: https://aws-otel.github.io/docs/getting-started/collector
99
components: [Collector]
10+
- name: AWS AWS Distro for OpenTelemetry - Instrumentation for JavaScript
11+
url: https://github.com/aws-observability/aws-otel-js
12+
docsUrl: https://github.com/aws-observability/aws-otel-js
13+
components: [Node]
14+
- name: AWS AWS Distro for OpenTelemetry - Instrumentation for Python
15+
url: https://github.com/aws-observability/aws-otel-python
16+
docsUrl: https://github.com/aws-observability/aws-otel-python
17+
components: [Python]
1018
- name: Grafana Alloy
1119
url: https://github.com/grafana/alloy
1220
docsUrl: https://grafana.com/docs/alloy/latest/

data/registry/exporter-dotnet-onecollector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2023-03-03
1818
package:
1919
registry: nuget
2020
name: OpenTelemetry.Exporter.OneCollector
21-
version: 1.11.0-beta.1
21+
version: 1.11.0

data/registry/instrumentation-js-azure-sdk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ urls:
1818
package:
1919
name: '@azure/opentelemetry-instrumentation-azure-sdk'
2020
registry: npm
21-
version: 1.0.0-beta.7
21+
version: 1.0.0-beta.8
2222
createdAt: 2021-12-16
2323
isFirstParty: true

data/registry/instrumentation-php-pdo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ createdAt: 2023-05-22
1515
package:
1616
registry: packagist
1717
name: open-telemetry/opentelemetry-auto-pdo
18-
version: 0.0.16
18+
version: 0.0.17
1919
isFirstParty: false

data/registry/instrumentation-ruby-all.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ createdAt: 2020-11-09
1414
package:
1515
registry: gems
1616
name: opentelemetry-instrumentation-all
17-
version: 0.73.1
17+
version: 0.74.0
1818
isFirstParty: false

data/registry/instrumentation-ruby-rdkafka.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ createdAt: 2022-10-27
1818
package:
1919
registry: gems
2020
name: opentelemetry-instrumentation-rdkafka
21-
version: 0.5.0
21+
version: 0.6.0
2222
isFirstParty: false

static/refcache.json

+8
Original file line numberDiff line numberDiff line change
@@ -2891,6 +2891,14 @@
28912891
"StatusCode": 206,
28922892
"LastSeen": "2025-01-16T13:05:48.070495-05:00"
28932893
},
2894+
"https://github.com/aws-observability/aws-otel-js": {
2895+
"StatusCode": 206,
2896+
"LastSeen": "2025-02-03T10:28:17.890526733Z"
2897+
},
2898+
"https://github.com/aws-observability/aws-otel-python": {
2899+
"StatusCode": 206,
2900+
"LastSeen": "2025-02-03T10:28:21.284075121Z"
2901+
},
28942902
"https://github.com/bacherfl": {
28952903
"StatusCode": 200,
28962904
"LastSeen": "2024-11-18T23:18:23.510566336Z"

0 commit comments

Comments
 (0)