Merge branch 'main' into rem-otelzerolog

.cspell.yml

@@ -2,10 +2,15 @@
 # For settings, see
 # https://www.streetsidesoftware.com/vscode-spell-checker/docs/configuration/
 version: '0.2'
+language: en-US
+import:
+  - '@cspell/dict-pt-br/cspell-ext.json'
 caseSensitive: true
 ignorePaths:
   - '*.svg'
-  - 'vendors.yaml'
+  - vendors.yaml
+  - content/ja
+  - content/zh
 # words here are only listed for their spelling, if there is a certain way
 # to write a word (e.g. OpenTelemetry vs Opentelemetry or cloud native vs
 # cloud-native), edit the text-lint rules in .textlintrc.yml
@@ -22,21 +27,20 @@ languageSettings:
   - languageId: markdown
     ignoreRegExpList:
       - CodeBlock
+dictionaries: [pt-br, companies, cpp, dotnet, golang, node, softwareTerms]
 words:
   - accountingservice
   - actix
   - adservice
   - alibaba
-  - Alloc
   - Alolita
   - APAC
   - appdynamics
   - appender
   - appenders
   - aspecto
-  - autoconfigure
   - autoconfiguration
-  - autoload
+  - autoinstrumentation
   - autoloaded
   - autoloader
   - autoloading
@@ -45,12 +49,12 @@ words:
   - cartservice
   - cassandra
   - checkoutservice
+  - Chronosphere
   - classpath
   - cncf
   - currencyservice
   - daemonset
   - datadog
-  - declarators
   - discoverability
   - dotnet
   - Dyla
@@ -65,7 +69,6 @@ words:
   - github
   - gitpod
   - grafana
-  - gzipped
   - Hausenblas
   - hugo
   - initializers
@@ -87,14 +90,11 @@ words:
   - laravel
   - lifecycles
   - lightstep
-  - linux
   - Loffay
   - Mancuso
   - microservices
   - mongodb
-  - mysql
   - ndjson
-  - netlify
   - Neumann
   - nginx
   - ocaml
@@ -111,20 +111,16 @@ words:
   - otelcol
   - otep
   - otlp
-  - overridable
-  - outro
   - packagist
   - pageinfo
   - Paixão
   - parentbased
   - Pavol
   - paymentservice
-  - pluggable
   - postgresql
   - Pranay
   - Prateek
   - prepper
-  - Println
   - productcatalogservice
   - prometheus
   - proto
@@ -137,22 +133,16 @@ words:
   - redis
   - relref
   - Rexed
-  - roadmap
-  - runtimes
   - Rynn
   - semconv
   - servlet
   - Severin
   - Sharma
   - shippingservice
-  - shortcode
-  - snmp
   - Socha
-  - sqlite
   - Stalnaker
   - stdoutmetric
   - Strimzi
-  - subdir
   - symfony
   - tabpane
   - textlint
@@ -165,11 +155,11 @@ words:
   - traefik
   - Trask
   - uids
+  - unsampled
   - unshallow
   - upstreamed
   - Villela
   - wordpress
   - WSGI
   - zend
   - zipkin
-  - Chronosphere

.github/workflows/check-format.yml

@@ -1,6 +1,7 @@
 name: Files
 
 on:
+  merge_group:
   pull_request:
 
 jobs:

.github/workflows/check-i18n.yml

@@ -1,6 +1,7 @@
 name: i18n
 
 on:
+  merge_group:
   pull_request:
 
 jobs:

.github/workflows/check-links.yml

@@ -1,6 +1,7 @@
 name: Links
 
 on:
+  merge_group:
   pull_request:
 
 jobs:

.github/workflows/check-registry.yml

@@ -1,6 +1,7 @@
 name: Registry Validation
 
 on:
+  merge_group:
   pull_request:
     # Make sure this only runs when registry entries are touched.
     paths:

.github/workflows/check-spelling.yml

@@ -1,6 +1,7 @@
 name: Spelling
 
 on:
+  merge_group:
   pull_request:
 
 jobs:
@@ -13,10 +14,12 @@ jobs:
         with:
           # Files should be consistent with check:spelling files
           files: |
-            content/en/*.md
+            content
+            data
             layouts/**/*.md
-            data/**/*
           config: .cspell.yml
+          incremental_files_only: false
+          suggestions: true
 
   dict-check:
     name: CSPELL:IGNORE check

.github/workflows/check-text.yml

@@ -1,6 +1,7 @@
 name: Linter
 
 on:
+  merge_group:
   pull_request:
 
 jobs:

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "themes/docsy"]
 	path = themes/docsy
 	url = https://github.com/google/docsy.git
-	docsy-pin = v0.10.0-6-g102892d
+	docsy-pin = v0.10.0-22-g2295188b
 	docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
 	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."
 [submodule "content-modules/opentelemetry-specification"]
@@ -19,7 +19,7 @@
 [submodule "content-modules/semantic-conventions"]
 	path = content-modules/semantic-conventions
 	url = https://github.com/open-telemetry/semantic-conventions
-	semconv-pin = v1.26.0
+	semconv-pin = v1.27.0
 [submodule "content-modules/opamp-spec"]
 	path = content-modules/opamp-spec
 	url = https://github.com/open-telemetry/opamp-spec

.textlintrc.yml

@@ -9,7 +9,7 @@ filters:
   allowlist:
     allow:
       # Don't check registry .yml file fields for language, repo, url and tags:
-      - '/^\s*(?:language|repo|name|docs|url): .*$/m'
+      - '/^\s*(?:language|repo|name|docs|url|website): .*$/m'
       - /^(?:tags):(\s*-.+$)*/m
       # Hugo template syntax:
       - /{{.*?}}/

assets/js/registrySearch.js

@@ -5,6 +5,7 @@ const miniSearchOptions = {
     '_key',
     'tags',
     'package.name',
+    'flags',
     'license',
     'language',
     'registryType',

content/en/blog/2022/tail-sampling/index.md

@@ -6,7 +6,6 @@ linkTitle: Tail Sampling
 date: 2022-09-26
 author: '[Reese Lee](https://github.com/reese-lee)'
 canonical_url: https://newrelic.com/blog/best-practices/open-telemetry-tail-sampling
-cSpell:ignore: unsampled
 ---
 
 Tail sampling is useful for identifying issues in your distributed system while

content/en/blog/2023/otel-in-focus-09.md

@@ -4,7 +4,7 @@ linkTitle: OTel in Focus 2023/09
 date: 2023-10-01
 author: '[Austin Parker](https://github.com/austinlparker)'
 # prettier-ignore
-cSpell:ignore: attributesprocessor autoinstrumentation Autoscaler checkapi Contribfest coreinternal gopkg jaegerthrifthttp obsreport ottl resourcedetection resourceprocessor structs tailsampling ucum unmanaged
+cSpell:ignore: attributesprocessor Autoscaler checkapi Contribfest coreinternal gopkg jaegerthrifthttp obsreport ottl resourcedetection resourceprocessor structs tailsampling ucum unmanaged
 ---
 
 Welcome back to **OpenTelemetry in Focus** for September, 2023! The autumn winds

content/en/blog/2024/otel-collector-container-log-parser/index.md

@@ -137,12 +137,16 @@ will produce a log entry like the following:
   "attributes": {
     "time": "2024-03-30T08:31:20.545192187Z",
     "log.iostream": "stdout",
-    "k8s.pod.name": "kube-controller-kind-control-plane",
-    "k8s.pod.uid": "49cc7c1fd3702c40b2686ea7486091d6",
-    "k8s.container.name": "kube-controller",
-    "k8s.container.restart_count": "1",
-    "k8s.namespace.name": "kube-system",
     "log.file.path": "/var/log/pods/kube-system_kube-controller-kind-control-plane_49cc7c1fd3702c40b2686ea7486091d6/kube-controller/1.log"
+  },
+  "resource": {
+    "attributes": {
+      "k8s.pod.name": "kube-controller-kind-control-plane",
+      "k8s.pod.uid": "49cc7c1fd3702c40b2686ea7486091d6",
+      "k8s.container.name": "kube-controller",
+      "k8s.container.restart_count": "1",
+      "k8s.namespace.name": "kube-system"
+    }
   }
 }
 ```

content/en/docs/collector/_index.md

@@ -3,7 +3,7 @@ title: Collector
 description: Vendor-agnostic way to receive, process and export telemetry data.
 aliases: [collector/about]
 cascade:
-  vers: 0.106.0
+  vers: 0.106.1
 weight: 270
 ---
 

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

@@ -242,13 +242,13 @@ categorized by instrumentation type.
 | `http_client_active_requests`     | Number of active HTTP client requests.                                                    | Counter   |
 | `http_client_connection_duration` | Measures the duration of the successfully established outbound HTTP connections.          | Histogram |
 | `http_client_open_connections`    | Number of outbound HTTP connections that are active or idle on the client.                | Counter   |
-| `http_client_request_body_size`   | Measures the size of HTTP client request bodies.                                          | Histogram |
-| `http_client_request_duration`    | Measures the duration of HTTP client requests.                                            | Histogram |
-| `http_client_response_body_size`  | Measures the size of HTTP client response bodies.                                         | Histogram |
+| `http_client_request_size`        | Measures the size of HTTP client request bodies.                                          | Histogram |
+| `http_client_duration`            | Measures the duration of HTTP client requests.                                            | Histogram |
+| `http_client_response_size`       | Measures the size of HTTP client response bodies.                                         | Histogram |
 | `http_server_active_requests`     | Number of active HTTP server requests.                                                    | Counter   |
-| `http_server_request_body_size`   | Measures the size of HTTP server request bodies.                                          | Histogram |
-| `http_server_request_duration`    | Measures the duration of HTTP server requests.                                            | Histogram |
-| `http_server_response_body_size`  | Measures the size of HTTP server response bodies.                                         | Histogram |
+| `http_server_request_size`        | Measures the size of HTTP server request bodies.                                          | Histogram |
+| `http_server_duration`            | Measures the duration of HTTP server requests.                                            | Histogram |
+| `http_server_response_size`       | Measures the size of HTTP server response bodies.                                         | Histogram |
 | `rpc_client_duration`             | Measures the duration of outbound RPC.                                                    | Histogram |
 | `rpc_client_request_size`         | Measures the size of RPC request messages (uncompressed).                                 | Histogram |
 | `rpc_client_requests_per_rpc`     | Measures the number of messages received per RPC. Should be 1 for all non-streaming RPCs. | Histogram |