Skip to content

Commit 4e733c1

Browse files
committed
Merge branch 'main' into corretto
2 parents f9aad68 + 1889c91 commit 4e733c1

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

.github/collector/collector-config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ receivers:
55
endpoint: 0.0.0.0:4317
66

77
exporters:
8-
logging:
9-
loglevel: info
8+
debug:
9+
verbosity: normal
1010
awsxray:
1111
region: us-west-2
1212
awsemf:
@@ -21,11 +21,11 @@ service:
2121
receivers:
2222
- otlp
2323
exporters:
24-
- logging
24+
- debug
2525
- awsxray
2626
metrics:
2727
receivers:
2828
- otlp
2929
exporters:
30-
- logging
30+
- debug
3131
- awsemf

.github/workflows/release-build.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
PUBLIC_REPOSITORY: public.ecr.aws/aws-observability/adot-autoinstrumentation-java
1414
PRIVATE_REPOSITORY: 020628701572.dkr.ecr.us-west-2.amazonaws.com/adot-autoinstrumentation-java
1515
PRIVATE_REGISTRY: 020628701572.dkr.ecr.us-west-2.amazonaws.com
16+
ARTIFACT_NAME: aws-opentelemetry-agent.jar
1617

1718
permissions:
1819
id-token: write
@@ -117,13 +118,20 @@ jobs:
117118
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
118119
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
119120

121+
122+
- name: Get SHA256 checksum of release artifact
123+
id: get_sha256
124+
run: |
125+
cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" ${{ env.ARTIFACT_NAME }}
126+
shasum -a 256 ${{ env.ARTIFACT_NAME }} > ${{ env.ARTIFACT_NAME }}.sha256
127+
120128
- name: Create release
121129
env:
122130
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
123131
run: |
124-
cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
125132
gh release create --target "$GITHUB_REF_NAME" \
126133
--title "Release v${{ github.event.inputs.version }}" \
127134
--draft \
128135
"v${{ github.event.inputs.version }}" \
129-
aws-opentelemetry-agent.jar
136+
${{ env.ARTIFACT_NAME }} \
137+
${{ env.ARTIFACT_NAME }}.sha256

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,12 @@ In addition to the sample apps in this repository, there are also a set of [stan
5050
Please note that as per policy, we're providing support via GitHub on a best effort basis. However, if you have AWS Enterprise Support you can create a ticket and we will provide direct support within the respective SLAs.
5151

5252
## Security issue notifications
53-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
53+
54+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
55+
56+
## Checksum Verification
57+
58+
Artifacts released will include a `.sha256` file for checksum verification starting from v1.32.6
59+
To verify, run the command `shasum -a 256 -c <artifact_name>.sha256`
60+
It should return the output `<artifact_name>: OK` if the validation is successful
61+

0 commit comments

Comments
 (0)