Update metadata (#1894)

* Update metadata * update
signalfx · Jun 20, 2024 · 70b5108 · 70b5108
1 parent cd1a52d
commit 70b5108
Showing 1 changed file with 36 additions and 3 deletions.
diff --git a/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java b/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java
@@ -124,6 +124,7 @@ public static void main(String[] args) throws IOException {
     otel.traces.exporter	OTEL_TRACES_EXPORTER	List of exporters to be used for tracing, separated by commas. Default is otlp. none means no autoconfigured exporter.
     otel.metrics.exporter	OTEL_METRICS_EXPORTER	List of exporters to be used for metrics, separated by commas. Default is otlp. none means no autoconfigured exporter.
     otel.logs.exporter	OTEL_LOGS_EXPORTER	List of exporters to be used for logging, separated by commas. Default is otlp. none means no autoconfigured exporter.
+    otel.java.experimental.exporter.memory_mode	OTEL_JAVA_EXPERIMENTAL_EXPORTER_MEMORY_MODE	If reusable_data, enable reusable memory mode (on exporters which support it) to reduce allocations. Default is immutable_data. This option is experimental and subject to change or removal.[1]
      */
 
     settings.add(
@@ -147,6 +148,14 @@ public static void main(String[] args) throws IOException {
             "otlp",
             SettingType.STRING,
             SettingCategory.EXPORTER));
+    settings.add(
+        setting(
+            "otel.java.experimental.exporter.memory_mode",
+            "If `reusable_data`, enable reusable memory mode (on exporters which support it) to reduce allocations. Default is `immutable_data`. "
+                + "This option is experimental and subject to change or removal.",
+            "immutable_data",
+            SettingType.STRING,
+            SettingCategory.EXPORTER));
 
     // OTLP exporter (span, metric, and log exporters)
     // https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md#otlp-exporter-span-metric-and-log-exporters
@@ -780,12 +789,12 @@ otel.exporter.otlp.metrics.temporality.preference	OTEL_EXPORTER_OTLP_METRICS_TEM
     // https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md#file-configuration
 
     /*
-    otel.config.file	OTEL_CONFIG_FILE	The path to the SDK configuration file. Defaults to unset.
+    otel.experimental.config.file	OTEL_EXPERIMENTAL_CONFIG_FILE	The path to the SDK configuration file. Defaults to unset.
      */
 
     settings.add(
         setting(
-            "otel.config.file",
+            "otel.experimental.config.file",
             "The path to the SDK configuration file. Defaults to unset.",
             "",
             SettingType.STRING,
@@ -1727,7 +1736,10 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/README.md
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/log4j/log4j-mdc-1.2/javaagent/README.md
     /*
-    | `otel.instrumentation.common.mdc.resource-attributes` | String  |         | Comma separated list of resource attributes to expose through MDC. |
+    | `otel.instrumentation.common.mdc.resource-attributes` | String  |               | Comma separated list of resource attributes to expose through MDC. |
+    | `otel.instrumentation.common.logging.trace-id`        | String  | `trace_id`    | Customize MDC key name for the trace id.                           |
+    | `otel.instrumentation.common.logging.span-id`         | String  | `span_id`     | Customize MDC key name for the span id.                            |
+    | `otel.instrumentation.common.logging.trace-flags`     | String  | `trace_flags` | Customize MDC key name for the trace flags.                        |
      */
     settings.add(
         setting(
@@ -1736,6 +1748,27 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
             "",
             SettingType.STRING,
             SettingCategory.INSTRUMENTATION));
+    settings.add(
+        setting(
+            "otel.instrumentation.common.logging.trace-id",
+            "Customize MDC key name for the trace id.",
+            "trace_id",
+            SettingType.STRING,
+            SettingCategory.INSTRUMENTATION));
+    settings.add(
+        setting(
+            "otel.instrumentation.common.logging.span-id",
+            "Customize MDC key name for the span id.",
+            "span_id",
+            SettingType.STRING,
+            SettingCategory.INSTRUMENTATION));
+    settings.add(
+        setting(
+            "otel.instrumentation.common.logging.trace-flags",
+            "Customize MDC key name for the trace flags.",
+            "trace_flags",
+            SettingType.STRING,
+            SettingCategory.INSTRUMENTATION));
 
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/logback/logback-appender-1.0/javaagent/README.md
     /*