Skip to content

Commit a32bbc0

Browse files
ParamadonParamadon
authored
Open Application Signals ports on CWAgent only when enabled (#230)
1 parent f51816b commit a32bbc0

File tree

4 files changed

+81
-109
lines changed

4 files changed

+81
-109
lines changed

‎internal/manifests/collector/ports.go‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,22 @@ import (
2121
)
2222

2323
const (
24-
StatsD = "statsd"
25-
CollectD = "collectd"
26-
XrayProxy = "aws-proxy"
27-
XrayTraces = "aws-traces"
28-
OtlpGrpc = "otlp-grpc"
29-
OtlpHttp = "otlp-http"
30-
AppSignalsGrpc = "appsignals-grpc"
31-
AppSignalsHttp = "appsignals-http"
32-
AppSignalsProxy = "appsignals-xray"
33-
EMF = "emf"
34-
EMFTcp = "emf-tcp"
35-
EMFUdp = "emf-udp"
36-
CWA = "cwa-"
24+
StatsD = "statsd"
25+
CollectD = "collectd"
26+
XrayProxy = "aws-proxy"
27+
XrayTraces = "aws-traces"
28+
OtlpGrpc = "otlp-grpc"
29+
OtlpHttp = "otlp-http"
30+
AppSignalsGrpc = "appsig-grpc"
31+
AppSignalsHttp = "appsig-http"
32+
AppSignalsProxy = "appsig-xray"
33+
AppSignalsGrpcSA = ":4315"
34+
AppSignalsHttpSA = ":4316"
35+
AppSignalsProxySA = ":2000"
36+
EMF = "emf"
37+
EMFTcp = "emf-tcp"
38+
EMFUdp = "emf-udp"
39+
CWA = "cwa-"
3740
)
3841

3942
var receiverDefaultPortsMap = map[string]int32{
@@ -79,7 +82,6 @@ func getContainerPorts(logger logr.Logger, cfg string, specPorts []corev1.Servic
7982
config, err := adapters.ConfigStructFromJSONString(cfg)
8083
if err != nil {
8184
logger.Error(err, "error parsing cw agent config")
82-
servicePorts = PortMapToServicePortList(AppSignalsPortToServicePortMap)
8385
} else {
8486
servicePorts = getServicePortsFromCWAgentConfig(logger, config)
8587
}
@@ -115,13 +117,20 @@ func getContainerPorts(logger logr.Logger, cfg string, specPorts []corev1.Servic
115117
}
116118

117119
func getServicePortsFromCWAgentConfig(logger logr.Logger, config *adapters.CwaConfig) []corev1.ServicePort {
118-
servicePortsMap := getAppSignalsServicePortsMap()
120+
servicePortsMap := make(map[int32][]corev1.ServicePort)
121+
122+
getApplicationSignalsReceiversServicePorts(logger, config, servicePortsMap)
119123
getMetricsReceiversServicePorts(logger, config, servicePortsMap)
120124
getLogsReceiversServicePorts(logger, config, servicePortsMap)
121125
getTracesReceiversServicePorts(logger, config, servicePortsMap)
126+
122127
return PortMapToServicePortList(servicePortsMap)
123128
}
124129

130+
func isAppSignalEnabled(config *adapters.CwaConfig) bool {
131+
return config.GetApplicationSignalsConfig() != nil
132+
}
133+
125134
func getMetricsReceiversServicePorts(logger logr.Logger, config *adapters.CwaConfig, servicePortsMap map[int32][]corev1.ServicePort) {
126135
if config.Metrics == nil || config.Metrics.MetricsCollected == nil {
127136
return
@@ -221,6 +230,16 @@ func getAppSignalsServicePortsMap() map[int32][]corev1.ServicePort {
221230
return servicePortMap
222231
}
223232

233+
func getApplicationSignalsReceiversServicePorts(logger logr.Logger, config *adapters.CwaConfig, servicePortsMap map[int32][]corev1.ServicePort) {
234+
if !isAppSignalEnabled(config) {
235+
return
236+
}
237+
238+
getReceiverServicePort(logger, AppSignalsGrpcSA, AppSignalsGrpc, corev1.ProtocolTCP, servicePortsMap)
239+
getReceiverServicePort(logger, AppSignalsHttpSA, AppSignalsHttp, corev1.ProtocolTCP, servicePortsMap)
240+
getReceiverServicePort(logger, AppSignalsProxySA, AppSignalsProxy, corev1.ProtocolTCP, servicePortsMap)
241+
}
242+
224243
func portFromEndpoint(endpoint string) (int32, error) {
225244
var err error
226245
var port int64

‎internal/manifests/collector/ports_test.go‎

Lines changed: 38 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@ import (
1616
func TestStatsDGetContainerPorts(t *testing.T) {
1717
cfg := getJSONStringFromFile("./test-resources/statsDAgentConfig.json")
1818
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
19-
assert.Equal(t, 4, len(containerPorts))
20-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
21-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
22-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
23-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
24-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
25-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
19+
assert.Equal(t, 1, len(containerPorts))
2620
assert.Equal(t, int32(8135), containerPorts[CWA+StatsD].ContainerPort)
2721
assert.Equal(t, CWA+StatsD, containerPorts[CWA+StatsD].Name)
2822
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CWA+StatsD].Protocol)
@@ -31,13 +25,7 @@ func TestStatsDGetContainerPorts(t *testing.T) {
3125
func TestDefaultStatsDGetContainerPorts(t *testing.T) {
3226
cfg := getJSONStringFromFile("./test-resources/statsDDefaultAgentConfig.json")
3327
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
34-
assert.Equal(t, 4, len(containerPorts))
35-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
36-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
37-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
38-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
39-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
40-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
28+
assert.Equal(t, 1, len(containerPorts))
4129
assert.Equal(t, int32(8125), containerPorts[StatsD].ContainerPort)
4230
assert.Equal(t, StatsD, containerPorts[StatsD].Name)
4331
assert.Equal(t, corev1.ProtocolUDP, containerPorts[StatsD].Protocol)
@@ -46,42 +34,36 @@ func TestDefaultStatsDGetContainerPorts(t *testing.T) {
4634
func TestCollectDGetContainerPorts(t *testing.T) {
4735
cfg := getJSONStringFromFile("./test-resources/collectDAgentConfig.json")
4836
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
49-
assert.Equal(t, 4, len(containerPorts))
50-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
51-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
52-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
53-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
54-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
55-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
37+
assert.Equal(t, 1, len(containerPorts))
5638
assert.Equal(t, int32(25936), containerPorts[CWA+CollectD].ContainerPort)
5739
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CWA+CollectD].Protocol)
5840
}
5941

6042
func TestDefaultCollectDGetContainerPorts(t *testing.T) {
6143
cfg := getJSONStringFromFile("./test-resources/collectDDefaultAgentConfig.json")
6244
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
63-
assert.Equal(t, 4, len(containerPorts))
64-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
65-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
66-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
67-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
68-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
69-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
45+
assert.Equal(t, 1, len(containerPorts))
7046
assert.Equal(t, int32(25826), containerPorts[CollectD].ContainerPort)
7147
assert.Equal(t, CollectD, containerPorts[CollectD].Name)
7248
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CollectD].Protocol)
7349
}
7450

51+
func TestApplicationSignals(t *testing.T) {
52+
cfg := getJSONStringFromFile("./test-resources/application_signals.json")
53+
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
54+
assert.Equal(t, 3, len(containerPorts))
55+
assert.Equal(t, int32(4315), containerPorts[CWA+AppSignalsGrpc].ContainerPort)
56+
assert.Equal(t, CWA+AppSignalsGrpc, containerPorts[CWA+AppSignalsGrpc].Name)
57+
assert.Equal(t, int32(4316), containerPorts[CWA+AppSignalsHttp].ContainerPort)
58+
assert.Equal(t, CWA+AppSignalsHttp, containerPorts[CWA+AppSignalsHttp].Name)
59+
assert.Equal(t, int32(2000), containerPorts[CWA+AppSignalsProxy].ContainerPort)
60+
assert.Equal(t, CWA+AppSignalsProxy, containerPorts[CWA+AppSignalsProxy].Name)
61+
}
62+
7563
func TestEMFGetContainerPorts(t *testing.T) {
7664
cfg := getJSONStringFromFile("./test-resources/emfAgentConfig.json")
7765
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
78-
assert.Equal(t, 5, len(containerPorts))
79-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
80-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
81-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
82-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
83-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
84-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
66+
assert.Equal(t, 2, len(containerPorts))
8567
assert.Equal(t, int32(25888), containerPorts[EMFTcp].ContainerPort)
8668
assert.Equal(t, EMFTcp, containerPorts[EMFTcp].Name)
8769
assert.Equal(t, int32(25888), containerPorts[EMFUdp].ContainerPort)
@@ -92,13 +74,9 @@ func TestEMFGetContainerPorts(t *testing.T) {
9274
func TestXrayAndOTLPGetContainerPorts(t *testing.T) {
9375
cfg := getJSONStringFromFile("./test-resources/xrayAndOTLPAgentConfig.json")
9476
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
95-
assert.Equal(t, 5, len(containerPorts))
96-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
97-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
98-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
99-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
100-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
101-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
77+
assert.Equal(t, 3, len(containerPorts))
78+
assert.Equal(t, int32(2000), containerPorts[CWA+XrayTraces].ContainerPort)
79+
assert.Equal(t, CWA+XrayTraces, containerPorts[CWA+XrayTraces].Name)
10280
assert.Equal(t, int32(4327), containerPorts[CWA+OtlpGrpc].ContainerPort)
10381
assert.Equal(t, CWA+OtlpGrpc, containerPorts[CWA+OtlpGrpc].Name)
10482
assert.Equal(t, corev1.ProtocolTCP, containerPorts[CWA+OtlpGrpc].Protocol)
@@ -110,13 +88,9 @@ func TestXrayAndOTLPGetContainerPorts(t *testing.T) {
11088
func TestDefaultXRayAndOTLPGetContainerPorts(t *testing.T) {
11189
cfg := getJSONStringFromFile("./test-resources/xrayAndOTLPDefaultAgentConfig.json")
11290
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
113-
assert.Equal(t, 5, len(containerPorts))
114-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
115-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
116-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
117-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
118-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
119-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
91+
assert.Equal(t, 3, len(containerPorts))
92+
assert.Equal(t, int32(2000), containerPorts[XrayTraces].ContainerPort)
93+
assert.Equal(t, XrayTraces, containerPorts[XrayTraces].Name)
12094
assert.Equal(t, int32(4317), containerPorts[OtlpGrpc].ContainerPort)
12195
assert.Equal(t, OtlpGrpc, containerPorts[OtlpGrpc].Name)
12296
assert.Equal(t, corev1.ProtocolTCP, containerPorts[OtlpGrpc].Protocol)
@@ -128,13 +102,7 @@ func TestDefaultXRayAndOTLPGetContainerPorts(t *testing.T) {
128102
func TestXRayGetContainerPorts(t *testing.T) {
129103
cfg := getJSONStringFromFile("./test-resources/xrayAgentConfig.json")
130104
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
131-
assert.Equal(t, 5, len(containerPorts))
132-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
133-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
134-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
135-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
136-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
137-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
105+
assert.Equal(t, 2, len(containerPorts))
138106
assert.Equal(t, int32(2800), containerPorts[CWA+XrayTraces].ContainerPort)
139107
assert.Equal(t, CWA+XrayTraces, containerPorts[CWA+XrayTraces].Name)
140108
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CWA+XrayTraces].Protocol)
@@ -147,13 +115,9 @@ func TestXRayWithBindAddressDefaultGetContainerPorts(t *testing.T) {
147115
cfg := getJSONStringFromFile("./test-resources/xrayAgentConfig.json")
148116
strings.Replace(cfg, "2800", "2000", 1)
149117
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
150-
assert.Equal(t, 5, len(containerPorts))
151-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
152-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
153-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
154-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
155-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
156-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
118+
assert.Equal(t, 2, len(containerPorts))
119+
assert.Equal(t, int32(2800), containerPorts[CWA+XrayTraces].ContainerPort)
120+
assert.Equal(t, CWA+XrayTraces, containerPorts[CWA+XrayTraces].Name)
157121
assert.Equal(t, int32(2900), containerPorts[CWA+XrayProxy].ContainerPort)
158122
assert.Equal(t, CWA+XrayProxy, containerPorts[CWA+XrayProxy].Name)
159123
assert.Equal(t, corev1.ProtocolTCP, containerPorts[CWA+XrayProxy].Protocol)
@@ -163,13 +127,7 @@ func TestXRayWithTCPProxyBindAddressDefaultGetContainerPorts(t *testing.T) {
163127
cfg := getJSONStringFromFile("./test-resources/xrayAgentConfig.json")
164128
strings.Replace(cfg, "2900", "2000", 1)
165129
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
166-
assert.Equal(t, 5, len(containerPorts))
167-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
168-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
169-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
170-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
171-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
172-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
130+
assert.Equal(t, 2, len(containerPorts))
173131
assert.Equal(t, int32(2800), containerPorts[CWA+XrayTraces].ContainerPort)
174132
assert.Equal(t, CWA+XrayTraces, containerPorts[CWA+XrayTraces].Name)
175133
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CWA+XrayTraces].Protocol)
@@ -178,26 +136,20 @@ func TestXRayWithTCPProxyBindAddressDefaultGetContainerPorts(t *testing.T) {
178136
func TestNilMetricsGetContainerPorts(t *testing.T) {
179137
cfg := getJSONStringFromFile("./test-resources/nilMetrics.json")
180138
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
181-
assert.Equal(t, 3, len(containerPorts))
182-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
183-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
184-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
185-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
186-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
187-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
139+
assert.Equal(t, 0, len(containerPorts))
188140
}
189141

190142
func TestMultipleReceiversGetContainerPorts(t *testing.T) {
191143
cfg := getJSONStringFromFile("./test-resources/multipleReceiversAgentConfig.json")
192144
strings.Replace(cfg, "2900", "2000", 1)
193145
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
194146
assert.Equal(t, 11, len(containerPorts))
195-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
196-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
197-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
198-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
199-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
200-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
147+
assert.Equal(t, int32(4315), containerPorts[CWA+AppSignalsGrpc].ContainerPort)
148+
assert.Equal(t, CWA+AppSignalsGrpc, containerPorts[CWA+AppSignalsGrpc].Name)
149+
assert.Equal(t, int32(4316), containerPorts[CWA+AppSignalsHttp].ContainerPort)
150+
assert.Equal(t, CWA+AppSignalsHttp, containerPorts[CWA+AppSignalsHttp].Name)
151+
assert.Equal(t, int32(2000), containerPorts[CWA+AppSignalsProxy].ContainerPort)
152+
assert.Equal(t, CWA+AppSignalsProxy, containerPorts[CWA+AppSignalsProxy].Name)
201153
assert.Equal(t, int32(8135), containerPorts[CWA+StatsD].ContainerPort)
202154
assert.Equal(t, CWA+StatsD, containerPorts[CWA+StatsD].Name)
203155
assert.Equal(t, corev1.ProtocolUDP, containerPorts[CWA+StatsD].Protocol)
@@ -234,11 +186,9 @@ func TestSpecPortsOverrideGetContainerPorts(t *testing.T) {
234186
},
235187
}
236188
containerPorts := getContainerPorts(logger, cfg, specPorts)
237-
assert.Equal(t, 4, len(containerPorts))
189+
assert.Equal(t, 3, len(containerPorts))
238190
assert.Equal(t, int32(12345), containerPorts[AppSignalsGrpc].ContainerPort)
239191
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
240-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
241-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
242192
assert.Equal(t, int32(12346), containerPorts[AppSignalsProxy].ContainerPort)
243193
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
244194
assert.Equal(t, int32(8135), containerPorts[CWA+StatsD].ContainerPort)
@@ -250,13 +200,8 @@ func TestInvalidConfigGetContainerPorts(t *testing.T) {
250200
cfg := getJSONStringFromFile("./test-resources/nilMetrics.json")
251201
cfg = cfg + ","
252202
containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
253-
assert.Equal(t, 3, len(containerPorts))
254-
assert.Equal(t, int32(4315), containerPorts[AppSignalsGrpc].ContainerPort)
255-
assert.Equal(t, AppSignalsGrpc, containerPorts[AppSignalsGrpc].Name)
256-
assert.Equal(t, int32(4316), containerPorts[AppSignalsHttp].ContainerPort)
257-
assert.Equal(t, AppSignalsHttp, containerPorts[AppSignalsHttp].Name)
258-
assert.Equal(t, int32(2000), containerPorts[AppSignalsProxy].ContainerPort)
259-
assert.Equal(t, AppSignalsProxy, containerPorts[AppSignalsProxy].Name)
203+
assert.Equal(t, 0, len(containerPorts))
204+
260205
}
261206

262207
func getJSONStringFromFile(path string) string {

‎internal/manifests/collector/test-resources/application_signals.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"logs": {
3+
"metrics_collected": {
4+
"application_signals": {}
5+
}
6+
}
7+
}

‎internal/manifests/collector/test-resources/multipleReceiversAgentConfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
},
1717
"logs": {
1818
"metrics_collected": {
19-
"emf": {}
19+
"emf": {},
20+
"application_signals": {}
2021
}
2122
},
2223
"traces": {

0 commit comments

Comments
 (0)