From a5800c4a05d10216115ca650054194637eccdc35 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 8 Jul 2025 11:06:27 +0800 Subject: [PATCH 01/16] chore: add common pipeline for otlp --- share_files/adot-collector-config.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index 9f14e11..d085225 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -1,4 +1,10 @@ receivers: + otlp/ecs-adot: + protocols: + grpc: + endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 awsecscontainermetrics: collection_interval: 30s prometheus/ecs: @@ -40,7 +46,19 @@ service: address: ${env:HOSTNAME}:8888 extensions: [health_check] pipelines: - metrics: + metrics/awsecscontainer: receivers: [awsecscontainermetrics, prometheus/ecs] processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel] + metrics: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel] + traces: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel] + logs: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] exporters: [otlphttp/ecs-otel] \ No newline at end of file From 00b52df7c1832ed2d1695c13ac7668237c838bc2 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 8 Jul 2025 17:18:55 +0800 Subject: [PATCH 02/16] chore: enable debug --- share_files/adot-collector-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index d085225..9147912 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -49,16 +49,16 @@ service: metrics/awsecscontainer: receivers: [awsecscontainermetrics, prometheus/ecs] processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel] + exporters: [otlphttp/ecs-otel, debug] metrics: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel] + exporters: [otlphttp/ecs-otel, debug] traces: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel] + exporters: [otlphttp/ecs-otel, debug] logs: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel] \ No newline at end of file + exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From 99fb58607fb795a137ae9260f916225577e16e28 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 8 Jul 2025 17:32:46 +0800 Subject: [PATCH 03/16] chore: add env:otel_conf_debug_verbosity --- share_files/adot-collector-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index 9147912..acbebc2 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -17,7 +17,8 @@ receivers: - ${env:HOSTNAME}:8888 exporters: - debug: {} + debug: + verbosity: ${env:otel_conf_debug_verbosity} otlphttp/ecs-otel: endpoint: ${env:otlp_exporter_endpoint} From 9c8da5364f6ef5a312031d574a0e13dd5a78ba6f Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Thu, 10 Jul 2025 16:18:39 +0800 Subject: [PATCH 04/16] chore: add awscloudwatch receiver test file --- share_files/adot-collector-config-test.yaml | 79 +++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 share_files/adot-collector-config-test.yaml diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml new file mode 100644 index 0000000..42cabaf --- /dev/null +++ b/share_files/adot-collector-config-test.yaml @@ -0,0 +1,79 @@ +receivers: + otlp/ecs-adot: + protocols: + grpc: + endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 + awsecscontainermetrics: + collection_interval: 30s + awscloudwatch: + region: ${env:ecs_region} + logs: + poll_interval: 1m + groups: + autodiscover: + limit: 5 + prefix: "/ecs/${env:ecs_cluster_name}/${env:ecs_service_name}" + streams: + prefixes: ["ecs/${env:ecs_service_name}"] + prometheus/ecs: + config: + scrape_configs: + - job_name: adot-collector + scrape_interval: 10s + static_configs: + - targets: + - ${env:HOSTNAME}:8888 + +exporters: + debug: + verbosity: ${env:otel_conf_debug_verbosity} + otlphttp/ecs-otel: + endpoint: ${env:otlp_exporter_endpoint} + +processors: + batch: {} + memory_limiter: + check_interval: 5s + limit_percentage: 80 + spike_limit_percentage: 25 + resource: + attributes: + - key: "splashtop.datacenter" + value: ${env:ecs_cluster_name} + action: "insert" + - key: "splashtop.region" + value: ${env:ecs_region} + action: "insert" + +extensions: + health_check: + endpoint: 0.0.0.0:13133 + +service: + telemetry: + metrics: + address: ${env:HOSTNAME}:8888 + extensions: [health_check] + pipelines: + metrics/awsecscontainer: + receivers: [awsecscontainermetrics, prometheus/ecs] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + metrics: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + traces: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + logs: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + cloudwatch: + receivers: [awscloudwatch] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From 39ac50e43024b410082dc1f62a2cf525b4786169 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Fri, 11 Jul 2025 09:51:00 +0800 Subject: [PATCH 05/16] chore: fix pipeline --- share_files/adot-collector-config-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index 42cabaf..fa93c95 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -73,7 +73,7 @@ service: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] exporters: [otlphttp/ecs-otel, debug] - cloudwatch: + logs/awscloudwatch: receivers: [awscloudwatch] processors: [memory_limiter, resource, batch] exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From f431e5d6c210be836af6488d1ad0e633e36af5dd Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Mon, 14 Jul 2025 09:52:29 +0800 Subject: [PATCH 06/16] chore: add filelog receiver --- share_files/adot-collector-config-test.yaml | 33 +++++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index fa93c95..00139ac 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -7,16 +7,23 @@ receivers: endpoint: 0.0.0.0:4318 awsecscontainermetrics: collection_interval: 30s - awscloudwatch: - region: ${env:ecs_region} - logs: - poll_interval: 1m - groups: - autodiscover: - limit: 5 - prefix: "/ecs/${env:ecs_cluster_name}/${env:ecs_service_name}" - streams: - prefixes: ["ecs/${env:ecs_service_name}"] + # awscloudwatch: + # region: ${env:ecs_region} + # logs: + # poll_interval: 1m + # groups: + # autodiscover: + # limit: 5 + # prefix: "/ecs/${env:ecs_cluster_name}/${env:ecs_service_name}" + # streams: + # prefixes: ["ecs/${env:ecs_service_name}"] + filelog: + include: [ /mnt/ephemeral/logs/*.json ] + operators: + - type: json_parser + timestamp: + parse_from: attributes.time + layout: '%Y-%m-%d %H:%M:%S' prometheus/ecs: config: scrape_configs: @@ -54,7 +61,7 @@ extensions: service: telemetry: metrics: - address: ${env:HOSTNAME}:8888 + # address: ${env:HOSTNAME}:8888 extensions: [health_check] pipelines: metrics/awsecscontainer: @@ -73,7 +80,7 @@ service: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] exporters: [otlphttp/ecs-otel, debug] - logs/awscloudwatch: - receivers: [awscloudwatch] + logs/filelog: + receivers: [filelog] processors: [memory_limiter, resource, batch] exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From dc607c9c419d4ec7a39c228f7d3e8620dd43a5c9 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 15 Jul 2025 09:30:58 +0800 Subject: [PATCH 07/16] chore: modify filelog path --- share_files/adot-collector-config-test.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index 00139ac..61020ec 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -18,7 +18,7 @@ receivers: # streams: # prefixes: ["ecs/${env:ecs_service_name}"] filelog: - include: [ /mnt/ephemeral/logs/*.json ] + include: [ /mnt/logs/*.json, /mnt/logs/*.log ] operators: - type: json_parser timestamp: @@ -64,10 +64,10 @@ service: # address: ${env:HOSTNAME}:8888 extensions: [health_check] pipelines: - metrics/awsecscontainer: - receivers: [awsecscontainermetrics, prometheus/ecs] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] + # metrics/awsecscontainer: + # receivers: [awsecscontainermetrics, prometheus/ecs] + # processors: [memory_limiter, resource, batch] + # exporters: [otlphttp/ecs-otel, debug] metrics: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] From 657741945c576b429189abc3d2f00f9a063fb330 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 15 Jul 2025 10:54:13 +0800 Subject: [PATCH 08/16] chore: test filelog receiver --- share_files/adot-collector-config-test.yaml | 34 +++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index 61020ec..e923f45 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -24,6 +24,8 @@ receivers: timestamp: parse_from: attributes.time layout: '%Y-%m-%d %H:%M:%S' + severity: + parse_from: attributes.severity prometheus/ecs: config: scrape_configs: @@ -36,8 +38,8 @@ receivers: exporters: debug: verbosity: ${env:otel_conf_debug_verbosity} - otlphttp/ecs-otel: - endpoint: ${env:otlp_exporter_endpoint} + # otlphttp/ecs-otel: + # endpoint: ${env:otlp_exporter_endpoint} processors: batch: {} @@ -68,19 +70,19 @@ service: # receivers: [awsecscontainermetrics, prometheus/ecs] # processors: [memory_limiter, resource, batch] # exporters: [otlphttp/ecs-otel, debug] - metrics: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - traces: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - logs: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] + # metrics: + # receivers: [otlp/ecs-adot] + # processors: [memory_limiter, resource, batch] + # exporters: [otlphttp/ecs-otel, debug] + # traces: + # receivers: [otlp/ecs-adot] + # processors: [memory_limiter, resource, batch] + # exporters: [otlphttp/ecs-otel, debug] + # logs: + # receivers: [otlp/ecs-adot] + # processors: [memory_limiter, resource, batch] + # exporters: [otlphttp/ecs-otel, debug] logs/filelog: receivers: [filelog] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file + processors: [memory_limiter, batch] + exporters: [debug] \ No newline at end of file From 8af8aa666a38fea9210900cea5f49c358d68bfe6 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 15 Jul 2025 11:25:58 +0800 Subject: [PATCH 09/16] chore: add otel exporter --- share_files/adot-collector-config-test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index e923f45..be0dd46 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -38,8 +38,8 @@ receivers: exporters: debug: verbosity: ${env:otel_conf_debug_verbosity} - # otlphttp/ecs-otel: - # endpoint: ${env:otlp_exporter_endpoint} + otlphttp/ecs-otel: + endpoint: ${env:otlp_exporter_endpoint} processors: batch: {} @@ -84,5 +84,5 @@ service: # exporters: [otlphttp/ecs-otel, debug] logs/filelog: receivers: [filelog] - processors: [memory_limiter, batch] - exporters: [debug] \ No newline at end of file + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From 92708c72b43979065640025424f83387e09444eb Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 15 Jul 2025 11:41:09 +0800 Subject: [PATCH 10/16] chore: open trace --- share_files/adot-collector-config-test.yaml | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index be0dd46..6e45b20 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -70,18 +70,18 @@ service: # receivers: [awsecscontainermetrics, prometheus/ecs] # processors: [memory_limiter, resource, batch] # exporters: [otlphttp/ecs-otel, debug] - # metrics: - # receivers: [otlp/ecs-adot] - # processors: [memory_limiter, resource, batch] - # exporters: [otlphttp/ecs-otel, debug] - # traces: - # receivers: [otlp/ecs-adot] - # processors: [memory_limiter, resource, batch] - # exporters: [otlphttp/ecs-otel, debug] - # logs: - # receivers: [otlp/ecs-adot] - # processors: [memory_limiter, resource, batch] - # exporters: [otlphttp/ecs-otel, debug] + metrics: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + traces: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + logs: + receivers: [otlp/ecs-adot] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] logs/filelog: receivers: [filelog] processors: [memory_limiter, resource, batch] From 8cfd7f9e848d2820ff552e44115806eff33ea055 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Tue, 15 Jul 2025 15:31:54 +0800 Subject: [PATCH 11/16] chore: add resource attribute service.name and update timestamp parser --- share_files/adot-collector-config-test.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index 6e45b20..e4d4eab 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -23,7 +23,7 @@ receivers: - type: json_parser timestamp: parse_from: attributes.time - layout: '%Y-%m-%d %H:%M:%S' + layout: '%Y-%m-%d %H:%M:%S %z' severity: parse_from: attributes.severity prometheus/ecs: @@ -55,6 +55,11 @@ processors: - key: "splashtop.region" value: ${env:ecs_region} action: "insert" + resource/log: + attributes: + - key: "service.name" + value: ${env:ecs_service_name} + action: "insert" extensions: health_check: @@ -84,5 +89,5 @@ service: exporters: [otlphttp/ecs-otel, debug] logs/filelog: receivers: [filelog] - processors: [memory_limiter, resource, batch] + processors: [memory_limiter, resource, resource/log, batch] exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From 12d949613e2667882b994a2ed418ea007fcff024 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Wed, 16 Jul 2025 08:57:51 +0800 Subject: [PATCH 12/16] chore: add back awsecscontainer --- share_files/adot-collector-config-test.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml index e4d4eab..6607cac 100644 --- a/share_files/adot-collector-config-test.yaml +++ b/share_files/adot-collector-config-test.yaml @@ -68,13 +68,13 @@ extensions: service: telemetry: metrics: - # address: ${env:HOSTNAME}:8888 + address: ${env:HOSTNAME}:8888 extensions: [health_check] pipelines: - # metrics/awsecscontainer: - # receivers: [awsecscontainermetrics, prometheus/ecs] - # processors: [memory_limiter, resource, batch] - # exporters: [otlphttp/ecs-otel, debug] + metrics/awsecscontainer: + receivers: [awsecscontainermetrics, prometheus/ecs] + processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] metrics: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] From 3b126396ae0e0ff61536489c5134c808af6c2da5 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Mon, 21 Jul 2025 09:39:51 +0800 Subject: [PATCH 13/16] feat: add filelog receiver --- share_files/adot-collector-config.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index acbebc2..6d99b38 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -7,6 +7,15 @@ receivers: endpoint: 0.0.0.0:4318 awsecscontainermetrics: collection_interval: 30s + filelog: + include: [ /mnt/logs/*.json, /mnt/logs/*.log ] + operators: + - type: json_parser + timestamp: + parse_from: attributes.time + layout: '%Y-%m-%d %H:%M:%S %z' + severity: + parse_from: attributes.severity prometheus/ecs: config: scrape_configs: @@ -36,6 +45,11 @@ processors: - key: "splashtop.region" value: ${env:ecs_region} action: "insert" + resource/log: + attributes: + - key: "service.name" + value: ${env:ecs_service_name} + action: "insert" extensions: health_check: @@ -62,4 +76,8 @@ service: logs: receivers: [otlp/ecs-adot] processors: [memory_limiter, resource, batch] + exporters: [otlphttp/ecs-otel, debug] + logs/filelog: + receivers: [filelog] + processors: [memory_limiter, resource, resource/log, batch] exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From 6b40f87fec4074422bf48372a6fdc420e0473bdc Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Mon, 21 Jul 2025 10:20:41 +0800 Subject: [PATCH 14/16] feat: add filelog receiver --- share_files/adot-collector-config-test.yaml | 93 --------------------- 1 file changed, 93 deletions(-) delete mode 100644 share_files/adot-collector-config-test.yaml diff --git a/share_files/adot-collector-config-test.yaml b/share_files/adot-collector-config-test.yaml deleted file mode 100644 index 6607cac..0000000 --- a/share_files/adot-collector-config-test.yaml +++ /dev/null @@ -1,93 +0,0 @@ -receivers: - otlp/ecs-adot: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - http: - endpoint: 0.0.0.0:4318 - awsecscontainermetrics: - collection_interval: 30s - # awscloudwatch: - # region: ${env:ecs_region} - # logs: - # poll_interval: 1m - # groups: - # autodiscover: - # limit: 5 - # prefix: "/ecs/${env:ecs_cluster_name}/${env:ecs_service_name}" - # streams: - # prefixes: ["ecs/${env:ecs_service_name}"] - filelog: - include: [ /mnt/logs/*.json, /mnt/logs/*.log ] - operators: - - type: json_parser - timestamp: - parse_from: attributes.time - layout: '%Y-%m-%d %H:%M:%S %z' - severity: - parse_from: attributes.severity - prometheus/ecs: - config: - scrape_configs: - - job_name: adot-collector - scrape_interval: 10s - static_configs: - - targets: - - ${env:HOSTNAME}:8888 - -exporters: - debug: - verbosity: ${env:otel_conf_debug_verbosity} - otlphttp/ecs-otel: - endpoint: ${env:otlp_exporter_endpoint} - -processors: - batch: {} - memory_limiter: - check_interval: 5s - limit_percentage: 80 - spike_limit_percentage: 25 - resource: - attributes: - - key: "splashtop.datacenter" - value: ${env:ecs_cluster_name} - action: "insert" - - key: "splashtop.region" - value: ${env:ecs_region} - action: "insert" - resource/log: - attributes: - - key: "service.name" - value: ${env:ecs_service_name} - action: "insert" - -extensions: - health_check: - endpoint: 0.0.0.0:13133 - -service: - telemetry: - metrics: - address: ${env:HOSTNAME}:8888 - extensions: [health_check] - pipelines: - metrics/awsecscontainer: - receivers: [awsecscontainermetrics, prometheus/ecs] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - metrics: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - traces: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - logs: - receivers: [otlp/ecs-adot] - processors: [memory_limiter, resource, batch] - exporters: [otlphttp/ecs-otel, debug] - logs/filelog: - receivers: [filelog] - processors: [memory_limiter, resource, resource/log, batch] - exporters: [otlphttp/ecs-otel, debug] \ No newline at end of file From dc0ee53e6fc3bc7b4261834f44a369d535ca8885 Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Mon, 21 Jul 2025 15:45:41 +0800 Subject: [PATCH 15/16] chore: add default value for env --- share_files/adot-collector-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index 6d99b38..7060880 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -27,7 +27,7 @@ receivers: exporters: debug: - verbosity: ${env:otel_conf_debug_verbosity} + verbosity: ${env:otel_conf_debug_verbosity:basic} otlphttp/ecs-otel: endpoint: ${env:otlp_exporter_endpoint} @@ -40,15 +40,15 @@ processors: resource: attributes: - key: "splashtop.datacenter" - value: ${env:ecs_cluster_name} + value: ${env:ecs_cluster_name:default-cluster} action: "insert" - key: "splashtop.region" - value: ${env:ecs_region} + value: ${env:ecs_region:default-region} action: "insert" resource/log: attributes: - key: "service.name" - value: ${env:ecs_service_name} + value: ${env:ecs_service_name:default-service} action: "insert" extensions: From 1b7003c6b77698a231861f1949a0238aff93a69a Mon Sep 17 00:00:00 2001 From: Euli Liao Date: Mon, 21 Jul 2025 17:24:36 +0800 Subject: [PATCH 16/16] fix: default value syntax --- share_files/adot-collector-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share_files/adot-collector-config.yaml b/share_files/adot-collector-config.yaml index 7060880..02195a5 100644 --- a/share_files/adot-collector-config.yaml +++ b/share_files/adot-collector-config.yaml @@ -27,7 +27,7 @@ receivers: exporters: debug: - verbosity: ${env:otel_conf_debug_verbosity:basic} + verbosity: ${env:otel_conf_debug_verbosity:-basic} otlphttp/ecs-otel: endpoint: ${env:otlp_exporter_endpoint} @@ -40,15 +40,15 @@ processors: resource: attributes: - key: "splashtop.datacenter" - value: ${env:ecs_cluster_name:default-cluster} + value: ${env:ecs_cluster_name:-default-cluster} action: "insert" - key: "splashtop.region" - value: ${env:ecs_region:default-region} + value: ${env:ecs_region:-default-region} action: "insert" resource/log: attributes: - key: "service.name" - value: ${env:ecs_service_name:default-service} + value: ${env:ecs_service_name:-default-service} action: "insert" extensions: