mage otel:readme

elastic · Dec 19, 2024 · 3b8b19a · 3b8b19a
1 parent bb4d7ff
commit 3b8b19a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md
@@ -80,12 +80,7 @@ This section provides a summary of components included in the Elastic Distributi
 | Component | Version |
 |---|---|
 | [signaltometricsconnector](https://github.com/elastic/opentelemetry-collector-components/blob/connector/signaltometricsconnector/v0.3.0/connector/signaltometricsconnector/README.md) | v0.3.0 |
-<<<<<<< HEAD
-| [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/connector/spanmetricsconnector/v0.115.0/connector/spanmetricsconnector/README.md) | v0.115.0 |
-=======
-| [routingconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/connector/routingconnector/v0.116.0/connector/routingconnector/README.md) | v0.116.0 |
 | [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/connector/spanmetricsconnector/v0.116.0/connector/spanmetricsconnector/README.md) | v0.116.0 |
->>>>>>> b1fa909d3 (Update OTel v0.116.0 (#6384))
 ## Persistence in OpenTelemetry Collector
 
 By default, the OpenTelemetry Collector is stateless, which means it doesn't store offsets on disk while reading files. As a result, if you restart the collector, it won't retain the last read offset, potentially leading to data duplication or loss. However, we have configured persistence in the settings provided with the Elastic Agent package.