[pull] main from open-telemetry:main

.textlintrc.yml

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

content/en/blog/2023/end-user-q-and-a-01.md

@@ -169,7 +169,7 @@ They are hoping to leverage
 [OpenTelemetry’s Exemplars](/docs/specs/otel/metrics/data-model/#exemplars) to
 link traces and metrics.
 
-### How is the organization sending telemetry data to various observability back-ends?
+### How is the organization sending telemetry data to various observability backends?
 
 J’s team uses a combination of the proprietary backend agent and the
 OpenTelemetry Collector (for metrics). They are one of the primary users of

content/en/docs/collector/management.md

@@ -90,7 +90,7 @@ We will set up a simple OpAMP control plane consisting of an example OpAMP
 server and let an OpenTelemetry Collector connect to it via an example OpAMP
 supervisor.
 
-First, clone the `open-telemetry/opamp-go` repo:
+First, clone the `open-telemetry/opamp-go` repository:
 
 ```sh
 git clone https://github.com/open-telemetry/opamp-go.git
@@ -159,7 +159,7 @@ service:
 ```
 
 Now it's time to launch the supervisor (which in turn will launch your
-OpenTelemetry collector):
+OpenTelemetry Collector):
 
 ```console
 $ go run .

content/en/docs/collector/troubleshooting.md

@@ -2,7 +2,7 @@
 title: Troubleshooting
 description: Recommendations for troubleshooting the Collector
 weight: 25
-cSpell:ignore: pprof tracez zpages
+cSpell:ignore: confmap pprof tracez zpages
 ---
 
 On this page, you can learn how to troubleshoot the health and performance of
@@ -359,3 +359,21 @@ container, producing the error message
 the `NO_WINDOWS_SERVICE=1` environment variable must be set to force the
 Collector to start as if it were running in an interactive terminal, without
 attempting to run as a Windows service.
+
+### Collector is experiencing configuration issues
+
+The Collector might experience problems due to configuration issues.
+
+#### Null maps
+
+During configuration resolution of multiple configs, values in earlier configs
+are removed in favor of later configs, even if the later value is null. You can
+fix this issue by
+
+- Using `{}` to represent an empty map, such as `processors: {}` instead of
+  `processors:`.
+- Omitting empty configurations such as `processors:` from the configuration.
+
+See
+[confmap troubleshooting](https://github.com/open-telemetry/opentelemetry-collector/blob/main/confmap/README.md#null-maps)
+for more information.

content/en/docs/demo/_index.md

@@ -63,7 +63,7 @@ solve them.
 We'll be adding more scenarios over time.
 
 - Generate a [Product Catalog error](feature-flags) for `GetProduct` requests
-  with product id: `OLJCESPC7Z` using the Feature Flag service
+  with product ID: `OLJCESPC7Z` using the Feature Flag service
 - Discover a memory leak and diagnose it using metrics and traces.
   [Read more](scenarios/recommendation-cache/)
 

content/en/docs/demo/feature-flags.md

@@ -19,7 +19,7 @@ change the `defaultVariant` value in the config file for a given flag to "on".
 | `adServiceManualGc`                 | Ad Service       | Trigger full manual garbage collections in the ad service                                                 |
 | `adServiceHighCpu`                  | Ad Service       | Trigger high cpu load in the ad service. If you want to demo cpu throttling, set cpu resource limits      |
 | `cartServiceFailure`                | Cart Service     | Generate an error for `EmptyCart` 1/10th of the time                                                      |
-| `productCatalogFailure`             | Product Catalog  | Generate an error for `GetProduct` requests with product id: `OLJCESPC7Z`                                 |
+| `productCatalogFailure`             | Product Catalog  | Generate an error for `GetProduct` requests with product ID: `OLJCESPC7Z`                                 |
 | `recommendationServiceCacheFailure` | Recommendation   | Create a memory leak due to an exponentially growing cache. 1.4x growth, 50% of requests trigger growth.  |
 | `paymentServiceFailure`             | Payment Service  | Generate an error when calling the `charge` method.                                                       |
 | `paymentServiceUnreachable`         | Checkout Service | Use a bad address when calling the PaymentService to make it seem like the PaymentService is unavailable. |

content/en/docs/kubernetes/operator/troubleshooting/_index.md

@@ -0,0 +1,8 @@
+---
+title: Troubleshooting the OpenTelemetry Operator for Kubernetes
+linkTitle: Troubleshooting
+description:
+  Contains a collection of tips for troubleshooting various aspects of the
+  OpenTelemetry Kubernetes Operator. For example, what to do when the target
+  allocator is failing to discover scrape targets.
+---