diff --git a/exporter/awsxrayexporter/README.md b/exporter/awsxrayexporter/README.md index 65f72ad1b17f..9447aaebd8ce 100644 --- a/exporter/awsxrayexporter/README.md +++ b/exporter/awsxrayexporter/README.md @@ -50,21 +50,21 @@ by the Span Resource object. X-Ray uses this data to generate inferred segments The following exporter configuration parameters are supported. They mirror and have the same effect as the comparable AWS X-Ray Daemon configuration values. -| Name | Description | Default | -| :--------------------- | :--------------------------------------------------------------------------------- | ------- | -| `num_workers` | Maximum number of concurrent calls to AWS X-Ray to upload documents. | 8 | -| `endpoint` | Optionally override the default X-Ray service endpoint. | | -| `request_timeout` | Number of seconds before timing out a request. | 30 | -| `max_retries` | Maximun number of attempts to post a batch before failing. | 2 | -| `no_verify_ssl` | Enable or disable TLS certificate verification. | false | -| `proxy_address` | Upload segments to AWS X-Ray through a proxy. | | -| `region` | Send segments to AWS X-Ray service in a specific region. | | -| `local_mode` | Local mode to skip EC2 instance metadata check. | false | -| `resource_arn` | Amazon Resource Name (ARN) of the AWS resource running the collector. | | -| `role_arn` | IAM role to upload segments to a different account. | | -| `indexed_attributes` | List of attribute names to be converted to X-Ray annotations. | | -| `index_all_attributes` | Enable or disable conversion of all OpenTelemetry attributes to X-Ray annotations. | false | -| `aws_log_groups` | List of log group names for CloudWatch. | [] | +| Name | Description | Default | +| :------------------------ | :--------------------------------------------------------------------------------- | ------- | +| `num_workers` | Maximum number of concurrent calls to AWS X-Ray to upload documents. | 8 | +| `endpoint` | Optionally override the default X-Ray service endpoint. | | +| `request_timeout_seconds` | Number of seconds before timing out a request. | 30 | +| `max_retries` | Maximun number of attempts to post a batch before failing. | 2 | +| `no_verify_ssl` | Enable or disable TLS certificate verification. | false | +| `proxy_address` | Upload segments to AWS X-Ray through a proxy. | | +| `region` | Send segments to AWS X-Ray service in a specific region. | | +| `local_mode` | Local mode to skip EC2 instance metadata check. | false | +| `resource_arn` | Amazon Resource Name (ARN) of the AWS resource running the collector. | | +| `role_arn` | IAM role to upload segments to a different account. | | +| `indexed_attributes` | List of attribute names to be converted to X-Ray annotations. | | +| `index_all_attributes` | Enable or disable conversion of all OpenTelemetry attributes to X-Ray annotations. | false | +| `aws_log_groups` | List of log group names for CloudWatch. | [] | ## Traces and logs correlation diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index 7657a3ab6cca..d49785d0d065 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", - RequestTimeoutSeconds: 30, + RequestTimeoutSeconds: 120, MaxRetries: 2, NoVerifySSL: false, ProxyAddress: "", diff --git a/exporter/awsxrayexporter/testdata/config.yaml b/exporter/awsxrayexporter/testdata/config.yaml index 626f3cb7151c..15943ad634e0 100644 --- a/exporter/awsxrayexporter/testdata/config.yaml +++ b/exporter/awsxrayexporter/testdata/config.yaml @@ -5,3 +5,4 @@ awsxray/customname: role_arn: "arn:aws:iam::123456789:role/monitoring-EKS-NodeInstanceRole" indexed_attributes: [ "indexed_attr_0", "indexed_attr_1" ] aws_log_groups: ["group1", "group2"] + request_timeout_seconds: 120