Skip to content

Commit 9b24d1d

Browse files
jackgopack4jackgopack4
authored
Merge branch 'main' into patch-1
2 parents ac3ae61 + e4e5725 commit 9b24d1d

File tree

129 files changed

+8064
-511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+8064
-511
lines changed

‎.github/patches/opentelemetry-java-instrumentation.patch‎

Lines changed: 2468 additions & 40 deletions
Large diffs are not rendered by default.

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

Lines changed: 141 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,53 +38,184 @@ jobs:
3838
- name: Upload main-build adot.jar to s3
3939
run: aws s3 cp ./aws-opentelemetry-agent-*-SNAPSHOT.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar
4040

41-
java-ec2-default-e2e-test:
41+
#
42+
# PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE
43+
# DEFAULT SETTING: {Java Version}, EC2, AMD64, AL2
44+
#
45+
46+
default-v8-amd64:
4247
needs: [ upload-main-build ]
4348
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
4449
secrets: inherit
4550
with:
4651
aws-region: us-east-1
4752
caller-workflow-name: 'main-build'
53+
java-version: '8'
54+
cpu-architecture: 'x86_64'
4855

49-
java-ec2-asg-e2e-test:
56+
default-v11-amd64:
5057
needs: [ upload-main-build ]
51-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
58+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
59+
secrets: inherit
60+
with:
61+
aws-region: us-east-1
62+
caller-workflow-name: 'main-build'
63+
java-version: '11'
64+
cpu-architecture: 'x86_64'
65+
66+
default-v17-amd64:
67+
needs: [ upload-main-build ]
68+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
69+
secrets: inherit
70+
with:
71+
aws-region: us-east-1
72+
caller-workflow-name: 'main-build'
73+
java-version: '17'
74+
cpu-architecture: 'x86_64'
75+
76+
default-v21-amd64:
77+
needs: [ upload-main-build ]
78+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
79+
secrets: inherit
80+
with:
81+
aws-region: us-east-1
82+
caller-workflow-name: 'main-build'
83+
java-version: '21'
84+
cpu-architecture: 'x86_64'
85+
86+
default-v22-amd64:
87+
needs: [ upload-main-build ]
88+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
5289
secrets: inherit
5390
with:
5491
aws-region: us-east-1
5592
caller-workflow-name: 'main-build'
93+
java-version: '22'
94+
cpu-architecture: 'x86_64'
95+
96+
#
97+
# DOCKER DISTRIBUTION LANGUAGE VERSION COVERAGE
98+
# DEFAULT SETTING: {Java Version}, EKS, AMD64, AL2
99+
#
56100

57-
java-eks-e2e-test:
101+
eks-v8-amd64:
58102
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
59103
secrets: inherit
60104
with:
61105
aws-region: us-east-1
62106
test-cluster-name: 'e2e-adot-test'
63107
adot-image-name: ${{ inputs.adot-image-name }}
64108
caller-workflow-name: 'main-build'
109+
java-version: '8'
65110

66-
java-metric-limiter-e2e-test:
67-
needs: [ java-eks-e2e-test ]
68-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
111+
eks-v11-amd64:
112+
needs: eks-v8-amd64
113+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
114+
secrets: inherit
115+
with:
116+
aws-region: us-east-1
117+
test-cluster-name: 'e2e-adot-test'
118+
adot-image-name: ${{ inputs.adot-image-name }}
119+
caller-workflow-name: 'main-build'
120+
java-version: '11'
121+
122+
eks-v17-amd64:
123+
needs: eks-v11-amd64
124+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
69125
secrets: inherit
70126
with:
71127
aws-region: us-east-1
72128
test-cluster-name: 'e2e-adot-test'
73129
adot-image-name: ${{ inputs.adot-image-name }}
74130
caller-workflow-name: 'main-build'
131+
java-version: '17'
75132

76-
java-k8s-e2e-test:
133+
eks-v21-amd64:
134+
needs: eks-v17-amd64
135+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
136+
secrets: inherit
137+
with:
138+
aws-region: us-east-1
139+
test-cluster-name: 'e2e-adot-test'
140+
adot-image-name: ${{ inputs.adot-image-name }}
141+
caller-workflow-name: 'main-build'
142+
java-version: '21'
143+
144+
eks-v22-amd64:
145+
needs: eks-v21-amd64
146+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
147+
secrets: inherit
148+
with:
149+
aws-region: us-east-1
150+
test-cluster-name: 'e2e-adot-test'
151+
adot-image-name: ${{ inputs.adot-image-name }}
152+
caller-workflow-name: 'main-build'
153+
java-version: '22'
154+
155+
#
156+
# PACKAGED DISTRIBUTION PLATFORM COVERAGE
157+
# DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
158+
#
159+
160+
asg-v11-amd64:
161+
needs: [ upload-main-build ]
162+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
163+
secrets: inherit
164+
with:
165+
aws-region: us-east-1
166+
caller-workflow-name: 'main-build'
167+
java-version: '11'
168+
169+
#
170+
# DOCKER DISTRIBUTION PLATFORM COVERAGE
171+
# DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
172+
#
173+
174+
k8s-v11-amd64:
77175
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
78176
secrets: inherit
79177
with:
80178
aws-region: us-east-1
81179
adot-image-name: ${{ inputs.adot-image-name }}
82180
caller-workflow-name: 'main-build'
181+
java-version: '11'
83182

84-
java-ecs-e2e-test:
183+
184+
ecs-v11-amd64:
85185
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
86186
secrets: inherit
87187
with:
88188
aws-region: us-east-1
89189
adot-image-name: ${{ inputs.adot-image-name }}
90-
caller-workflow-name: 'main-build'
190+
caller-workflow-name: 'main-build'
191+
java-version: '11'
192+
193+
#
194+
# CPU ARCHITECTURE COVERAGE
195+
# DEFAULT SETTING: Java 11, EC2, {CPU Architecture}, AL2
196+
#
197+
198+
default-v11-arm64:
199+
needs: [ upload-main-build ]
200+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
201+
secrets: inherit
202+
with:
203+
aws-region: us-east-1
204+
caller-workflow-name: 'main-build'
205+
java-version: '11'
206+
cpu-architecture: 'arm64'
207+
208+
#
209+
# Other Functional Test Case
210+
#
211+
212+
metric-limiter-v11-amd64:
213+
needs: [ eks-v22-amd64 ]
214+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
215+
secrets: inherit
216+
with:
217+
aws-region: us-east-1
218+
test-cluster-name: 'e2e-adot-test'
219+
adot-image-name: ${{ inputs.adot-image-name }}
220+
caller-workflow-name: 'main-build'
221+
java-version: '11'

‎.github/workflows/main-build.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,22 @@ jobs:
157157
echo "ref=terraform" >> $GITHUB_OUTPUT
158158
fi
159159
160-
e2e-operator-test:
161-
concurrency:
162-
group: e2e-adot-agent-operator-test
163-
cancel-in-progress: false
164-
needs: [ build, create-test-ref, default-region-output ]
165-
uses: ./.github/workflows/e2e-tests-with-operator.yml
166-
secrets: inherit
167-
with:
168-
aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}
169-
image_tag: ${{ needs.build.outputs.java_agent_tag }}
170-
image_uri: ${{ needs.build.outputs.staging_registry }}/${{ needs.build.outputs.staging_repository }}
171-
test_ref: ${{ needs.create-test-ref.outputs.testRef }}
172-
caller-workflow-name: 'main-build'
160+
# TODO: This test is currently failing due to infrastructure problems. Commented it out because we are ignoring it during release.
161+
# Need to fix in the future. Ex: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/11525535146/job/32241628521
162+
163+
# e2e-operator-test:
164+
# concurrency:
165+
# group: e2e-adot-agent-operator-test
166+
# cancel-in-progress: false
167+
# needs: [ build, create-test-ref, default-region-output ]
168+
# uses: ./.github/workflows/e2e-tests-with-operator.yml
169+
# secrets: inherit
170+
# with:
171+
# aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}
172+
# image_tag: ${{ needs.build.outputs.java_agent_tag }}
173+
# image_uri: ${{ needs.build.outputs.staging_registry }}/${{ needs.build.outputs.staging_repository }}
174+
# test_ref: ${{ needs.create-test-ref.outputs.testRef }}
175+
# caller-workflow-name: 'main-build'
173176

174177
# E2E tests where SampleApp has Java Agent
175178
e2e-test:

‎.github/workflows/owasp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ jobs:
7777
id: high_scan
7878
uses: ./.github/actions/image_scan
7979
with:
80-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.3"
80+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.4"
8181
severity: 'CRITICAL,HIGH'
8282

8383
- name: Perform low image scan
8484
if: always()
8585
id: low_scan
8686
uses: ./.github/actions/image_scan
8787
with:
88-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.3"
88+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.4"
8989
severity: 'MEDIUM,LOW,UNKNOWN'
9090

9191
- name: Configure AWS Credentials for emitting metrics

‎.github/workflows/patch-release-build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ jobs:
110110

111111
- name: Set up Docker Buildx
112112
uses: docker/setup-buildx-action@v3
113+
with:
114+
driver-opts: image=moby/buildkit:v0.15.1
113115

114116
- name: Build image for testing
115117
uses: docker/build-push-action@v5

‎.github/workflows/release-build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ jobs:
7878

7979
- name: Set up Docker Buildx
8080
uses: docker/setup-buildx-action@v3
81+
with:
82+
driver-opts: image=moby/buildkit:v0.15.1
8183

8284
- name: Build image for testing
8385
uses: docker/build-push-action@v5

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# permissions and limitations under the License.
1414

1515
# Stage 1: Build the cp-utility binary
16-
FROM rust:1.75 as builder
16+
FROM public.ecr.aws/docker/library/rust:1.75 as builder
1717

1818
WORKDIR /usr/src/cp-utility
1919
COPY ./tools/cp-utility .

‎appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/ContractTestBase.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public abstract class ContractTestBase {
7979
.withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
8080
.withEnv("OTEL_METRIC_EXPORT_INTERVAL", "100") // 100 ms
8181
.withEnv("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "true")
82+
.withEnv("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", isRuntimeEnabled())
8283
.withEnv("OTEL_METRICS_EXPORTER", "none")
8384
.withEnv("OTEL_BSP_SCHEDULE_DELAY", "0") // Don't wait to export spans to the collector
8485
.withEnv(
@@ -159,4 +160,8 @@ protected String getApplicationOtelServiceName() {
159160
protected String getApplicationOtelResourceAttributes() {
160161
return "service.name=" + getApplicationOtelServiceName();
161162
}
163+
164+
protected String isRuntimeEnabled() {
165+
return "false";
166+
}
162167
}

0 commit comments

Comments
 (0)