Skip to content

Commit 90f3b10

Browse files
jj22eejj22ee
committed
Merge branch 'main' into otlp-ocb
2 parents 5622948 + 493353a commit 90f3b10

File tree

115 files changed

+518
-378
lines changed

Some content is hidden

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

115 files changed

+518
-378
lines changed

‎.github/workflows/dotnet-ec2-default-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-autoinstrumentation-dotnet-staging/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }} && unzip -d dotnet-distro ${{ env.ADOT_DISTRO_NAME }}" >> $GITHUB_ENV
9595
else
9696
# After Release will switch to latest tag instead of hard code version for canary purpose
97-
echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.3.2/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV
97+
echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/latest/download/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV
9898
fi
9999
100100
- name: Set Get CW Agent command environment variable

‎.github/workflows/dotnet-eks-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
uses: ./.github/workflows/actions/execute_and_retry
7777
with:
7878
pre-command: "mkdir enablement-script && cd enablement-script"
79-
command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/dotnet-sdk-1_3_2/scripts/eks/appsignals/enable-app-signals.sh
79+
command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/enable-app-signals.sh
8080
&& wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/clean-app-signals.sh"
8181
cleanup: "rm -f enable-app-signals.sh && rm -f clean-app-signals.sh"
8282
post-command: "chmod +x enable-app-signals.sh && chmod +x clean-app-signals.sh"

‎.github/workflows/java-ec2-default-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ jobs:
112112
# Reusing the adot-main-build-staging-jar bucket to store the python wheel file
113113
echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV
114114
elif [ "${{ env.OTEL_SOURCE }}" == "maven" ]; then
115-
echo "Latest version for Maven is: 1.32.4"
116-
echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/1.32.4/aws-opentelemetry-agent-1.32.4.jar" >> $GITHUB_ENV
115+
echo "Latest version for Maven is: 1.32.5"
116+
echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/1.32.5/aws-opentelemetry-agent-1.32.5.jar" >> $GITHUB_ENV
117117
else
118118
echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" >> $GITHUB_ENV
119119
fi

‎.github/workflows/java-ecs-test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ jobs:
132132
if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then
133133
echo CWAGENT_IMAGE_URI="${{ secrets.AWS_ECR_PRIVATE_REGISTRY }}/cwagent-integration-test:${{ github.sha }}" >> $GITHUB_ENV
134134
else
135-
# echo CWAGENT_IMAGE_URI="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest" >> $GITHUB_ENV
136-
echo CWAGENT_IMAGE_URI="136146983976.dkr.ecr.us-east-1.amazonaws.com/cloudwatch-agent:1.300047.0b872" >> $GITHUB_ENV
135+
echo CWAGENT_IMAGE_URI="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest" >> $GITHUB_ENV
137136
fi
138137
139138
- name: Deploy sample app via terraform and wait for the endpoint to come online

‎.github/workflows/python-ecs-test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ jobs:
132132
if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then
133133
echo CWAGENT_IMAGE_URI="${{ secrets.AWS_ECR_PRIVATE_REGISTRY }}/cwagent-integration-test:${{ github.sha }}" >> $GITHUB_ENV
134134
else
135-
# echo CWAGENT_IMAGE_URI="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest" >> $GITHUB_ENV
136-
echo CWAGENT_IMAGE_URI="136146983976.dkr.ecr.us-east-1.amazonaws.com/cloudwatch-agent:1.300047.0b872" >> $GITHUB_ENV
135+
echo CWAGENT_IMAGE_URI="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest" >> $GITHUB_ENV
137136
fi
138137
139138
- name: Deploy sample app via terraform and wait for the endpoint to come online

‎.github/workflows/python-lambda-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ on:
3434
default: 'github'
3535
outputs:
3636
job-started:
37-
value: ${{ jobs.python-ec2-default.outputs.job-started }}
37+
value: ${{ jobs.python-lambda-default.outputs.job-started }}
3838
validation-result:
39-
value: ${{ jobs.python-ec2-default.outputs.validation-result }}
39+
value: ${{ jobs.python-lambda-default.outputs.validation-result }}
4040

4141
permissions:
4242
id-token: write

‎sample-apps/java/springboot-main-service/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jib {
6161
}
6262
container {
6363
mainClass = "com.amazon.sampleapp.FrontendService"
64+
jvmFlags = listOf("-XX:+UseG1GC")
6465
ports = listOf("8080")
6566
}
6667
}

‎sample-apps/java/springboot-remote-service/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jib {
5656
}
5757
container {
5858
mainClass = "com.amazon.sampleapp.RemoteService"
59+
jvmFlags = listOf("-XX:+UseG1GC")
5960
ports = listOf("8080")
6061
}
6162
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ resource "aws_launch_configuration" "launch_configuration" {
9191
associate_public_ip_address = true
9292
iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE"
9393
security_groups = [aws_default_vpc.default.default_security_group_id]
94+
95+
root_block_device {
96+
volume_size = 5
97+
}
9498

9599
user_data = <<-EOF
96100
#!/bin/bash
@@ -185,10 +189,15 @@ resource "aws_instance" "remote_service_instance" {
185189
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
186190
associate_public_ip_address = true
187191
instance_initiated_shutdown_behavior = "terminate"
192+
188193
metadata_options {
189194
http_tokens = "required"
190195
}
191196

197+
root_block_device {
198+
volume_size = 5
199+
}
200+
192201
tags = {
193202
Name = "remote-service-${var.test_id}"
194203
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -188,10 +193,15 @@ resource "aws_instance" "remote_service_instance" {
188193
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
189194
associate_public_ip_address = true
190195
instance_initiated_shutdown_behavior = "terminate"
196+
191197
metadata_options {
192198
http_tokens = "required"
193199
}
194200

201+
root_block_device {
202+
volume_size = 5
203+
}
204+
195205
tags = {
196206
Name = "remote-service-${var.test_id}"
197207
}

0 commit comments

Comments
 (0)