Merge branch 'main' into patch-1

Author: aurbiztondo-splunk

_images/collector/imagetest.png

@@ -4,6 +4,7 @@ The Splunk Distribution of the OpenTelemetry Collector has the following compone
 * :ref:`Processors <collector-components-processors>`: Configure which operations you'll perform on data before it's exported. For example, filtering.
 * :ref:`Exporters <collector-components-exporters>`: Set up where to send data to. It can be one or more backends or destinations. 
 * :ref:`Extensions <collector-components-extensions>`: Extend the capabilities of the Collector.
+* :ref:`Connectors <collector-components-connectors>`: Connect two pipelines, consuming data as an exporter at the end of one pipeline and emitting data as a receiver at the start of another pipeline.
 * Services. It consists of two elements:
 
   * List of the :ref:`extensions <collector-components-extensions>` you've configured.

_images/synthetics/detector-one.png

@@ -165,15 +165,15 @@ The following diagram shows the default traces pipeline:
 
       subgraph Exporters
          direction LR
-         traces/sapm:::exporter
+         traces/otlphttp:::exporter
          traces/signalfx/out:::exporter
       end
 
       %% Connections beyond categories are added later
       traces/jaeger --> traces/memory_limiter
       traces/otlp --> traces/memory_limiter
       traces/zipkin --> traces/memory_limiter
-      traces/resourcedetection --> traces/sapm
+      traces/resourcedetection --> traces/otlphttp
       traces/resourcedetection --> traces/signalfx/out
 
 Learn more about these receivers:
@@ -190,5 +190,5 @@ Learn more about these processors:
 
 Learn more about these exporters:
 
-* :ref:`splunk-apm-exporter`
+* :ref:`otlphttp-exporter`
 * :ref:`signalfx-exporter`

_includes/collector-components.rst

@@ -1,3 +1,5 @@
-Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. Auto discovery of services is only available for the Collector in Linux and Kubernetes environments. 
+Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. 
 
-With automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`.
+.. caution:: Auto discovery of third-party services is only available for the Collector in Linux and Kubernetes environments. 
+
+Via automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`.