Skip to content

Commit 431b83a

Browse files
movencemovence
authored
Introduce shared receiver model for OTLP to avoid port conflicts (#1821)
1 parent 70f685e commit 431b83a

39 files changed

+1114
-537
lines changed

‎translator/config/sampleSchema/validOTLPShared.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"metrics": {
3+
"metrics_collected": {
4+
"otlp": [
5+
{
6+
"grpc_endpoint": "0.0.0.0:1234",
7+
"http_endpoint": "0.0.0.0:2345"
8+
},
9+
{
10+
"grpc_endpoint": "0.0.0.0:3456",
11+
"http_endpoint": "0.0.0.0:4567",
12+
"tls": {
13+
"cert_file": "/path/to/cert.pem",
14+
"key_file": "/path/to/key.pem"
15+
}
16+
}
17+
]
18+
}
19+
},
20+
"logs": {
21+
"metrics_collected": {
22+
"otlp": [
23+
{
24+
"grpc_endpoint": "0.0.0.0:1234"
25+
},
26+
{
27+
"http_endpoint": "0.0.0.0:4567",
28+
"tls": {
29+
"cert_file": "/path/to/cert.pem",
30+
"key_file": "/path/to/key.pem"
31+
}
32+
}
33+
]
34+
}
35+
}
36+
}

‎translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ processors:
13201320
enabled: false
13211321
timeout: 2s
13221322
receivers:
1323-
otlp/application_signals:
1323+
otlp/grpc_0_0_0_0_4315:
13241324
protocols:
13251325
grpc:
13261326
endpoint: 0.0.0.0:4315
@@ -1332,6 +1332,8 @@ receivers:
13321332
cert_file: path/to/cert.crt
13331333
key_file: path/to/key.key
13341334
transport: tcp
1335+
otlp/http_0_0_0_0_4316:
1336+
protocols:
13351337
http:
13361338
cors: {}
13371339
endpoint: 0.0.0.0:4316
@@ -1359,15 +1361,17 @@ service:
13591361
- resourcedetection
13601362
- awsapplicationsignals
13611363
receivers:
1362-
- otlp/application_signals
1364+
- otlp/grpc_0_0_0_0_4315
1365+
- otlp/http_0_0_0_0_4316
13631366
traces/application_signals:
13641367
exporters:
13651368
- awsxray/application_signals
13661369
processors:
13671370
- resourcedetection
13681371
- awsapplicationsignals
13691372
receivers:
1370-
- otlp/application_signals
1373+
- otlp/grpc_0_0_0_0_4315
1374+
- otlp/http_0_0_0_0_4316
13711375
telemetry:
13721376
logs:
13731377
encoding: console

‎translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ receivers:
15051505
request_timeout_seconds: 0
15061506
resource_arn: ""
15071507
role_arn: ""
1508-
otlp/application_signals:
1508+
otlp/grpc_0_0_0_0_4315:
15091509
protocols:
15101510
grpc:
15111511
endpoint: 0.0.0.0:4315
@@ -1517,6 +1517,8 @@ receivers:
15171517
cert_file: path/to/cert.crt
15181518
key_file: path/to/key.key
15191519
transport: tcp
1520+
otlp/http_0_0_0_0_4316:
1521+
protocols:
15201522
http:
15211523
cors: {}
15221524
endpoint: 0.0.0.0:4316
@@ -1548,7 +1550,8 @@ service:
15481550
- awsapplicationsignals
15491551
- awsentity/service/application_signals
15501552
receivers:
1551-
- otlp/application_signals
1553+
- otlp/grpc_0_0_0_0_4315
1554+
- otlp/http_0_0_0_0_4316
15521555
metrics/containerinsights:
15531556
exporters:
15541557
- awsemf/containerinsights
@@ -1565,7 +1568,8 @@ service:
15651568
- resourcedetection
15661569
- awsapplicationsignals
15671570
receivers:
1568-
- otlp/application_signals
1571+
- otlp/grpc_0_0_0_0_4315
1572+
- otlp/http_0_0_0_0_4316
15691573
telemetry:
15701574
logs:
15711575
encoding: console

‎translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ receivers:
15061506
request_timeout_seconds: 0
15071507
resource_arn: ""
15081508
role_arn: ""
1509-
otlp/application_signals:
1509+
otlp/grpc_0_0_0_0_4315:
15101510
protocols:
15111511
grpc:
15121512
endpoint: 0.0.0.0:4315
@@ -1515,6 +1515,8 @@ receivers:
15151515
server_parameters: {}
15161516
read_buffer_size: 524288
15171517
transport: tcp
1518+
otlp/http_0_0_0_0_4316:
1519+
protocols:
15181520
http:
15191521
cors: {}
15201522
endpoint: 0.0.0.0:4316
@@ -1543,7 +1545,8 @@ service:
15431545
- awsapplicationsignals
15441546
- awsentity/service/application_signals
15451547
receivers:
1546-
- otlp/application_signals
1548+
- otlp/grpc_0_0_0_0_4315
1549+
- otlp/http_0_0_0_0_4316
15471550
metrics/containerinsights:
15481551
exporters:
15491552
- awsemf/containerinsights
@@ -1560,7 +1563,8 @@ service:
15601563
- resourcedetection
15611564
- awsapplicationsignals
15621565
receivers:
1563-
- otlp/application_signals
1566+
- otlp/grpc_0_0_0_0_4315
1567+
- otlp/http_0_0_0_0_4316
15641568
telemetry:
15651569
logs:
15661570
encoding: console

‎translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ receivers:
15051505
request_timeout_seconds: 0
15061506
resource_arn: ""
15071507
role_arn: ""
1508-
otlp/application_signals:
1508+
otlp/grpc_0_0_0_0_4315:
15091509
protocols:
15101510
grpc:
15111511
endpoint: 0.0.0.0:4315
@@ -1517,6 +1517,8 @@ receivers:
15171517
cert_file: path/to/cert.crt
15181518
key_file: path/to/key.key
15191519
transport: tcp
1520+
otlp/http_0_0_0_0_4316:
1521+
protocols:
15201522
http:
15211523
cors: {}
15221524
endpoint: 0.0.0.0:4316
@@ -1548,7 +1550,8 @@ service:
15481550
- awsapplicationsignals
15491551
- awsentity/service/application_signals
15501552
receivers:
1551-
- otlp/application_signals
1553+
- otlp/grpc_0_0_0_0_4315
1554+
- otlp/http_0_0_0_0_4316
15521555
metrics/containerinsights:
15531556
exporters:
15541557
- awsemf/containerinsights
@@ -1565,7 +1568,8 @@ service:
15651568
- resourcedetection
15661569
- awsapplicationsignals
15671570
receivers:
1568-
- otlp/application_signals
1571+
- otlp/grpc_0_0_0_0_4315
1572+
- otlp/http_0_0_0_0_4316
15691573
telemetry:
15701574
logs:
15711575
encoding: console

‎translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ receivers:
15051505
request_timeout_seconds: 0
15061506
resource_arn: ""
15071507
role_arn: ""
1508-
otlp/application_signals:
1508+
otlp/grpc_0_0_0_0_4315:
15091509
protocols:
15101510
grpc:
15111511
endpoint: 0.0.0.0:4315
@@ -1517,6 +1517,8 @@ receivers:
15171517
cert_file: path/to/cert.crt
15181518
key_file: path/to/key.key
15191519
transport: tcp
1520+
otlp/http_0_0_0_0_4316:
1521+
protocols:
15201522
http:
15211523
cors: {}
15221524
endpoint: 0.0.0.0:4316
@@ -1548,7 +1550,8 @@ service:
15481550
- awsapplicationsignals
15491551
- awsentity/service/application_signals
15501552
receivers:
1551-
- otlp/application_signals
1553+
- otlp/grpc_0_0_0_0_4315
1554+
- otlp/http_0_0_0_0_4316
15521555
metrics/containerinsights:
15531556
exporters:
15541557
- awsemf/containerinsights
@@ -1565,7 +1568,8 @@ service:
15651568
- resourcedetection
15661569
- awsapplicationsignals
15671570
receivers:
1568-
- otlp/application_signals
1571+
- otlp/grpc_0_0_0_0_4315
1572+
- otlp/http_0_0_0_0_4316
15691573
telemetry:
15701574
logs:
15711575
encoding: console

‎translator/tocwconfig/sampleConfig/base_appsignals_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ processors:
13341334
enabled: false
13351335
timeout: 2s
13361336
receivers:
1337-
otlp/application_signals:
1337+
otlp/grpc_0_0_0_0_4315:
13381338
protocols:
13391339
grpc:
13401340
endpoint: 0.0.0.0:4315
@@ -1343,6 +1343,8 @@ receivers:
13431343
server_parameters: {}
13441344
read_buffer_size: 524288
13451345
transport: tcp
1346+
otlp/http_0_0_0_0_4316:
1347+
protocols:
13461348
http:
13471349
cors: {}
13481350
endpoint: 0.0.0.0:4316
@@ -1370,7 +1372,8 @@ service:
13701372
- awsapplicationsignals
13711373
- awsentity/service/application_signals
13721374
receivers:
1373-
- otlp/application_signals
1375+
- otlp/grpc_0_0_0_0_4315
1376+
- otlp/http_0_0_0_0_4316
13741377
traces/application_signals:
13751378
exporters:
13761379
- debug/application_signals
@@ -1379,7 +1382,8 @@ service:
13791382
- resourcedetection
13801383
- awsapplicationsignals
13811384
receivers:
1382-
- otlp/application_signals
1385+
- otlp/grpc_0_0_0_0_4315
1386+
- otlp/http_0_0_0_0_4316
13831387
telemetry:
13841388
logs:
13851389
encoding: console

‎translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ processors:
13291329
enabled: false
13301330
timeout: 2s
13311331
receivers:
1332-
otlp/application_signals:
1332+
otlp/grpc_0_0_0_0_4315:
13331333
protocols:
13341334
grpc:
13351335
endpoint: 0.0.0.0:4315
@@ -1338,6 +1338,8 @@ receivers:
13381338
server_parameters: {}
13391339
read_buffer_size: 524288
13401340
transport: tcp
1341+
otlp/http_0_0_0_0_4316:
1342+
protocols:
13411343
http:
13421344
cors: {}
13431345
endpoint: 0.0.0.0:4316
@@ -1364,15 +1366,17 @@ service:
13641366
- awsapplicationsignals
13651367
- awsentity/service/application_signals
13661368
receivers:
1367-
- otlp/application_signals
1369+
- otlp/grpc_0_0_0_0_4315
1370+
- otlp/http_0_0_0_0_4316
13681371
traces/application_signals:
13691372
exporters:
13701373
- awsxray/application_signals
13711374
processors:
13721375
- resourcedetection
13731376
- awsapplicationsignals
13741377
receivers:
1375-
- otlp/application_signals
1378+
- otlp/grpc_0_0_0_0_4315
1379+
- otlp/http_0_0_0_0_4316
13761380
telemetry:
13771381
logs:
13781382
encoding: console

‎translator/tocwconfig/sampleConfig/compass_linux_config.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ processors:
137137
refresh_tags_interval: 0s
138138
refresh_volumes_interval: 0s
139139
receivers:
140-
otlp/metrics:
140+
otlp/grpc_127_0_0_1_4317:
141141
protocols:
142142
grpc:
143143
endpoint: 127.0.0.1:4317
@@ -146,6 +146,8 @@ receivers:
146146
server_parameters: {}
147147
read_buffer_size: 524288
148148
transport: tcp
149+
otlp/http_127_0_0_1_4318:
150+
protocols:
149151
http:
150152
cors: {}
151153
endpoint: 127.0.0.1:4318
@@ -187,7 +189,8 @@ service:
187189
- ec2tagger
188190
- awsentity/service/otlp/cloudwatch
189191
receivers:
190-
- otlp/metrics
192+
- otlp/grpc_127_0_0_1_4317
193+
- otlp/http_127_0_0_1_4318
191194
metrics/hostOtlpMetrics/cloudwatchlogs:
192195
exporters:
193196
- awsemf
@@ -196,7 +199,8 @@ service:
196199
- awsentity/service/otlp/cloudwatchlogs
197200
- batch/hostOtlpMetrics/cloudwatchlogs
198201
receivers:
199-
- otlp/metrics
202+
- otlp/grpc_127_0_0_1_4317
203+
- otlp/http_127_0_0_1_4318
200204
telemetry:
201205
logs:
202206
encoding: console

‎translator/tocwconfig/sampleConfig/complete_darwin_config.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ receivers:
179179
tls:
180180
insecure: true
181181
transport: udp
182-
otlp/traces:
182+
otlp/grpc_0_0_0_0_1111:
183183
protocols:
184184
grpc:
185185
endpoint: 0.0.0.0:1111
@@ -188,6 +188,8 @@ receivers:
188188
server_parameters: {}
189189
read_buffer_size: 524288
190190
transport: tcp
191+
otlp/http_0_0_0_0_2222:
192+
protocols:
191193
http:
192194
cors: {}
193195
endpoint: 0.0.0.0:2222
@@ -315,7 +317,8 @@ service:
315317
- batch/xray
316318
receivers:
317319
- awsxray
318-
- otlp/traces
320+
- otlp/grpc_0_0_0_0_1111
321+
- otlp/http_0_0_0_0_2222
319322
telemetry:
320323
logs:
321324
encoding: console

0 commit comments

Comments
 (0)