Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jbarossitrs authored Mar 15, 2023
2 parents d472f6f + 3a002eb commit 54d268a
Show file tree
Hide file tree
Showing 39 changed files with 694 additions and 406 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Check links and refcache # cSpell:ignore refcache

on:
pull_request:

jobs:
check-formatting:
name: Check links and refcache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- run: npm install
- run: npm run build
- run: npm run _check:links

- name: Fail on uncommitted refcache changes
run: npm run diff:fail
2 changes: 2 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"daemonset",
"Dynatrace",
"Grafana",
"gzipped",
"hugo",
"initializers",
"Istio",
Expand All @@ -29,6 +30,7 @@
"relref",
"roadmap",
"runtimes",
"SNMP",
"subdir",
"tabpane",
"tocstop",
Expand Down
2 changes: 1 addition & 1 deletion assets/js/registrySearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function setInput(key, value) {

// Filters items based on language and component filters
function updateFilters() {
let allItems = [...document.getElementsByClassName('media')];
let allItems = [...document.getElementsByClassName('registry-entry')];
if (selectedComponent === 'all' && selectedLanguage === 'all') {
allItems.forEach((element) => element.classList.remove('d-none'));
} else {
Expand Down
6 changes: 6 additions & 0 deletions assets/scss/_registry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@
background-color: inherit;
border: solid 1px;
}

// Default color attributes, in case we miss a component definition above;
// which has happened, see https://github.com/open-telemetry/opentelemetry.io/pull/2481.
$default-otel-badge-bg: $yellow;
color: color-contrast($default-otel-badge-bg);
background-color: $default-otel-badge-bg;
}
79 changes: 55 additions & 24 deletions assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
> a {
@extend .btn;
margin: 0.25rem;

&:hover {
text-decoration: none;
}
}
}
}
Expand Down Expand Up @@ -109,42 +113,47 @@
padding-top: 1rem;
}

// Homepage
#cncf {
width: 100%;
text-align: center;

p {
font-size: 18px;
margin-bottom: 0;
.td-home {
.td-main {
// Remove the gap between the last block shortcode and the footer (on homepage)
flex-grow: 0;
}

img {
margin-top: 1rem;
width: 20rem;
max-width: 80%;
.cncf {
text-align: center;

p {
font-size: 1.2rem;
margin-bottom: 0;
}

img {
width: 20rem;
padding-top: 1rem;
max-width: 80%;
}

a.external-link:after {
display: none;
}
}
}

a.external-link:after {
display: none;
.td-default, // E.g.: Homepage, Status, Search, 404; excludes navbar
.td-section main, .td-page main, // Doc and blog main content without left/right navs
.td-page-meta {
a:hover:not(.dropdown-item) {
text-decoration: underline;
}
}

.td-box--dark a,
.td-box--primary a {
color: lighten($primary, 25%) !important;

&:hover {
text-decoration: underline;
}
color: lighten($primary, 25%) !important; // TODO: upstream
}

.td-box--secondary a {
color: darken($primary, 25%) !important;

&:hover {
text-decoration: underline;
}
color: darken($primary, 25%) !important; // TODO: upstream
}

// Adjust anchors scroll snap (https://github.com/open-telemetry/opentelemetry.io/pull/348)
Expand Down Expand Up @@ -269,3 +278,25 @@
}
}
}

// Registry

.td-section.registry {
.td-outer {
height: auto;
}

.registry-entry {
display: flex;
align-items: flex-start;
padding-bottom: 0.5rem;

.h5 {
margin-bottom: 0.2rem;
}

&-body {
flex: 1;
}
}
}
1 change: 1 addition & 0 deletions assets/scss/_variables_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $otel-component-colors: (
'processor': #d32c42,
'python': #3572a5,
'receiver': #742cd3,
'resource-detector': green,
'ruby': #701516,
'rust': #dea584,
'swift': #de5d43,
Expand Down
26 changes: 15 additions & 11 deletions content/en/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
---
title: OpenTelemetry
description: >-
High-quality, ubiquitous, and portable telemetry to enable effective
observability
show_banner: true
developer_note:
The blocks/cover shortcode (used below) will use as a background image any
Expand All @@ -10,14 +13,19 @@ spelling: cSpell:ignore shortcode
<div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>

{{< blocks/cover image_anchor="top" height="max" color="primary" >}}
<img src="/img/logos/opentelemetry-horizontal-color.svg" class="otel-logo" alt="OpenTelemetry"/>

## High-quality, ubiquitous, and portable telemetry to enable effective observability
<!-- prettier-ignore -->
![OpenTelemetry](/img/logos/opentelemetry-horizontal-color.svg)
{.otel-logo}

<!-- prettier-ignore -->
{{% param description %}}
{.display-6}

<div class="l-primary-buttons mt-5">

- [Learn more](/docs/concepts/)
- [Try the demo](/ecosystem/demo/)
- [Try the demo](/docs/demo/)

</div>

Expand All @@ -43,7 +51,7 @@ you analyze your software's performance and behavior.
{{% /blocks/lead %}}

{{% blocks/section color="dark" %}}
{{% blocks/section color="dark" type="row" %}}

{{% blocks/feature icon="fas fa-chart-line" title="Traces, Metrics, Logs"%}}

Expand All @@ -69,19 +77,15 @@ Installation and integration can be as simple as a few lines of code.

{{% /blocks/section %}}

{{% blocks/section color="secondary" %}}

<div id="cncf">
{{% blocks/section color="secondary" type="cncf" %}}

**OpenTelemetry is a [CNCF][] [incubating][] project**.

Formed through a merger of the OpenTracing and OpenCensus projects.
**OpenTelemetry is a [CNCF][] [incubating][] project**.<br> Formed through a
merger of the OpenTracing and OpenCensus projects.

[![CNCF logo][]][cncf]

[cncf]: https://cncf.io
[cncf logo]: /img/logos/cncf-white.svg
[incubating]: https://www.cncf.io/projects/

</div>
{{% /blocks/section %}}
2 changes: 1 addition & 1 deletion content/en/blog/2022/debug-otel-with-otel/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ COPY opentelemetry_module.conf /etc/nginx/conf.d
/blog/2022/instrument-nginx/#put-nginx-between-two-services
[localhost:16686]: http://localhost:16686/
[http request & response headers]:
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md#http-request-and-response-headers
/docs/reference/specification/trace/semantic_conventions/http/#http-request-and-response-headers
[rfc7230]: https://httpwg.org/specs/rfc7230.html#field.order
[added some checks to the nginx module]:
https://github.com/open-telemetry/opentelemetry-cpp-contrib/pull/204
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2022/instrument-kafka-clients/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ comes into the picture. It provides multiple instrumentation libraries for
adding tracing to messaging based applications. Of course, there is one for
Apache Kafka clients. It also defines the specification of semantic conventions
for
[messaging systems](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md).
[messaging systems](/docs/reference/specification/trace/semantic_conventions/messaging/).

But usually, the architecture can even be more complicated: having applications
not able to connect directly to the Apache Kafka cluster and talking its own
Expand Down
5 changes: 2 additions & 3 deletions content/en/blog/2023/http-conventions-stability.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ author: '[Trask Stalnaker](https://github.com/trask) (Microsoft)'
---

The OpenTelemetry community is beginning the final push to declare HTTP
[tracing](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md)
and
[metrics](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md)
[tracing](/docs/reference/specification/trace/semantic_conventions/http/) and
[metrics](/docs/reference/specification/metrics/semantic_conventions/http-metrics/)
semantic conventions stable!

Following the recently proposed
Expand Down
24 changes: 14 additions & 10 deletions content/en/community/end-user/discussion-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ and changes to the project.

**New for 2023!**

- APAC (Asia Pacific) sessions begin, come join the first session on January 18!
- Sessions are now available for all regions!
- You can now find summaries of past discussions every month! Search the blog
for "End-User Discussions".
- A project maintainer and/or a Governance Committee member will be in
attendance at each session to provide additional context, insight, and plans
to user questions and feedback.
Expand All @@ -31,18 +33,20 @@ Here are upcoming sessions, or you can view them on the
- **EMEA (Europe, Middle East, and Africa)**: every third Tuesday of the month
at 11AM CET (GMT +1), join
[here](https://us06web.zoom.us/j/85691064809?pwd=c0VCejh)
- January 17
- February 21
- **APAC (Asia Pacific)**: every third Wednesday of the month at 11AM IST (GMT
+5.5), join
[here](https://us06web.zoom.us/j/82702918447?pwd=WllKc0hmdTNuelhFdlhMM1Q3TktSQT09)
- January 18
- February 15
- March 21
- April 18
- May 16
- **APAC (Asia Pacific)**: every third Wednesday of the month at 11AM India ST
(GMT +5.5), register [here](https://lu.ma/1w129wgu) to get the Zoom link
- March 15
- April 19
- May 17
- **AMER (Americas)**: every third Thursday of the month at 9AM PST (GMT -8),
join
[here](https://us06web.zoom.us/j/87037874951?pwd=WGo3eUZpeWFZTlhJQXhJeXZhQmwvUT09)
- January 19
- February 16
- March 16
- April 20
- May 18

Past topics/questions have included:

Expand Down
Loading

0 comments on commit 54d268a

Please sign in to comment.