Skip to content

Commit

Permalink
Merge pull request #1015 from splunk/repo-sync
Browse files Browse the repository at this point in the history
Pulling refs/heads/main into main
  • Loading branch information
theletterf authored Oct 24, 2023
2 parents 2e14a00 + 88555b0 commit f2e8822
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@ Traces instrumentations
- Third-party support
- ``AZURE``
* - Elastic.Clients.Elasticsearch
- 8.0.0 and higher
- 8.0.0 to 8.9.3. |br| (Higher versions are supported by Elastic.Transport)
- Experimental Beta
- Third-party support
- ``ELASTICSEARCH``
* - Elastic.Transport
- 0.4.16 and higher
- Experimental Beta
- Third-party support
- ``ELASTICTRANSPORT``
* - Microsoft.EntityFrameworkCore |br| (Not supported on .NET Framework)
- 6.0.12 and higher
- Experimental Beta
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Trace configuration

The following settings control tracing limits and attributes:

.. list-table::
.. list-table::
:header-rows: 1

* - Environment variable
Expand Down Expand Up @@ -125,7 +125,7 @@ To connect Real User Monitoring (RUM) requests from mobile and web applications

.. code-block::
Access-Control-Expose-Headers: Server-Timing
Access-Control-Expose-Headers: Server-Timing
Server-Timing: traceparent;desc="00-<serverTraceId>-<serverSpanId>-01"
The ``Server-Timing`` header contains the ``traceId`` and ``spanId`` parameters in ``traceparent`` format. For more information, see the Server-Timing and traceparent documentation on the W3C website.
Expand All @@ -146,6 +146,10 @@ Other settings
- Level for debug logging. Default is ``WARN``. When set to ``DEBUG``, the layer sends additional logs to AWS CloudWatch.
* - ``SPLUNK_LAMBDA_SLS_ZIP``
- Set to ``true`` to instrument Python libraries compressed using the Serverless Framework. The default value is ``false``.
* - ``SPLUNK_EXTENSION_WRAPPER_ENABLED``
- Set to ``false`` to deactivate the legacy SignalFx metric instrumentation. This is useful if you don't use Infrastructure Monitoring and want to reduce warmup time. The default value is ``true``.
* - ``SPLUNK_LAMBDA_LOCAL_COLLECTOR_ENABLED``
- Set to ``false`` to deactivate the OpenTelemetry Collector instance running inside each Lambda runtime. If you deactivate the bundled Collector, configure the instrumentation to either communicate directly to the REST API ingest endpoints, or configure up a forwarding instance of the Collector and configure the instrumentation to send data to it. The default value is ``true``. See :ref:`ec2-otel-collector-serverless` for more information.
* - ``OTEL_PYTHON_DISABLED_INSTRUMENTATIONS``
- Comma-separated list of Python instrumentations you want to deactivate. For a list of automatically loaded instrumentations, see the requirements list in the OpenTelemetry repository on GitHub: https://github.com/open-telemetry/opentelemetry-lambda/blob/main/python/src/otel/otel_sdk/requirements-nodeps.txt

Expand Down

0 comments on commit f2e8822

Please sign in to comment.