Merge branch 'main' into feat/add-concepts-index-pt

.github/workflows/component-owners.yml

@@ -1,6 +1,7 @@
 name: Component owners
 on:
-  pull_request_target:
+  workflow_dispatch:
+  # pull_request_target:
 
 jobs:
   run_self:

.htmltest.yml

@@ -15,6 +15,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
   - ^((/..)?/docs/migration/)?opencensus/$
   - ^(/community/end-user/)?feedback-survey/$
+  - ^/../docs/specs/?$ # non-default locale spec redirect
 
   - ^https://deploy-preview-\d+--opentelemetry.netlify.app/
   - ^https://www\.googletagmanager\.com
@@ -72,5 +73,3 @@ 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 the following temporary ignore rule (@chalin)
-  - ^/en/docs/specs$

content/en/blog/2024/kubecon-china.md

@@ -19,8 +19,8 @@ conference begins.
 ## Maintainer sessions
 
 - **[OpenTelemetry Community Update | OpenTelemetry社区更新](https://sched.co/1eYcJ)**<br>
-  by Zihao Rao & Huxing Zhang, Alibaba Cloud<br> Wednesday, August 21 • 3:35 -
-  4:10
+  by Zihao Rao & Huxing Zhang & Wanqi Yang, Alibaba Cloud & Jared Tan,
+  DaoCloud<br> Wednesday, August 21 • 3:35 - 4:10
 
 ## AI_dev talks
 
@@ -41,7 +41,7 @@ by Zihao Rao & Ziyi Lin, Alibaba Cloud<br> Thursday, August 22 • 1:50 - 2:25
   by Husni Alhamdani, Censhare & Herbert Sianturi, Krom Bank<br> Thursday,
   August 22 • 3:35 - 4:10
 - **[OpenTelemetry Amplified: Full Observability with EBPF-Enabled Distributed Tracing | OpenTelemetry放大：使用eBPF启用的分布式跟踪实现全面的可观测性](https://sched.co/1eYZq)**<br>
-  by Kai Liu, Alibaba Cloud & Wanqi Yang, Sun Yat<br> Thursday, August 22 •
-  5:15 - 5:50
+  by Kai Liu, Alibaba Cloud & Wanqi Yang, Sun Yat-sen University<br> Thursday,
+  August 22 • 5:15 - 5:50
 
 Come listen, learn, and get involved in OpenTelemetry. See you in Hong Kong!

content/ja/docs/specs/_index.md

@@ -1,12 +1,8 @@
 ---
 title: Specifications
 linkTitle: Specs ↗
-description: _Redirect page_
 weight: 960
-# _build: { render: link }
-redirect: /en/docs/specs 301!
-redirects: [{ from: '*', to: '/en/docs/specs/:splat' }]
+_build: { render: link }
+redirects: [{ from: '*', to: '/docs/specs/:splat' }]
 default_lang_commit: 3b44fbfa49ced919daea01123abfaed836d2d0ec
 ---
-
-Netlify redirect target: [{{% param "title" %}}]({{% param "redirect" %}}).

data/ecosystem/vendors.yaml

@@ -47,6 +47,12 @@
   contact: [email protected]
   oss: false
   commercial: true
+- name: Centreon
+  nativeOTLP: true
+  url: https://docs.centreon.com/pp/integrations/plugin-packs/getting-started/how-to-guides/telegraf/
+  contact: [email protected]
+  oss: false
+  commercial: true
 - name: Chronosphere
   distribution: false
   nativeOTLP: true

data/registry/instrumentation-cpp-httpd.yml

@@ -13,3 +13,4 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/httpd
 createdAt: 2021-11-11
+isFirstParty: false

data/registry/instrumentation-cpp-nginx.yml

@@ -14,3 +14,4 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/nginx
 createdAt: 2021-11-11
+isFirstParty: false

data/registry/instrumentation-cpp-otel-webserver-module.yml

@@ -17,3 +17,4 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/otel-webserver-module
 createdAt: 2022-06-10
+isFirstParty: false

data/registry/instrumentation-dotnet-aspnet-telemetryhttpmodule.yml

@@ -17,6 +17,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
 createdAt: 2022-11-07
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule

data/registry/instrumentation-dotnet-aspnet.yml

@@ -14,6 +14,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AspNet

data/registry/instrumentation-dotnet-aspnetcore.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNetCore
 createdAt: 2022-11-07
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AspNetCore

data/registry/instrumentation-dotnet-aws.yml

@@ -16,6 +16,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWS
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AWS

data/registry/instrumentation-dotnet-awslambda.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWSLambda
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AWSLambda

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

@@ -15,3 +15,4 @@ authors:
 urls:
   repo: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/Diagnostics.md#opentelemetry-with-azure-monitor-zipkin-and-others
 createdAt: 2021-12-16
+isFirstParty: true

data/registry/instrumentation-dotnet-cassandra.yml

@@ -13,6 +13,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Cassandra
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Cassandra

data/registry/instrumentation-dotnet-confluentkafka.yml

@@ -13,3 +13,4 @@ description: Confluent.Kafka client instrumentation for OpenTelemetry
 authors:
   - name: OpenTelemetry Authors
 createdAt: 2024-07-08
+isFirstParty: false

data/registry/instrumentation-dotnet-elasticsearchclient.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.ElasticsearchClient
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.ElasticsearchClient

data/registry/instrumentation-dotnet-entityframeworkcore.yml

@@ -16,6 +16,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EntityFrameworkCore
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.EntityFrameworkCore

data/registry/instrumentation-dotnet-eventcounters.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EventCounters
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.EventCounters

data/registry/instrumentation-dotnet-grpccore.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.GrpcCore
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.GrpcCore

data/registry/instrumentation-dotnet-grpcnetclient.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.GrpcNetClient
 createdAt: 2022-11-07
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.GrpcNetClient

data/registry/instrumentation-dotnet-hangfire.yml

@@ -14,6 +14,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Hangfire
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Hangfire

data/registry/instrumentation-dotnet-http.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Http
 createdAt: 2022-11-07
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Http

data/registry/instrumentation-dotnet-instrumentation-aws.yml

@@ -12,6 +12,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWS
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.AWS

data/registry/instrumentation-dotnet-masstransit.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.MassTransit
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.MassTransit

data/registry/instrumentation-dotnet-mysqldata.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.MySqlData
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.MySqlData

data/registry/instrumentation-dotnet-owin.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Owin
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Owin

data/registry/instrumentation-dotnet-process.yml

@@ -14,6 +14,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Process
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Process

data/registry/instrumentation-dotnet-quartz.yml

@@ -12,6 +12,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Quartz
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Quartz

data/registry/instrumentation-dotnet-runtime.yml

@@ -16,6 +16,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Runtime
 createdAt: 2022-08-16
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Runtime

data/registry/instrumentation-dotnet-sqlclient.yml

@@ -15,6 +15,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.SqlClient
 createdAt: 2022-11-07
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.SqlClient

data/registry/instrumentation-dotnet-stackexchangeredis.yml

@@ -16,6 +16,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.StackExchangeRedis
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.StackExchangeRedis

data/registry/instrumentation-dotnet-wcf.yml

@@ -14,6 +14,7 @@ authors:
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Wcf
 createdAt: 2022-10-28
+isFirstParty: false
 package:
   registry: nuget
   name: OpenTelemetry.Instrumentation.Wcf

layouts/index.redirects

@@ -1,78 +1,14 @@
 # Netlify redirects. See https://www.netlify.com/docs/redirects/
-{{/* cSpell:ignore cond wordmark */ -}}
-
-{{ range $p := .Site.Pages -}}
-
-{{ range $p.Params.redirects -}}
-  {{ $from := cond (strings.HasPrefix .from "/")
-      .from
-      (print $p.RelPermalink .from) -}}
-  {{ $to := cond (strings.HasPrefix .to "/")
-      .to
-      (print $p.RelPermalink .to) -}}
-  {{ $from | printf "%-35s" }} {{ $to }}
-{{ end -}}
-
-{{ range $p.Aliases -}}
-{{/* Temporary workaround for semconv alias errors */ -}}
-{{ if strings.HasPrefix . "docs/specs/semconv/general" -}}
-{{ . | printf "%-35s" }} {{ $p.RelPermalink }}
-{{ else -}}
-{{ $alias := cond (strings.HasPrefix . "/")
-    .
-    (partial "relative-redirects-alias" (dict "alias" . "p" $p.Parent)) -}}
-{{ $alias | printf "%-35s" }} {{ $p.RelPermalink }}
-{{ end -}}
-{{ end -}}
-
-{{ with $p.Params.redirect -}}
-  {{ $p.RelPermalink | printf "%-35s" }} {{ . }}
-{{ end -}}
-
-{{ end }}{{/* range $p */ -}}
-
-{{ $languages := (.Site.GetPage "/docs/instrumentation").Pages -}}
-{{ range $languages -}}
-{{ $lang := .File.ContentBaseName -}}
-{{ if ne $lang "other" -}}
-/docs/{{ $lang }}   /docs/instrumentation/{{ $lang }}
-/docs/{{ $lang }}/*  /docs/instrumentation/{{ $lang }}/:splat
-{{ end -}}
-{{ end -}}
+{{ partial "redirects/pages.txt" . | partial "func/trim-lines.html" -}}
+{{ partial "redirects/languages.txt" . | partial "func/trim-lines.html" -}}
 
+{{/* TODO: move the following into the spec index file. */ -}}
 /docs/reference/specification    /docs/specs/otel
 /docs/reference/specification/*  /docs/specs/otel/:splat
 /docs/specification/otel/*       /docs/specs/otel/:splat
 
-{{ $schemaFiles := partial "schema-file-list" . -}}
-{{ $latestSchemaFile := index $schemaFiles 0 -}}
-
-/schemas/latest  /schemas/{{ $latestSchemaFile.Name }}
-
-{{/*
-  Social-media image redirects. As mentioned in
-  https://developers.facebook.com/docs/sharing/webmasters/images, we need to
-  preserve og:image (and other social media image) URLs forever.
-*/ -}}
-
-{{ $og_image_current := `/img/social/logo-wordmark-001.png` -}}
-
-/featured-background.jpg  {{ $og_image_current }} {{- /* homepage og:image used prior to 2022/08 */}}
-
-{{- define "partials/relative-redirects-alias" -}}
-  {{ $result := "" }}
-  {{ if strings.HasPrefix .alias "../" }}
-    {{ $result = (partial "relative-redirects-alias"
-          (dict
-            "alias" (strings.TrimPrefix "../" .alias)
-            "p" .p.Parent ))
-    }}
-  {{ else }}
-    {{ $result = path.Join .p.RelPermalink .alias }}
-  {{ end }}
-  {{ return $result }}
-{{ end }}
+{{ partial "redirects/schemas.txt" . }}
 
-{{/* Multilingual support */ -}}
+{{ partial "redirects/social-media.txt" . }}
 
-{{ partial "redirects/sites.redirects" . | partial "func/trim-lines.html" -}}
+{{ partial "redirects/localization.txt" . | partial "func/trim-lines.html" }}

layouts/partials/func/trim-lines.html

@@ -1,3 +1,5 @@
 {{ range split . "\n" -}}
-{{ trim . " \t" }}
+{{ with trim . " \t" -}}
+{{ . }}
+{{ end -}}
 {{ end -}}