Merge branch 'main' into dluna-elastic-otel-host-metrics-disabled

david-luna · david-luna · commit 243b0a44654f · 2025-05-15T10:07:33.000-07:00
diff --git a/docs/reference/edot-sdks/dotnet/configuration.md b/docs/reference/edot-sdks/dotnet/configuration.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Configure the EDOT .NET SDK
diff --git a/docs/reference/edot-sdks/dotnet/index.md b/docs/reference/edot-sdks/dotnet/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Elastic Distribution of OpenTelemetry .NET
diff --git a/docs/reference/edot-sdks/dotnet/migration.md b/docs/reference/edot-sdks/dotnet/migration.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
-  - id: apm-dotnet-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Migrate to EDOT .NET from the Elastic APM .NET agent
diff --git a/docs/reference/edot-sdks/dotnet/setup/aspnet.md b/docs/reference/edot-sdks/dotnet/setup/aspnet.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Set up EDOT .NET for ASP.NET applications on .NET Framework
diff --git a/docs/reference/edot-sdks/dotnet/setup/aspnetcore.md b/docs/reference/edot-sdks/dotnet/setup/aspnetcore.md
@@ -7,7 +7,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Set up EDOT .NET for ASP.NET Core applications
diff --git a/docs/reference/edot-sdks/dotnet/setup/console.md b/docs/reference/edot-sdks/dotnet/setup/console.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Set up EDOT .NET for console applications
diff --git a/docs/reference/edot-sdks/dotnet/setup/edot-defaults.md b/docs/reference/edot-sdks/dotnet/setup/edot-defaults.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # EDOT .NET opinionated defaults
diff --git a/docs/reference/edot-sdks/dotnet/setup/index.md b/docs/reference/edot-sdks/dotnet/setup/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Set up the EDOT .NET SDK
diff --git a/docs/reference/edot-sdks/dotnet/setup/worker-services.md b/docs/reference/edot-sdks/dotnet/setup/worker-services.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Set up EDOT .NET for worker services
diff --git a/docs/reference/edot-sdks/dotnet/setup/zero-code.md b/docs/reference/edot-sdks/dotnet/setup/zero-code.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-dotnet
+  - id: edot-sdk
 ---
 
 # Using profiler-based zero-code instrumentation
diff --git a/docs/reference/edot-sdks/java/configuration.md b/docs/reference/edot-sdks/java/configuration.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Configure the EDOT Java agent
diff --git a/docs/reference/edot-sdks/java/features.md b/docs/reference/edot-sdks/java/features.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Features of the EDOT Java Agent
diff --git a/docs/reference/edot-sdks/java/index.md b/docs/reference/edot-sdks/java/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Elastic Distribution of OpenTelemetry Java
diff --git a/docs/reference/edot-sdks/java/migration.md b/docs/reference/edot-sdks/java/migration.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
-  - id: apm-java-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Migrate to EDOT Java from the Elastic APM Java agent
@@ -149,6 +149,18 @@ The `enable_instrumentations` option allows to disable all instrumentation enabl
 - `OTEL_INSTRUMENTATION_COMMON_DEFAULT_ENABLED` = `false` to disable instrumentations enabled by default.
 - `OTEL_INSTRUMENTATION_<name>_ENABLED` = `true` where `<name>` is the name of the instrumentation to enable. See [OpenTelemetry documentation](https://opentelemetry.io/docs/zero-code/java/agent/disable/) for reference and values.
 
+### `hostname`
+
+The Elastic [`hostname`](apm-agent-java://reference/config-core.md#config-hostname) option corresponds to setting the `host.name` key in [OTEL_RESOURCE_ATTRIBUTES](https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#otel_resource_attributes).
+
+For example: `OTEL_RESOURCE_ATTRIBUTES=host.name=myhost`.
+
+### `service_node_name`
+
+The Elastic [`service_node_name`](apm-agent-java://reference/config-core.md#config-service-node-name) option corresponds to setting the `service.instance.id` key in [OTEL_RESOURCE_ATTRIBUTES](https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#otel_resource_attributes). Warning: by default this is a generated unique ID; if you set this it must be a unique value for each JVM otherwise metric views cannot be correctly aggregated nor disambiguated
+
+For example: `OTEL_RESOURCE_ATTRIBUTES=service.instance.id=myserviceinstance001`.
+
 ## Limitations
 
 The following limitations apply to EDOT Java.
diff --git a/docs/reference/edot-sdks/java/overhead.md b/docs/reference/edot-sdks/java/overhead.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Performance overhead
diff --git a/docs/reference/edot-sdks/java/setup/index.md b/docs/reference/edot-sdks/java/setup/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Set up the EDOT Java Agent
diff --git a/docs/reference/edot-sdks/java/setup/k8s.md b/docs/reference/edot-sdks/java/setup/k8s.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Instrumenting Java applications with EDOT SDKs on Kubernetes
diff --git a/docs/reference/edot-sdks/java/supported-technologies.md b/docs/reference/edot-sdks/java/supported-technologies.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Technologies supported by the EDOT Java Agent
diff --git a/docs/reference/edot-sdks/java/troubleshooting.md b/docs/reference/edot-sdks/java/troubleshooting.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-java
+  - id: edot-sdk
 ---
 
 # Troubleshooting the EDOT Java Agent
diff --git a/docs/reference/edot-sdks/nodejs/configuration.md b/docs/reference/edot-sdks/nodejs/configuration.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
+  - id: edot-sdk
 ---
 
 # Configure the EDOT Node.js SDK
diff --git a/docs/reference/edot-sdks/nodejs/index.md b/docs/reference/edot-sdks/nodejs/index.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
-  - id: apm-node-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Elastic Distribution of OpenTelemetry Node.js
diff --git a/docs/reference/edot-sdks/nodejs/migration.md b/docs/reference/edot-sdks/nodejs/migration.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
-  - id: apm-node-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Migrate to EDOT Node.js from the Elastic APM Node.js agent
diff --git a/docs/reference/edot-sdks/nodejs/setup/index.md b/docs/reference/edot-sdks/nodejs/setup/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
+  - id: edot-sdk
 ---
 
 # Set up EDOT Node.js
diff --git a/docs/reference/edot-sdks/nodejs/setup/k8s.md b/docs/reference/edot-sdks/nodejs/setup/k8s.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
+  - id: edot-sdk
 ---
 
 # Instrumenting Node.js applications with EDOT SDKs on Kubernetes
diff --git a/docs/reference/edot-sdks/nodejs/supported-technologies.md b/docs/reference/edot-sdks/nodejs/supported-technologies.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
+  - id: edot-sdk
 ---
 
 # Technologies supported by the EDOT Node.js SDK
diff --git a/docs/reference/edot-sdks/nodejs/troubleshooting.md b/docs/reference/edot-sdks/nodejs/troubleshooting.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-nodejs
+  - id: edot-sdk
 ---
 
 # Troubleshooting the EDOT Node.js SDK
diff --git a/docs/reference/edot-sdks/php/configuration.md b/docs/reference/edot-sdks/php/configuration.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Configure the EDOT PHP SDK
diff --git a/docs/reference/edot-sdks/php/index.md b/docs/reference/edot-sdks/php/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Elastic Distribution of OpenTelemetry PHP
diff --git a/docs/reference/edot-sdks/php/migration.md b/docs/reference/edot-sdks/php/migration.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
-  - id: apm-php-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Migrate to EDOT PHP from the Elastic APM PHP agent
diff --git a/docs/reference/edot-sdks/php/overhead.md b/docs/reference/edot-sdks/php/overhead.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Performance overhead
diff --git a/docs/reference/edot-sdks/php/setup/index.md b/docs/reference/edot-sdks/php/setup/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Set up EDOT PHP
diff --git a/docs/reference/edot-sdks/php/setup/limitations.md b/docs/reference/edot-sdks/php/setup/limitations.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Limitations
diff --git a/docs/reference/edot-sdks/php/supported-technologies.md b/docs/reference/edot-sdks/php/supported-technologies.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Technologies supported by EDOT PHP
diff --git a/docs/reference/edot-sdks/php/troubleshooting.md b/docs/reference/edot-sdks/php/troubleshooting.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-php
+  - id: edot-sdk
 ---
 
 # Troubleshooting the EDOT PHP agent
diff --git a/docs/reference/edot-sdks/python/configuration.md b/docs/reference/edot-sdks/python/configuration.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Configure the EDOT Python agent
diff --git a/docs/reference/edot-sdks/python/index.md b/docs/reference/edot-sdks/python/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Elastic Distribution of OpenTelemetry Python
diff --git a/docs/reference/edot-sdks/python/migration.md b/docs/reference/edot-sdks/python/migration.md
@@ -8,8 +8,8 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
-  - id: apm-python-agent
+  - id: edot-sdk
+  - id: apm-agent
 ---
 
 # Migrate to EDOT Python from the Elastic APM Python agent
diff --git a/docs/reference/edot-sdks/python/overhead.md b/docs/reference/edot-sdks/python/overhead.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Performance overhead
diff --git a/docs/reference/edot-sdks/python/setup/index.md b/docs/reference/edot-sdks/python/setup/index.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Set up the EDOT Python agent
diff --git a/docs/reference/edot-sdks/python/setup/k8s.md b/docs/reference/edot-sdks/python/setup/k8s.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Instrumenting Python applications with EDOT SDKs on Kubernetes
diff --git a/docs/reference/edot-sdks/python/setup/manual-instrumentation.md b/docs/reference/edot-sdks/python/setup/manual-instrumentation.md
@@ -8,7 +8,7 @@ applies_to:
 products:
   - id: cloud-serverless
   - id: observability
-  - id: edot-python
+  - id: edot-sdk
 ---
 
 # Manual instrumentation
diff --git a/docs/reference/edot-sdks/python/supported-technologies.md b/docs/reference/edot-sdks/python/supported-technologies.md
diff --git a/docs/reference/edot-sdks/python/troubleshooting.md b/docs/reference/edot-sdks/python/troubleshooting.md
