Skip to content

Commit a75778b

Browse files
bjraraharrryr
bjrara
and
harrryr
authored
Disable runtime metrics before e2e canaries are merged (#299)
*Issue description:* Runtime metrics will be enabled by default, and will be accepted as valid Application Signals metrics by CloudWatch agent in the next releases. As soon as the new artifacts are released, the canaries will start failing because more metrics than (the current) expected will be returned. This PR disables runtime metrics for now in the canaries before #283 is merged. *Description of changes:* *Rollback procedure:* <Can we safely revert this commit if needed? If not, detail what must be done to safely revert and why it is needed.> *Ensure you've run the following tests on your changes and include the link below:* To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: Harry <[email protected]>
1 parent 56376eb commit a75778b

File tree

24 files changed

+76
-3
lines changed

24 files changed

+76
-3
lines changed

‎sample-apps/dotnet/dotnet-ec2-win-main-setup.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ $env:OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT = "http://127.0.0.1:4316/v1/
8080
$env:OTEL_METRICS_EXPORTER = "none"
8181
$env:OTEL_RESOURCE_ATTRIBUTES = "service.name=dotnet-sample-application-$TestId"
8282
$env:OTEL_AWS_APPLICATION_SIGNALS_ENABLED = "true"
83+
$env:OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED = "false"
8384
$env:OTEL_TRACES_SAMPLER = "always_on"
8485
$env:ASPNETCORE_URLS = "http://0.0.0.0:8080"
8586

‎sample-apps/dotnet/dotnet-ec2-win-remote-setup.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ $env:OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT = "http://127.0.0.1:4316/v1/
7474
$env:OTEL_METRICS_EXPORTER = "none"
7575
$env:OTEL_RESOURCE_ATTRIBUTES = "service.name=dotnet-sample-remote-application-$TestId"
7676
$env:OTEL_AWS_APPLICATION_SIGNALS_ENABLED = "true"
77+
$env:OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED = "false"
7778
$env:OTEL_TRACES_SAMPLER = "always_on"
7879
$env:ASPNETCORE_URLS = "http://0.0.0.0:8081"
7980

‎terraform/dotnet/ec2/asg/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ resource "aws_launch_configuration" "launch_configuration" {
140140
export OTEL_METRICS_EXPORTER=none
141141
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-application-${var.test_id}
142142
export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true
143+
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false
143144
export OTEL_TRACES_SAMPLER=always_on
144145
export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://127.0.0.1:4316/v1/traces
145146
export OTEL_LOG_LEVEL=debug
@@ -249,6 +250,7 @@ resource "null_resource" "remote_service_setup" {
249250
export OTEL_METRICS_EXPORTER=none
250251
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-remote-application-${var.test_id}
251252
export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true
253+
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false
252254
export OTEL_TRACES_SAMPLER=always_on
253255
export ASPNETCORE_URLS=http://0.0.0.0:8081
254256
dotnet build

‎terraform/dotnet/ec2/default/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ resource "null_resource" "main_service_setup" {
150150
export OTEL_METRICS_EXPORTER=none
151151
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-application-${var.test_id}
152152
export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true
153+
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false
153154
export OTEL_TRACES_SAMPLER=always_on
154155
export ASPNETCORE_URLS=http://0.0.0.0:8080
155156
dotnet build
@@ -252,6 +253,7 @@ resource "null_resource" "remote_service_setup" {
252253
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-remote-application-${var.test_id}
253254
export OTEL_METRICS_EXPORTER=none
254255
export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true
256+
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false
255257
export OTEL_TRACES_SAMPLER=always_on
256258
export ASPNETCORE_URLS=http://0.0.0.0:8081
257259
dotnet build

‎terraform/dotnet/eks/linux/main.tf‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ resource "kubernetes_deployment" "dotnet_app_deployment" {
113113
#inject the test id to service name for unique App Signals metrics
114114
name = "OTEL_SERVICE_NAME"
115115
value = "dotnet-application-${var.test_id}"
116-
}
116+
}
117+
env {
118+
name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED"
119+
value = "false"
120+
}
117121
port {
118122
container_port = 8080
119123
}
@@ -182,6 +186,10 @@ resource "kubernetes_deployment" "dotnet_r_app_deployment" {
182186
port {
183187
container_port = 8081
184188
}
189+
env {
190+
name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED"
191+
value = "false"
192+
}
185193
}
186194
}
187195
}

‎terraform/dotnet/eks/windows/main.tf‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,11 @@ resource "kubernetes_deployment" "dotnet_app_deployment" {
123123
#inject the test id to service name for unique App Signals metrics
124124
name = "OTEL_SERVICE_NAME"
125125
value = "dotnet-application-${var.test_id}"
126-
}
126+
}
127+
env {
128+
name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED"
129+
value = "false"
130+
}
127131
port {
128132
container_port = 8080
129133
}
@@ -202,6 +206,10 @@ resource "kubernetes_deployment" "dotnet_r_app_deployment" {
202206
port {
203207
container_port = 8081
204208
}
209+
env {
210+
name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED"
211+
value = "false"
212+
}
205213
}
206214
}
207215
}

‎terraform/dotnet/k8s/deploy/resources/dotnet-frontend-service-depl.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ spec:
2626
value: "0.0.0.0:8080"
2727
- name: ASPNETCORE_URLS
2828
value: "http://+:8080"
29+
- name: OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED
30+
value: "false"
2931
imagePullSecrets:
3032
- name: ecr-secret

‎terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ spec:
2424
value: "0.0.0.0:8081"
2525
- name: ASPNETCORE_URLS
2626
value: "http://+:8081"
27+
- name: OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED
28+
value: "false"
2729
ports:
2830
- containerPort: 8081
2931
imagePullSecrets:

‎terraform/java/ec2/asg/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ resource "aws_launch_configuration" "launch_configuration" {
124124
OTEL_METRICS_EXPORTER=none \
125125
OTEL_LOGS_EXPORT=none \
126126
OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \
127+
OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \
127128
OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \
128129
OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \
129130
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \
@@ -220,6 +221,7 @@ resource "null_resource" "remote_service_setup" {
220221
OTEL_METRICS_EXPORTER=none \
221222
OTEL_LOGS_EXPORT=none \
222223
OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \
224+
OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \
223225
OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \
224226
OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \
225227
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \

‎terraform/java/ec2/default/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ resource "null_resource" "main_service_setup" {
136136
OTEL_METRICS_EXPORTER=none \
137137
OTEL_LOGS_EXPORT=none \
138138
OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \
139+
OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \
139140
OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \
140141
OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \
141142
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \
@@ -225,6 +226,7 @@ resource "null_resource" "remote_service_setup" {
225226
OTEL_METRICS_EXPORTER=none \
226227
OTEL_LOGS_EXPORT=none \
227228
OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \
229+
OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \
228230
OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \
229231
OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \
230232
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \

0 commit comments

Comments
 (0)