Skip to content

Commit d7f99ef

Browse files
tiffany76tiffany76
authored
Merge branch 'main' into update-community-members
2 parents d5ec2e8 + 11964dd commit d7f99ef

File tree

22 files changed

+209
-213
lines changed

22 files changed

+209
-213
lines changed

‎.cspell.yml

+1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ words: # Valid words across all locales
5959
- Docsy
6060
- htmltest
6161
# Hugo
62+
- jsonify
6263
- warnf

‎.github/workflows/check-text.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ jobs:
4646
cache-dependency-path: tmp/package-ci.json
4747
- run: npm install --ignore-scripts --omit=optional
4848
- run: npm run check:markdown
49+
- run: npm run check:markdown2

‎assets/scss/_styles_project.scss

+35-4
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,42 @@ details {
339339

340340
.ot-training {
341341
@extend .td-no-left-sidebar;
342+
$card-padding: 2rem;
342343

343-
.otca img {
344-
border-style: none !important;
345-
max-width: 244px;
346-
margin: auto;
344+
.badge--otca {
345+
margin-top: map-get($spacers, 4) !important;
346+
img {
347+
border-style: none !important;
348+
display: initial;
349+
max-width: 244px;
350+
}
351+
@include media-breakpoint-up(md) {
352+
padding-left: $card-padding;
353+
}
354+
355+
@include media-breakpoint-down(md) {
356+
text-align: center;
357+
}
358+
}
359+
360+
.card--course-wrapper {
361+
@include media-breakpoint-up(md) {
362+
padding-left: $card-padding;
363+
}
364+
}
365+
366+
.card--course {
367+
margin-top: map-get($spacers, 5) !important;
368+
margin-bottom: map-get($spacers, 5) !important;
369+
370+
@include media-breakpoint-down(md) {
371+
margin-left: auto !important;
372+
margin-right: auto !important;
373+
}
374+
375+
img {
376+
padding-bottom: 2.6rem;
377+
}
347378
}
348379
}
349380

‎content/en/announcements/training.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: Training!
3+
date: 2025-02-14
4+
expiryDate: 2025-04-14
5+
---
6+
7+
<span class="badge text-bg-secondary">New</span> OTel **Certification** and
8+
_FREE_ **course**. [Learn more](/training/)

‎content/en/docs/concepts/instrumentation/libraries.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Follow the semantic conventions when setting span attributes.
7575

7676
Some libraries are thin clients wrapping network calls. Chances are that
7777
OpenTelemetry has an instrumentation library for the underlying RPC client.
78-
Check out the [registry](/ecosystem/registry/)) to find existing libraries. If a
78+
Check out the [registry](/ecosystem/registry/) to find existing libraries. If a
7979
library exists, instrumenting the wrapper library might not be necessary.
8080

8181
As a general guideline, only instrument your library at its own level. Don't

‎content/en/docs/languages/go/exporters.md

+8-152
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Exporters
33
aliases: [exporting_data]
44
weight: 50
55
# prettier-ignore
6-
cSpell:ignore: otlplog otlploggrpc otlploghttp otlpmetric otlpmetricgrpc otlpmetrichttp otlptrace otlptracegrpc otlptracehttp promhttp stdoutlog stdouttrace
6+
cSpell:ignore: otlplog otlploggrpc otlploghttp otlpmetric otlpmetricgrpc otlpmetrichttp otlptrace otlptracegrpc otlptracehttp stdoutlog stdouttrace
77
---
88

99
{{% docs/languages/exporters/intro go %}}
@@ -19,57 +19,18 @@ The
1919
[`go.opentelemetry.io/otel/exporters/stdout/stdouttrace`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdouttrace)
2020
package contains an implementation of the console trace exporter.
2121

22-
Here's how you can create an exporter with default configuration:
23-
24-
```go
25-
import (
26-
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
27-
"go.opentelemetry.io/otel/sdk/trace"
28-
)
29-
30-
func newExporter() (trace.SpanExporter, error) {
31-
return stdouttrace.New()
32-
}
33-
```
34-
3522
### Console metrics
3623

3724
The
3825
[`go.opentelemetry.io/otel/exporters/stdout/stdoutmetric`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutmetric)
3926
package contains an implementation of the console metrics exporter.
4027

41-
Here's how you can create an exporter with default configuration:
42-
43-
```go
44-
import (
45-
"go.opentelemetry.io/otel/exporters/stdout/stdoutmetric"
46-
"go.opentelemetry.io/otel/sdk/metric"
47-
)
48-
49-
func newExporter() (metric.Exporter, error) {
50-
return stdoutmetric.New()
51-
}
52-
```
53-
5428
### Console logs (Experimental) {#console-logs}
5529

5630
The
5731
[`go.opentelemetry.io/otel/exporters/stdout/stdoutlog`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/stdout/stdoutlog)
5832
package contains an implementation of the console log exporter.
5933

60-
Here's how you can create an exporter with default configuration:
61-
62-
```go
63-
import (
64-
"go.opentelemetry.io/otel/exporters/stdout/stdoutlog"
65-
"go.opentelemetry.io/otel/sdk/log"
66-
)
67-
68-
func newExporter() (log.Exporter, error) {
69-
return stdoutlog.New()
70-
}
71-
```
72-
7334
## OTLP
7435

7536
To send trace data to an OTLP endpoint (like the [collector](/docs/collector) or
@@ -82,41 +43,11 @@ endpoint.
8243
contains an implementation of the OTLP trace exporter using HTTP with binary
8344
protobuf payloads.
8445

85-
Here's how you can create an exporter with default configuration:
86-
87-
```go
88-
import (
89-
"context"
90-
91-
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
92-
"go.opentelemetry.io/otel/sdk/trace"
93-
)
94-
95-
func newExporter(ctx context.Context) (trace.SpanExporter, error) {
96-
return otlptracehttp.New(ctx)
97-
}
98-
```
99-
10046
### OTLP traces over gRPC
10147

10248
[`go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)
10349
contains an implementation of OTLP trace exporter using gRPC.
10450

105-
Here's how you can create an exporter with default configuration:
106-
107-
```go
108-
import (
109-
"context"
110-
111-
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
112-
"go.opentelemetry.io/otel/sdk/trace"
113-
)
114-
115-
func newExporter(ctx context.Context) (trace.SpanExporter, error) {
116-
return otlptracegrpc.New(ctx)
117-
}
118-
```
119-
12051
### Jaeger
12152

12253
To try out the OTLP exporter, since v1.35.0 you can run
@@ -138,40 +69,21 @@ docker run -d --name jaeger \
13869
contains an implementation of OTLP metrics exporter using HTTP with binary
13970
protobuf payloads.
14071

141-
Here's how you can create an exporter with default configuration:
142-
143-
```go
144-
import (
145-
"context"
146-
147-
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
148-
"go.opentelemetry.io/otel/sdk/metric"
149-
)
150-
151-
func newExporter(ctx context.Context) (metric.Exporter, error) {
152-
return otlpmetrichttp.New(ctx)
153-
}
154-
```
155-
15672
### OTLP metrics over gRPC
15773

15874
[`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc)
15975
contains an implementation of OTLP metrics exporter using gRPC.
16076

161-
Here's how you can create an exporter with default configuration:
77+
### OTLP logs over HTTP (Experimental)
16278

163-
```go
164-
import (
165-
"context"
79+
[`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp)
80+
contains an implementation of OTLP logs exporter using HTTP with binary protobuf
81+
payloads.
16682

167-
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
168-
"go.opentelemetry.io/otel/sdk/metric"
169-
)
83+
### OTLP logs over gRPC (Experimental)
17084

171-
func newExporter(ctx context.Context) (metric.Exporter, error) {
172-
return otlpmetricgrpc.New(ctx)
173-
}
174-
```
85+
[`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc)
86+
contains an implementation of OTLP logs exporter using gRPC.
17587

17688
## Prometheus (Experimental)
17789

@@ -184,61 +96,5 @@ contains an implementation of Prometheus metrics exporter.
18496
Here's how you can create an exporter (which is also a metric reader) with
18597
default configuration:
18698

187-
```go
188-
import (
189-
"context"
190-
191-
"go.opentelemetry.io/otel/exporters/prometheus"
192-
"go.opentelemetry.io/otel/sdk/metric"
193-
)
194-
195-
func newExporter(ctx context.Context) (metric.Reader, error) {
196-
// prometheus.DefaultRegisterer is used by default
197-
// so that metrics are available via promhttp.Handler.
198-
return prometheus.New()
199-
}
200-
```
201-
20299
To learn more on how to use the Prometheus exporter, try the
203100
[prometheus example](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples/prometheus)
204-
205-
### OTLP logs over HTTP (Experimental)
206-
207-
[`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp)
208-
contains an implementation of OTLP logs exporter using HTTP with binary protobuf
209-
payloads.
210-
211-
Here's how you can create an exporter with default configuration:
212-
213-
```go
214-
import (
215-
"context"
216-
217-
"go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp"
218-
"go.opentelemetry.io/otel/sdk/log"
219-
)
220-
221-
func newExporter(ctx context.Context) (log.Exporter, error) {
222-
return otlploghttp.New(ctx)
223-
}
224-
```
225-
226-
### OTLP logs over gRPC (Experimental)
227-
228-
[`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc)
229-
contains an implementation of OTLP logs exporter using gRPC.
230-
231-
Here's how you can create an exporter with default configuration:
232-
233-
```go
234-
import (
235-
"context"
236-
237-
"go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc"
238-
"go.opentelemetry.io/otel/sdk/log"
239-
)
240-
241-
func newExporter(ctx context.Context) (log.Exporter, error) {
242-
return otlploggrpc.New(ctx)
243-
}
244-
```

‎content/en/ecosystem/registry/_index.md

+15-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ title: Registry
33
description: >-
44
Find libraries, plugins, integrations, and other useful tools for using and
55
extending OpenTelemetry.
6+
type: default
7+
layout: registry
8+
body_class: registry td-content
9+
weight: 20
10+
11+
# =============================================================================
12+
# IMPORTANT:
13+
# IMPORTANT: Non-English locales: DO NOT include the front matter entries below
14+
# IMPORTANT:
15+
# =============================================================================
16+
17+
aliases: [/registry/*]
18+
outputs: [html, json]
19+
620
# The redirects and aliases implement catch-all rules for old registry entries;
721
# we don't publish individual entry pages anymore.
822
#
@@ -11,19 +25,13 @@ description: >-
1125
# redirect rule to avoid the loop, as suggested by Netlify support
1226
# (email support ID 159489):
1327
redirects: [{ from: /ecosystem/registry*, to: '/ecosystem/registry?' }]
14-
aliases: [/registry/*]
15-
type: default
16-
layout: registry
17-
outputs: [html, json]
18-
body_class: registry td-content
19-
weight: 20
2028
---
2129

2230
{{% blocks/lead color="dark" %}}
2331

2432
<!-- markdownlint-disable single-h1 -->
2533

26-
# {{% param title %}}
34+
<h1>{{% param title %}}</h1>
2735

2836
{{% param description %}}
2937

‎content/en/training/LFS148-Course-Badge-300x300.avif

16.1 KB
Binary file not shown.

‎content/en/training/_index.md

-28
This file was deleted.

0 commit comments

Comments
 (0)