Skip to content

Commit 43f4f40

Browse files
authored
Merge branch 'main' into zhaez/main-build-metrics
2 parents 3f1030d + 339e83c commit 43f4f40

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

.github/workflows/application-signals-e2e-test.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,19 @@ jobs:
247247
with:
248248
caller-workflow-name: 'main-build'
249249
staging-wheel-name: ${{ inputs.staging-wheel-name }}
250+
251+
# This validation is to ensure that all test workflows relevant to this repo are actually
252+
# being used in this repo, which is referring to all the other jobs in this file.
253+
#
254+
# If this starts failing, then it most likely means that new e2e test workflow was
255+
# added to `aws-observability/aws-application-signals-test-framework`, but was not
256+
# added to this file. It could also mean that a test in this file has been removed.
257+
#
258+
# If a particular test file is intended to not be tested in this repo and should not
259+
# be failing this particular validation, then choose one of the following options:
260+
# - Add the test file to the exclusions input (CSV format) to the workflow
261+
# (see: https://github.com/aws-observability/aws-application-signals-test-framework/blob/main/.github/workflows/validate-e2e-tests-are-accounted-for.yml#L1)
262+
# - Update the `validate-e2e-tests-are-accounted-for` job to change which "workflow files are expected to be used by this repo"
263+
# (see: https://github.com/aws-observability/aws-application-signals-test-framework/blob/main/.github/workflows/validate-e2e-tests-are-accounted-for.yml)
264+
validate-all-tests-are-accounted-for:
265+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/validate-e2e-tests-are-accounted-for.yml@main

lambda-layer/src/otel-instrument

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ fi
101101
# disable application signals runtime metrics by default
102102
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED="false";
103103

104-
# enable emf exporter by default
104+
# disable otel metrics export by default
105105
if [ -z "${OTEL_METRICS_EXPORTER}" ]; then
106-
export OTEL_METRICS_EXPORTER="awsemf";
106+
export OTEL_METRICS_EXPORTER="none";
107107
fi
108108

109109
# disable OTel logs exporter by default

0 commit comments

Comments
 (0)