Skip to content

Commit c8474b7

Browse files
vasireddy99vasireddy99
authored
Merge branch 'main' into addrel
2 parents fb15204 + a3ff3cc commit c8474b7

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

‎src/docs/components/kafka-receiver-exporter.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ receivers:
126126
- b-2.aocmskcluster281.test.c13.kafka.us-west-2.amazonaws.com:9094
127127
128128
exporters:
129-
logging:
130-
loglevel: debug
129+
debug:
130+
verbosity: detailed
131131
132132
service:
133133
pipelines:
134134
metrics:
135135
receivers: [kafka/receiver]
136-
exporters: [logging]
136+
exporters: [debug]
137137
```
138138

139139
In the ec2 instance of the collector A we execute the following command to send telemetry to the statsd receiver:
@@ -144,5 +144,5 @@ echo "kafka.test.example:1|c" | nc -w 1 -u localhost 4567
144144

145145
The following output is obtained in the collector B.
146146
```
147-
{"level":"info","timestamp":"2023-04-05T03:56:23.531Z","message":"ResourceMetrics #0\nResource SchemaURL: \nScopeMetrics #0\nScopeMetrics SchemaURL: \nInstrumentationScope \nMetric #0\nDescriptor:\n -> Name: kafka.test.example\n -> Description: \n -> Unit: \n -> DataType: Sum\n -> IsMonotonic: false\n -> AggregationTemporality: Delta\nNumberDataPoints #0\nStartTimestamp: 2023-04-05 03:56:18.402491427 +0000 UTC\nTimestamp: 2023-04-05 03:56:23.401572412 +0000 UTC\nValue: 1\n","kind":"exporter","data_type":"metrics","name":"logging"}
147+
{"level":"info","timestamp":"2023-04-05T03:56:23.531Z","message":"ResourceMetrics #0\nResource SchemaURL: \nScopeMetrics #0\nScopeMetrics SchemaURL: \nInstrumentationScope \nMetric #0\nDescriptor:\n -> Name: kafka.test.example\n -> Description: \n -> Unit: \n -> DataType: Sum\n -> IsMonotonic: false\n -> AggregationTemporality: Delta\nNumberDataPoints #0\nStartTimestamp: 2023-04-05 03:56:18.402491427 +0000 UTC\nTimestamp: 2023-04-05 03:56:23.401572412 +0000 UTC\nValue: 1\n","kind":"exporter","data_type":"metrics","name":"debug"}
148148
```

‎src/docs/components/x-ray-receiver.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ receivers:
103103
aws_endpoint: ""
104104
local_mode: false
105105
exporters:
106-
logging:
107-
loglevel: debug
106+
debug:
107+
verbosity: detailed
108108
awsxray:
109109
region: "us-west-2"
110110
service:
111111
extensions:
112112
pipelines:
113113
traces:
114114
receivers: [awsxray]
115-
exporters: [logging, awsxray]
115+
exporters: [debug, awsxray]
116116
```
117117

118118
<SectionSeparator />

‎src/docs/getting-started/lambda.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ receivers:
6060
endpoint: "localhost:4318"
6161

6262
exporters:
63-
logging:
63+
debug:
6464
awsxray:
6565

6666
service:
@@ -70,7 +70,7 @@ service:
7070
exporters: [awsxray]
7171
metrics:
7272
receivers: [otlp]
73-
exporters: [logging]
73+
exporters: [debug]
7474
telemetry:
7575
metrics:
7676
address: localhost:8888

‎src/docs/releases.mdx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.js
1818

1919
## Whats Included in the AWS Distro for OpenTelemetry Collector
2020

21-
| Receiver | Processor | Exporter | Extensions |
22-
|---------------------------------|-------------------------------|------------------------------------|------------------------|
23-
| prometheusreceiver | attributesprocessor | `awsxrayexporter` | healthcheckextension |
24-
| otlpreceiver | resourceprocessor | `awsemfexporter` | pprofextension |
25-
| `awsecscontainermetricsreceiver`| batchprocessor | prometheusremotewriteexporter | zpagesextension |
26-
| `awsxrayreceiver` | memorylimiter | loggingexporter | `ecsobserver` |
27-
| statsdreceiver | `metricsgenerationprocessor` | otlpexporter | `awsproxy` |
28-
| zipkinreceiver | probabilisticsamplerprocessor | fileexporter | ballastextention |
29-
| jaegerreceiver | spanprocessor | otlphttpexporter | `sigv4authextension` |
30-
| `awscontainerinsightreceiver` | filterprocessor | prometheusexporter | |
31-
| | metricstransformprocessor | datadogexporter | |
32-
| | resourcedetectionprocessor | dynatraceexporter | |
33-
| | cumulativetodeltaprocessor | sapmexporter | |
34-
| | deltatorateprocessor | signalfxexporter | |
35-
| | | logzioexporter | |
21+
22+
| Receiver | Processor | Exporter | Extensions |
23+
|---------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
24+
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/prometheusreceiver#prometheus-receiver) | [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/attributesprocessor#attributes-processor) | [`awsxrayexporter`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awsxrayexporter) | [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/healthcheckextension#health-check) |
25+
| [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver#otlp-receiver) | [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor#resource-processor) | [`awsemfexporter`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awsemfexporter) | [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/pprofextension#performance-profiler) |
26+
| [`awsecscontainermetricsreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsecscontainermetricsreceiver) | [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor#batch-processor) | [prometheusremotewriteexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter#prometheus-remote-write-exporter) | [zpagesextension](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension#zpages) |
27+
| [`awsxrayreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsxrayreceiver) | [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/memorylimiterprocessor#memory-limiter-processor) | [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter) | [`ecsobserver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecsobserver) |
28+
| [statsdreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/statsdreceiver#statsd-receiver) | [probabilisticsamplerprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/probabilisticsamplerprocessor#probabilistic-sampling-processor) | [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter) | [`awsproxy`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/awsproxy) |
29+
| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/zipkinreceiver#zipkin-receiver) | [metricstransformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricstransformprocessor#metrics-transform-processor) | [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter#file-exporter) | [`sigv4authextension`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/sigv4authextension) |
30+
| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver#jaeger-receiver) | [spanprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/spanprocessor#span-processor) | [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter#otlphttp-exporter) | [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/storage/filestorage#file-storage) |
31+
| [`awscontainerinsightreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awscontainerinsightreceiver) | [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor#filter-processor) | [prometheusexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#prometheus-exporter) | |
32+
| [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/kafkareceiver) | [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#resource-detection-processor) | [datadogexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/datadogexporter#datadog-exporter) | |
33+
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver#filelog-receiver) | [metricsgenerationprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricsgenerationprocessor#metrics-generation-processor) | [sapmexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sapmexporter#sapm-exporter) | |
34+
| | [cumulativetodeltaprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/cumulativetodeltaprocessor#cumulative-to-delta-processor) | [signalfxexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter#signalfx-metrics-exporter) | |
35+
| | [deltatorateprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/deltatorateprocessor#delta-to-rate-processor) | [logzioexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/logzioexporter#logzio-exporter) | |
36+
| | [groupbytraceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/groupbytraceprocessor) | [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/kafkaexporter) | |
37+
| | [tailsamplingprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor) | [loadbalancingexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/loadbalancingexporter) | |
38+
| | [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor) | [awscloudwatchlogsexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awscloudwatchlogsexporter) | |
3639

3740
Note: Highlighted components are AWS developed. Also note that the `awsprometheusremotewriteexporter` has been removed in v0.21.0 of the ADOT Collector. Users who want to send metrics to Amazon Managed Service for Prometheus will need to instead use the [Prometheus Remote Write Exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/prometheusremotewriteexporter/README.md) along with the [Sigv4 Authenticator Extension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/sigv4authextension/README.md) to achieve the same result.

0 commit comments

Comments
 (0)