[pull] main from open-telemetry:main

.warnings-skip-list.txt

@@ -1 +0,0 @@
-docs/specs/otel/common/attribute-requirement-level.md

content/en/docs/concepts/glossary.md

@@ -332,36 +332,6 @@ An in-process alternative to external exporters. When included, they collect and
 aggregate tracing and metrics information in the background; this data is served
 on web pages when requested. See [more][zpages].
 
-## Additional Terminology
-
-### Traces
-
-#### **[Trace API Terminology](/docs/specs/otel/trace/api)**
-
-#### **[Trace SDK Terminology](/docs/specs/otel/trace/sdk)**
-
-### Metrics
-
-#### **[Metric API Terminology](/docs/specs/otel/metrics/api#overview)**
-
-#### **[Metric SDK Terminology](/docs/specs/otel/metrics#specifications)**
-
-### Logs
-
-#### **[Trace Context Fields](/docs/specs/otel/logs/data-model#trace-context-fields)**
-
-#### **[Severity Fields](/docs/specs/otel/logs/data-model#severity-fields)**
-
-#### **[Log Record Fields](/docs/specs/otel/logs/data-model#log-and-event-record-definition)**
-
-### Semantic Conventions
-
-#### **[Resource Conventions](/docs/specs/semconv/resource/)**
-
-#### **[Span Conventions](/docs/specs/semconv/general/trace/)**
-
-#### **[Metric Conventions](/docs/specs/semconv/general/metrics/)**
-
 [baggage]: /docs/specs/otel/baggage/api/
 [attribute]: /docs/specs/otel/common/#attributes
 [collector]: /docs/collector

data/ecosystem/vendors.yaml

@@ -1,4 +1,4 @@
-# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate
+# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate qryn ClickHouse
 - name: AppDynamics (Cisco)
   distribution: true
   nativeOTLP: true
@@ -209,6 +209,13 @@
   contact: ''
   oss: false
   commercial: true
+- name: qryn
+  distribution: true
+  nativeOTLP: true
+  url: 'https://qryn.metrico.in/#/support?id=tempo-api'
+  contact: 'https://github.com/lmangani'
+  oss: true
+  commercial: true
 - name: Sentry
   distribution: true
   nativeOTLP: false
@@ -321,3 +328,10 @@
   contact: '[email protected]'
   oss: true
   commercial: true
+- name: ClickHouse
+  distribution: false
+  nativeOTLP: false
+  url: 'https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/clickhouseexporter'
+  contact: 'https://github.com/tbragin'
+  oss: true
+  commercial: true

data/registry/collector-exporter-qryn.yml

@@ -0,0 +1,19 @@
+# cSpell:ignore qryn loki
+title: qryn exporter
+registryType: exporter
+isThirdParty: true
+language: collector
+tags:
+  - go
+  - exporter
+  - qryn
+  - loki
+  - prometheus
+  - tempo
+repo: https://github.com/metrico/otel-collector
+license: Apache 2.0
+description:
+  This exporter supports sending OpenTelemetry logs, traces and metrics to
+  ClickHouse using the qryn polyglot format.
+authors: [email protected], [email protected]
+otVersion: latest

scripts/content-modules/adjust-pages.pl

@@ -128,8 +128,8 @@ ()
   s|(\]:\s+\|\()?https://github.com/open-telemetry/opentelemetry-proto/(\w+/.*?/)?docs/specification.md(\)?)|$1$specBasePath/otlp/$3|g;
   s|github.com/open-telemetry/opentelemetry-proto/docs/specification.md|OTLP|g;
 
-  # Match links to semconv
-  s|(\]:\s+\|\()https://github.com/open-telemetry/semantic-conventions/\w+/(main\|v$semconvVers)/docs(.*?\)?)|$1$specBasePath/semconv$3|;
+  # Localize links to semconv
+  s|(\]:\s+\|\()https://github.com/open-telemetry/semantic-conventions/\w+/(main\|v$semconvVers)/docs(.*?\)?)|$1$specBasePath/semconv$3|g;
 
   # Images
   s|(\.\./)?internal(/img/[-\w]+\.png)|$2|g;

static/refcache.json

@@ -2219,6 +2219,14 @@
     "StatusCode": 200,
     "LastSeen": "2023-07-06T11:55:26.882609-07:00"
   },
+  "https://github.com/metrico/otel-collector": {
+    "StatusCode": 200,
+    "LastSeen": "2023-10-17T15:13:11.067528+02:00"
+  },
+  "https://github.com/metrico/qryn-collector": {
+    "StatusCode": 404,
+    "LastSeen": "2023-10-17T15:10:07.758268+02:00"
+  },
   "https://github.com/mhausenblas": {
     "StatusCode": 200,
     "LastSeen": "2023-06-30T09:39:03.127776-04:00"
@@ -4779,6 +4787,10 @@
     "StatusCode": 206,
     "LastSeen": "2023-06-30T11:43:42.332023-04:00"
   },
+  "https://qryn.metrico.in/#/support": {
+    "StatusCode": 206,
+    "LastSeen": "2023-10-17T15:10:07.18892+02:00"
+  },
   "https://quarkus.io": {
     "StatusCode": 206,
     "LastSeen": "2023-06-29T18:38:25.768525-04:00"