Merge branch 'main' into mobile-events-geolocation

elastic · Sep 26, 2023 · 8ac3136 · 8ac3136
2 parents 9de88e6 + 3e8adc2
commit 8ac3136
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,9 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
-      - run: go test -v ./...
+      - env:
+          CGO_ENABLED: "0"
+        run: go test -v ./...
 
   system-test:
     runs-on: ubuntu-latest

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ x-logging: &default-logging
     max-size: "1g"
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-6aa5b988-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-abc4d077-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.11.0-6aa5b988-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.11.0-abc4d077-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.11.0-6aa5b988-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.11.0-abc4d077-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/docs/otel-limitations.asciidoc b/docs/otel-limitations.asciidoc
@@ -37,3 +37,20 @@ The https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/
 was deprecated in 7.13 and replaced by the native support of the OpenTelemetry Line Protocol in
 Elastic {observability} (OTLP). To learn more, see
 https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/elasticexporter#migration[migration].
+
+[float]
+[[open-telemetry-tbs]]
+==== OpenTelemetry's tail-based sampling
+
+Tail-based sampling allows to make sampling decisions after all spans of a trace have been completed.
+This allows for more powerful and informed sampling rules.
+
+When using OpenTelemetry with Elastic APM, there are two different implementations available for tail-based sampling:
+
+* Tail-based sampling using the https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor[tailsamplingprocessor] in the OpenTelemetry Collector
+* Native <<tail-based-sampling,tail-based sampling in the Elastic APM backend>>
+
+Using the https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor[tailsamplingprocessor] in the OpenTelemetry Collector comes with an important limitation. Elastic's APM backend calculates span and transaction metrics based on the incoming span events.
+These metrics are accurate for 100% sampling scenarios. In scenarios with probabilistic sampling, Elastic's APM backend is being informed about the sampling rate of spans and can extrapolate throughput metrics based on the incoming, partial data. However, with tail-based sampling there's no clear probability for sampling decisions as the rules can be more complex and the OpenTelemetry Collector does not provide sampling probability information to the Elastic backend that could be used for extrapolation of data. Therefore, there's no way for Elastic APM to properly extrapolate throughput and count metrics that are derived from span events that have been tail-based sampled in the OpenTelemetry Collector. In these scenarios, derived throughput and count metrics are likely to be inaccurate.
+
+Therefore, we recommend using Elastic's native tail-based smapling when integrating with OpenTelemetry. 
diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml
@@ -3,7 +3,7 @@ kind: ApmServer
 metadata:
   name: apm-server
 spec:
-  version: 8.11.0-6aa5b988-SNAPSHOT
+  version: 8.11.0-abc4d077-SNAPSHOT
   count: 1
   http:
     tls:

diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.11.0-6aa5b988-SNAPSHOT
+  version: 8.11.0-abc4d077-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.11.0-6aa5b988-SNAPSHOT
+  version: 8.11.0-abc4d077-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch