Skip to content

Commit 26283ef

Browse files
zzhloginzzhlogin
committed
Update patch.
1 parent ab5ee9a commit 26283ef

File tree

21 files changed

+180
-244
lines changed

21 files changed

+180
-244
lines changed

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

Lines changed: 92 additions & 93 deletions
Large diffs are not rendered by default.

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
default-v8-amd64:
4747
needs: [ upload-main-build ]
48-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
48+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
4949
secrets: inherit
5050
with:
5151
aws-region: us-east-1
@@ -55,7 +55,7 @@ jobs:
5555

5656
default-v11-amd64:
5757
needs: [ upload-main-build ]
58-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
58+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
5959
secrets: inherit
6060
with:
6161
aws-region: us-east-1
@@ -65,7 +65,7 @@ jobs:
6565

6666
default-v17-amd64:
6767
needs: [ upload-main-build ]
68-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
68+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
6969
secrets: inherit
7070
with:
7171
aws-region: us-east-1
@@ -75,7 +75,7 @@ jobs:
7575

7676
default-v21-amd64:
7777
needs: [ upload-main-build ]
78-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
78+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
7979
secrets: inherit
8080
with:
8181
aws-region: us-east-1
@@ -85,7 +85,7 @@ jobs:
8585

8686
default-v22-amd64:
8787
needs: [ upload-main-build ]
88-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
88+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
8989
secrets: inherit
9090
with:
9191
aws-region: us-east-1
@@ -99,7 +99,7 @@ jobs:
9999
#
100100

101101
eks-v8-amd64:
102-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
102+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
103103
secrets: inherit
104104
with:
105105
aws-region: us-east-1
@@ -110,7 +110,7 @@ jobs:
110110

111111
eks-v11-amd64:
112112
needs: eks-v8-amd64
113-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
113+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
114114
secrets: inherit
115115
with:
116116
aws-region: us-east-1
@@ -121,7 +121,7 @@ jobs:
121121

122122
eks-v17-amd64:
123123
needs: eks-v11-amd64
124-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
124+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
125125
secrets: inherit
126126
with:
127127
aws-region: us-east-1
@@ -132,7 +132,7 @@ jobs:
132132

133133
eks-v21-amd64:
134134
needs: eks-v17-amd64
135-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
135+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
136136
secrets: inherit
137137
with:
138138
aws-region: us-east-1
@@ -143,7 +143,7 @@ jobs:
143143

144144
eks-v22-amd64:
145145
needs: eks-v21-amd64
146-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
146+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
147147
secrets: inherit
148148
with:
149149
aws-region: us-east-1
@@ -159,7 +159,7 @@ jobs:
159159

160160
asg-v11-amd64:
161161
needs: [ upload-main-build ]
162-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
162+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@adot-java-v2
163163
secrets: inherit
164164
with:
165165
aws-region: us-east-1
@@ -172,7 +172,7 @@ jobs:
172172
#
173173

174174
k8s-v11-amd64:
175-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
175+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@adot-java-v2
176176
secrets: inherit
177177
with:
178178
aws-region: us-east-1
@@ -182,7 +182,7 @@ jobs:
182182

183183

184184
ecs-v11-amd64:
185-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
185+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@adot-java-v2
186186
secrets: inherit
187187
with:
188188
aws-region: us-east-1
@@ -197,7 +197,7 @@ jobs:
197197

198198
default-v11-arm64:
199199
needs: [ upload-main-build ]
200-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
200+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
201201
secrets: inherit
202202
with:
203203
aws-region: us-east-1
@@ -211,7 +211,7 @@ jobs:
211211

212212
metric-limiter-v11-amd64:
213213
needs: [ eks-v22-amd64 ]
214-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
214+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@adot-java-v2
215215
secrets: inherit
216216
with:
217217
aws-region: us-east-1

‎.github/workflows/docker-build-smoke-tests-fake-backend.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ jobs:
2525
with:
2626
java-version: 17
2727
distribution: 'temurin'
28+
# cache local patch outputs
29+
- name: Cache local Maven repository
30+
uses: actions/cache@v3
31+
with:
32+
path: |
33+
~/.m2/repository/io/opentelemetry/
34+
key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
35+
36+
- name: Publish patched dependencies to maven local
37+
uses: ./.github/actions/patch-dependencies
38+
with:
39+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
40+
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
2841
- uses: gradle/wrapper-validation-action@v1
2942
- name: Configure AWS Credentials
3043
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/nightly-upstream-snapshot-build.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ jobs:
3232
java-version: 17
3333
distribution: 'temurin'
3434

35+
# cache local patch outputs
36+
- name: Cache local Maven repository
37+
uses: actions/cache@v3
38+
with:
39+
path: |
40+
~/.m2/repository/io/opentelemetry/
41+
key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
42+
43+
- name: Publish patched dependencies to maven local
44+
uses: ./.github/actions/patch-dependencies
45+
with:
46+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
47+
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
48+
3549
- uses: gradle/wrapper-validation-action@v1
3650

3751
- name: Configure AWS Credentials

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
env:
1414
AWS_DEFAULT_REGION: us-east-1
15-
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
15+
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test-v2
1616

1717
permissions:
1818
id-token: write

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- main
66
- "release/v*"
77
env:
8-
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
8+
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test-v2
99

1010
jobs:
1111
testpatch:
@@ -63,6 +63,21 @@ jobs:
6363

6464
- uses: gradle/wrapper-validation-action@v1
6565

66+
# Check disk usage before cleanup
67+
- name: Check disk usage before cleanup
68+
run: df -h
69+
70+
# Cleanup directories before proceeding with setup
71+
- name: Clean up old installations
72+
if: ${{ matrix.os != 'windows-latest' }}
73+
run: |
74+
sudo rm -rf /usr/local/lib/android
75+
sudo rm -rf /usr/share/dotnet
76+
77+
# Check disk usage after cleanup
78+
- name: Check disk usage after cleanup
79+
run: df -h
80+
6681
# cache local patch outputs
6782
- name: Cache local Maven repository
6883
uses: actions/cache@v3
@@ -149,3 +164,7 @@ jobs:
149164
arguments: build --stacktrace -PenableCoverage=true
150165
- uses: codecov/codecov-action@v3
151166

167+
# Check disk usage after cleanup
168+
- name: Check disk usage after worflow
169+
run: df -h
170+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
AWS_PUBLIC_ECR_REGION: us-east-1
1111
AWS_PRIVATE_ECR_REGION: us-west-2
12-
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
12+
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test-v2
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

‎appsignals-tests/contract-tests/build.gradle.kts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ tasks {
7373
"-Dio.awsobservability.instrumentation.contracttests.agentPath=${otelAgentJarTask.get().archiveFile.get()
7474
.getAsFile().absolutePath}",
7575
)
76-
77-
println("Agent JAR Path!!!: ${otelAgentJarTask.get().archiveFile.get().asFile.absolutePath}")
78-
testLogging {
79-
events("passed", "skipped", "failed")
80-
showStandardStreams = true
81-
}
8276
}
8377

8478
// Disable the test task from the java plugin

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import java.util.List;
2424
import java.util.Map;
2525
import java.util.Set;
26-
import java.util.logging.ConsoleHandler;
27-
import java.util.logging.Level;
28-
import java.util.logging.Logger;
2926
import org.assertj.core.api.ThrowingConsumer;
3027
import org.junit.jupiter.api.AfterAll;
3128
import org.junit.jupiter.api.BeforeAll;
@@ -39,16 +36,6 @@
3936

4037
public abstract class AwsSdkBaseTest extends ContractTestBase {
4138

42-
protected static final Logger LOGGER = Logger.getLogger(AwsSdkBaseTest.class.getName());
43-
44-
static {
45-
ConsoleHandler handler = new ConsoleHandler();
46-
handler.setLevel(Level.INFO);
47-
LOGGER.addHandler(handler);
48-
LOGGER.setLevel(Level.INFO);
49-
LOGGER.setUseParentHandlers(false);
50-
}
51-
5239
private final LocalStackContainer localstack =
5340
new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.5.0"))
5441
.withServices(
@@ -620,7 +607,6 @@ protected void assertMetricAttributes(
620607
}
621608

622609
protected void doTestS3CreateBucket() throws Exception {
623-
LOGGER.info("doTestS3CreateBucket!!!!!!: ");
624610
appClient.get("/s3/createbucket/create-bucket").aggregate().join();
625611

626612
var traces = mockCollectorClient.getTraces();

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ protected Map<String, String> getApplicationEnvironmentVariables() {
153153
COLLECTOR_HTTP_ENDPOINT,
154154
"OTEL_RESOURCE_ATTRIBUTES",
155155
getApplicationOtelResourceAttributes(),
156-
// // The default OTLP protocol has been changed from grpc to
157-
// http/protobuf in
158-
// order
159-
// // to align with the specification. You can switch to the grpc protocol using
160-
// // OTEL_EXPORTER_OTLP_PROTOCOL=grpc or -Dotel.exporter.otlp.protocol=grpc.
161156
"OTEL_EXPORTER_OTLP_PROTOCOL",
162157
"grpc");
163158
}

0 commit comments

Comments
 (0)