Skip to content

Commit

Permalink
Merge branch 'main' into internal-obs-3
Browse files Browse the repository at this point in the history
  • Loading branch information
tiffany76 authored Jun 11, 2024
2 parents 9cf1347 + 66b62d8 commit 7377638
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[submodule "content-modules/opentelemetry-specification"]
path = content-modules/opentelemetry-specification
url = https://github.com/open-telemetry/opentelemetry-specification.git
spec-pin = v1.33.0
spec-pin = v1.34.0
[submodule "content-modules/community"]
path = content-modules/community
url = https://github.com/open-telemetry/community
Expand Down
2 changes: 2 additions & 0 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^https://wikipedia.org/wiki/(S.M.A.R.T|Hop_)
# TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
- ^https://shorturl.at/vLYZ0$
# TODO remove while or after fixing https://github.com/open-telemetry/opentelemetry.io/issues/4656
- ^/docs/specs/otel/versioning-and-stability/#experimental
2 changes: 1 addition & 1 deletion content-modules/opentelemetry-specification
Submodule opentelemetry-specification updated 35 files
+3 −3 .github/CODEOWNERS
+64 −2 CHANGELOG.md
+1 −1 README.md
+20 −0 development/README.md
+1 −1 development/metrics/config-service.md
+0 −0 development/trace/zpages.md
+0 −15 experimental/README.md
+29 −38 spec-compliance-matrix.md
+4 −5 specification/README.md
+1 −1 specification/common/attribute-type-mapping.md
+1 −1 specification/compatibility/logging_trace_context.md
+1 −1 specification/compatibility/opentracing.md
+4 −4 specification/compatibility/prometheus_and_openmetrics.md
+1 −1 specification/configuration/file-configuration.md
+3 −3 specification/configuration/sdk-environment-variables.md
+6 −2 specification/document-status.md
+1 −1 specification/logs/README.md
+27 −2 specification/logs/bridge-api.md
+49 −18 specification/logs/event-api.md
+37 −9 specification/logs/event-sdk.md
+14 −6 specification/logs/sdk.md
+30 −2 specification/metrics/api.md
+3 −3 specification/metrics/data-model.md
+40 −14 specification/metrics/sdk.md
+1 −1 specification/metrics/sdk_exporters/prometheus.md
+1 −1 specification/protocol/file-exporter.md
+1 −1 specification/schemas/file_format_v1.0.0.md
+1 −1 specification/schemas/file_format_v1.1.0.md
+2 −2 specification/semantic-conventions.md
+1 −1 specification/telemetry-stability.md
+25 −0 specification/trace/api.md
+14 −6 specification/trace/sdk.md
+1 −1 specification/trace/tracestate-handling.md
+1 −1 specification/trace/tracestate-probability-sampling.md
+51 −35 specification/versioning-and-stability.md
4 changes: 2 additions & 2 deletions content/zh/docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OpenTelemetry 也被称为 OTel,是一个供应商中立的、开源的[可观
可用于插桩、生成、采集和导出[链路](concepts/signals/traces/)
[指标](concepts/signals/metrics/)[日志](concepts/signals/logs/)等遥测数据。

OpenTelemetry 作为一个行业标准,得到了 40 多个可观测供应商的支持,
被许多[代码库、服务和应用](/ecosystem/integrations/)集成,被众多[最终用户](/ecosystem/adopters/)采用。
OpenTelemetry 作为一个行业标准,得到了 [40 多个可观测供应商的支持](/ecosystem/vendors/)
被许多[代码库、服务和应用](/ecosystem/integrations/)集成,[众多最终用户](/ecosystem/adopters/)采用。

![OpenTelemetry 基准架构](/img/otel-diagram.svg)
7 changes: 6 additions & 1 deletion data/ecosystem/adopters.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cSpell:ignore Dyte Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner VTEX
# cSpell:ignore Dyte Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Sicredi Skyscanner VTEX
- name: AppDirect
url: https://www.appdirect.com/
components: [Collector]
Expand Down Expand Up @@ -83,6 +83,11 @@
components: [Collector, Go, Ruby]
reference: ''
contact: ''
- name: Sicredi
url: https://www.sicredi.com.br/
components: [Collector, Go, Java, Python]
reference: ''
contact: https://github.com/igorestevanjasinski
- name: Skyscanner
url: https://www.skyscanner.net/
components: [Collector, Go, Java, Javascript, Python]
Expand Down
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ authors:
package:
name: Azure.Monitor.OpenTelemetry.Exporter
registry: nuget
version: 1.3.0-beta.2
version: 1.3.0
urls:
repo: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter
createdAt: 2021-11-01
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-onecollector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2023-03-03
package:
registry: nuget
name: OpenTelemetry.Exporter.OneCollector
version: 1.8.0
version: 1.9.0-rc.1
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-express.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-express'
version: 0.40.0
version: 0.40.1
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-mongodb'
version: 0.44.0
version: 0.45.0
2 changes: 1 addition & 1 deletion data/registry/resource-detector-js-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ createdAt: 2022-12-07
package:
registry: npm
name: '@opentelemetry/resource-detector-azure'
version: 0.2.8
version: 0.2.9
2 changes: 1 addition & 1 deletion data/registry/resource-detector-js-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-12-07
package:
registry: npm
name: '@opentelemetry/resource-detector-container'
version: 0.3.10
version: 0.3.11
2 changes: 1 addition & 1 deletion layouts/shortcodes/spec_status.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- https://opentelemetry.io/docs/specs/otel/document-status/
- https://github.com/open-telemetry/opentelemetry-proto#maturity-level
*/ -}}
{{ $statusValueRE := "(?i:experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}}
{{ $statusValueRE := "(?i:development|experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}}
{{ $statusRE := printf "%s(,\\s*%s)*" $statusValueRE $statusValueRE -}}
{{ with findRE $statusRE $statusLine -}}
{{ $status = index . 0 -}}
Expand Down
3 changes: 2 additions & 1 deletion scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md";
my $specBasePath = '/docs/specs';
my %versions = qw(
spec: 1.33.0
spec: 1.34.0
otlp: 1.3.1
semconv: 1.26.0
);
Expand Down Expand Up @@ -133,6 +133,7 @@ ()
s|(/context/api-propagators.md)#propagators-api|$1|g;
s|(/semantic_conventions/faas.md)#function-as-a-service|$1|g;
s|(/resource/sdk.md)#resource-sdk|$1|g;
s|(event-api.md#)(data-model)|$1event-$2|g;

s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/;
s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/;
Expand Down

0 comments on commit 7377638

Please sign in to comment.