Skip to content

Commit aba40d8

Browse files
authored
Merge branch 'main' into pt_update_languages_java_instrumentation
2 parents ea94e1a + df303f1 commit aba40d8

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[submodule "themes/docsy"]
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
5-
docsy-pin = v0.11.0-38-g77da7e49
5+
docsy-pin = v0.11.0-39-g9e685592
66
docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
77
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."
88
[submodule "content-modules/opentelemetry-specification"]

content/en/docs/collector/internal-telemetry.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Prometheus exporter, regardless of their origin, are prefixed with `otelcol_`.
209209
This includes metrics from both Collector components and instrumentation
210210
libraries. {{% /alert %}}
211211

212-
{{% comment %}}
212+
{{< comment >}}
213213

214214
To compile this list, configure a Collector instance to emit its own metrics to
215215
the localhost:8888/metrics endpoint. Select a metric and grep for it in the
@@ -222,7 +222,7 @@ the .go file that contains the list of metrics. In the case of
222222
Note that the Collector's internal metrics are defined in several different
223223
files in the repository.
224224

225-
{{% /comment %}}
225+
{{< /comment >}}
226226

227227
#### `basic`-level metrics
228228

content/en/docs/languages/java/sdk.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: Manage Telemetry with SDK
33
weight: 12
4+
aliases: [exporters]
45
cSpell:ignore: autoconfigured FQCNs Interceptable Logback okhttp
56
---
67

content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ OpenTelemetry Zipkin Exporter Starter is a starter package that includes the
1818
and spring framework starters required to setup distributed tracing. It also
1919
provides the
2020
[opentelemetry-exporters-zipkin](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/zipkin)
21-
artifact and corresponding exporter autoconfiguration. Check out
22-
[opentelemetry-spring-boot-autoconfigure](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/spring/spring-boot-autoconfigure/README.md#features)
23-
for the list of supported libraries and features.
21+
artifact and corresponding exporter autoconfiguration.
2422

2523
If an exporter is present in the classpath during runtime and a spring bean of
2624
the exporter is missing from the spring application context, an exporter bean is

content/pt/docs/concepts/signals/_index.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: Sinais
33
description:
44
Aprenda sobre as categorias de telemetria suportadas pelo OpenTelemetry
55
weight: 11
6-
default_lang_commit: 7c0e4db0b6c39b0ca0e7efb17df5610d1b77b8a3
6+
aliases: [data-sources, otel-concepts]
7+
default_lang_commit: c370886c9926e6cab3738ababbf6ff5692899bbd
78
---
89

910
O propósito do OpenTelemetry é coletar, processar e exportar [sinais]. Sinais

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
"ajv-formats": "^3.0.1",
121121
"ajv": "^8.17.1",
122122
"autoprefixer": "^10.4.20",
123-
"cspell": "^8.17.2",
123+
"cspell": "^8.17.3",
124124
"gulp": "^5.0.0",
125-
"hugo-extended": "0.142.0",
125+
"hugo-extended": "0.143.0",
126126
"js-yaml": "^4.1.0",
127127
"markdown-link-check": "^3.13.6",
128128
"markdownlint": "^0.37.4",
@@ -151,7 +151,7 @@
151151
"path": "^0.12.7"
152152
},
153153
"optionalDependencies": {
154-
"netlify-cli": "^18.0.2",
154+
"netlify-cli": "^18.0.3",
155155
"npm-check-updates": "^17.1.14"
156156
},
157157
"enginesComment": "Ensure that engines.node value stays consistent with the project's .nvmrc",

0 commit comments

Comments
 (0)