Skip to content

[chore] fix main build failures #1131

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.

Sign up for GitHub

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

Open
jj22ee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[chore] fix main build failures #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/main-build-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ jobs:
echo "uuid=$UUID" >> $GITHUB_OUTPUT
- name: Patch ADOT
run: ./patch-upstream.sh
- name: Pin Java Sample app only for test-compatibility
run: |
cd opentelemetry-lambda
git fetch --unshallow
git checkout 5cc158009047d6c5cdc9fad69b4a28e75c7c92f7 -- java/
- name: Build layers / functions
run: GOARCH=${{ matrix.architecture }} ./build.sh ${{ matrix.architecture }}
working-directory: java
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/main-build-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ jobs:
echo "uuid=$UUID" >> $GITHUB_OUTPUT
- name: Patch ADOT
run: ./patch-upstream.sh
- name: Pin Node.js Sample app only for test-compatibility
run: |
cd opentelemetry-lambda
git fetch --unshallow
git checkout 5cc158009047d6c5cdc9fad69b4a28e75c7c92f7 -- nodejs/
- name: Login to Public ECR
uses: docker/login-action@v3
with:
Expand Down
3 changes: 0 additions & 3 deletions adot/collector/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ service:
metrics:
receivers: [otlp]
exporters: [debug]
telemetry:
metrics:
address: localhost:8888
2 changes: 1 addition & 1 deletion adot/utils/expected-templates/go-aws-sdk-wrapper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
},
{
"name":"api.github.com",
"name":"HTTP GET",
"inferred":true,
"http":{
"request":{
Expand Down
3 changes: 0 additions & 3 deletions java/integration-tests/aws-sdk/agent-confmap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ service:
metrics:
receivers: [otlp]
exporters: [debug, prometheusremotewrite]
telemetry:
metrics:
address: localhost:8888
EOT
filename = "config.yaml"
}
Expand Down
3 changes: 0 additions & 3 deletions java/integration-tests/aws-sdk/agent/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ service:
metrics:
receivers: [otlp]
exporters: [debug, prometheusremotewrite]
telemetry:
metrics:
address: localhost:8888
EOT
filename = "config.yaml"
}
Expand Down
4 changes: 2 additions & 2 deletions python/integration-tests/aws-sdk/wrapper/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ module "api-gateway" {
}

resource "aws_iam_role_policy_attachment" "hello-lambda-cloudwatch-insights" {
role = module.test-function.lambda_function_name
role = module.test-function.lambda_role_name
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
}

resource "aws_iam_role_policy_attachment" "test_xray" {
role = module.test-function.lambda_function_name
role = module.test-function.lambda_role_name
policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
}
Loading