Skip to content

Refactor code and remove unnecessary variables #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 110 commits into from
Closed

Refactor code and remove unnecessary variables #39

wants to merge 110 commits into from

Conversation

harrryr
Copy link
Contributor

@harrryr harrryr commented Apr 15, 2024

  • Remove unused variables
  • Refactor code
  • Move resources for java canary to java folder

Test run: https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/8696964974

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

amazon-auto and others added 30 commits January 29, 2024 09:29
…aws-otel-java-instrumentation

Update gradlew with correct dependencies

Update secrets on workflow files

Add deployment files for ECR and S3
Java/EC2: Fix RemoteTarget in Metrics and Traces based on 1.32.1 release
Update Sample Apps aws-sdk-call API to optionally uniquely name S3 Buckets
S3 Django Sample App Deployment workflow
majanjua-amzn and others added 24 commits March 22, 2024 15:10
…nt-rpm-latest

Revert "Change cw-agent.rpm to point to latest"
…ate-validation-to-addon-1.3.1

Update E2E Test Validation to use latest EKS addon
…ate-cw-agent-rpm-latest

[EC2] Update CW Agent RPM to latest version instead of hardcoded version
…t version (#34)

* Update python expected-data-template to match with cw agent rpm latest version

* Update terraform.

* Fix aws.local.operation.
Run E2E Test in docker container with packages already installed
…for-e2e

Revert "Run E2E Test in docker container with packages already installed"
[EKS] Separating concurrency tag to be per region
…ld-docker-for-e2e

Revert 35 revert 33 build docker for e2e
…e-app-namespace

Append testing id to sample-app-namespace
@zzhlogin zzhlogin mentioned this pull request Apr 22, 2024
@zzhlogin zzhlogin closed this Jun 6, 2024
georgeboc pushed a commit to georgeboc/aws-application-signals-test-framework that referenced this pull request Jul 8, 2024
*Issue #, if available:*

This PR add three workflows:
1. pr_build: with all the PR action in main & release branches, build
project .whl file and image file for future contract tests. This
workflow is based on
[Java_pr_build](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/main/.github/workflows/pr-build.yml#L80)
with following difference:
a. No `testpatch`: Have cut a backlog item to have the infrastructure
set up for it.
b. os: Although [otel java setup three
matrix.os](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/fb25e6d5589abe7ad2985c6c277a10b82bbc15af/.github/workflows/pr-build.yml#L46),
it is actually running the following actions [only on
ubuntu-latest](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/fb25e6d5589abe7ad2985c6c277a10b82bbc15af/.github/workflows/pr-build.yml#L80).
We need different command for different type of OS, which cause many
discrepancies, and the workflow won’t pass. So, we will just do linux
for now. Also cut a backlog item for mac/windows support.
c. No `test-adot-javaagent-image.sh`: we currently don't have[
.github/scripts/test-adot-javaagent-image.sh](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/main/.github/scripts/test-adot-javaagent-image.sh)(it
use to compare [the docker built
image](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/cf3c27aa183cf361fee39176a2e5e278bf363185/.github/actions/cpUtility-testing/action.yml#L46)
with [the Gradle built
image](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/cf3c27aa183cf361fee39176a2e5e278bf363185/.github/workflows/main-build.yml#L92)).
Since python don't have build tool like Gradle, we cannot do comparison
like Java
d. No contract tests, will be added when it is ready.
e. Added codespell check.
f. run on python version [py38, py39, py310, py311] same as the upstream
[distro](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/8fd2105ceae604cf39a67f1c4dd154753b43fcd1/.github/workflows/instrumentations_0.yml#L25C9-L25C58)
3. main_build: with all the push action and main & release branch, build
project .whl file upload to staging S3 bucket, and build project image,
upload to staging ECR repo. This workflow is based on
[Java_main_build](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/main/.github/workflows/main-build.yml)
with following difference:
a. No `testpatch`, see above in pr_build for details.
b. No `test-adot-javaagent-image.sh`: see above in pr_build for details.
c. No E2E tests, contract tests, publish-build-status, will be added
when they are ready.

4. release_build: when the workflow triggered manually, build project
.whl file and public it, also build project image, upload to staging ECR
repo, and publish to Test PyPI and PyPI. Currently we are using private
ECR repo only with release tag. When the public ECR is ready, we will
add it there. This workflow is based on
[Java_release_build](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/main/.github/workflows/release-build.yml)
with following difference:
a. No `test-adot-javaagent-image.sh`: see above in pr_build for details.
b. Added publish to Test PyPI and PyPI. Comment out publish PyPI for
now, will be uncomment when release workflow tested.

Sample successfully workflow runs:
PR build:
https://github.com/aws-observability/aws-otel-python-instrumentation/actions/runs/7880276267/job/21502034322?pr=39
main build:
https://github.com/aws-observability/aws-otel-python-instrumentation/actions/runs/7880275859/job/21502033292?pr=39

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.
@thpierce thpierce deleted the cleanup branch August 23, 2024 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants