Skip to content

Commit 10948eb

Browse files
vastinvastin
authored
Merge branch 'main' into dependabot/docker/docker/library/rust-1.82
2 parents 180c7a9 + 2aa03d5 commit 10948eb

File tree

20 files changed

+1043
-75
lines changed

20 files changed

+1043
-75
lines changed

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,22 @@ jobs:
157157
echo "ref=terraform" >> $GITHUB_OUTPUT
158158
fi
159159
160-
e2e-operator-test:
161-
concurrency:
162-
group: e2e-adot-agent-operator-test
163-
cancel-in-progress: false
164-
needs: [ build, create-test-ref, default-region-output ]
165-
uses: ./.github/workflows/e2e-tests-with-operator.yml
166-
secrets: inherit
167-
with:
168-
aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}
169-
image_tag: ${{ needs.build.outputs.java_agent_tag }}
170-
image_uri: ${{ needs.build.outputs.staging_registry }}/${{ needs.build.outputs.staging_repository }}
171-
test_ref: ${{ needs.create-test-ref.outputs.testRef }}
172-
caller-workflow-name: 'main-build'
160+
# TODO: This test is currently failing due to infrastructure problems. Commented it out because we are ignoring it during release.
161+
# Need to fix in the future. Ex: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/11525535146/job/32241628521
162+
163+
# e2e-operator-test:
164+
# concurrency:
165+
# group: e2e-adot-agent-operator-test
166+
# cancel-in-progress: false
167+
# needs: [ build, create-test-ref, default-region-output ]
168+
# uses: ./.github/workflows/e2e-tests-with-operator.yml
169+
# secrets: inherit
170+
# with:
171+
# aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}
172+
# image_tag: ${{ needs.build.outputs.java_agent_tag }}
173+
# image_uri: ${{ needs.build.outputs.staging_registry }}/${{ needs.build.outputs.staging_repository }}
174+
# test_ref: ${{ needs.create-test-ref.outputs.testRef }}
175+
# caller-workflow-name: 'main-build'
173176

174177
# E2E tests where SampleApp has Java Agent
175178
e2e-test:

‎.github/workflows/owasp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ jobs:
7777
id: high_scan
7878
uses: ./.github/actions/image_scan
7979
with:
80-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.4"
80+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
8181
severity: 'CRITICAL,HIGH'
8282

8383
- name: Perform low image scan
8484
if: always()
8585
id: low_scan
8686
uses: ./.github/actions/image_scan
8787
with:
88-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.4"
88+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
8989
severity: 'MEDIUM,LOW,UNKNOWN'
9090

9191
- name: Configure AWS Credentials for emitting metrics

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

Lines changed: 56 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,19 @@ public abstract class ContractTestBase {
4848

4949
private final Logger collectorLogger =
5050
LoggerFactory.getLogger("collector " + getApplicationOtelServiceName());
51-
private final Logger applicationLogger =
51+
protected final Logger applicationLogger =
5252
LoggerFactory.getLogger("application " + getApplicationOtelServiceName());
5353

54-
private static final String AGENT_PATH =
54+
protected static final String AGENT_PATH =
5555
System.getProperty("io.awsobservability.instrumentation.contracttests.agentPath");
56+
protected static final String MOUNT_PATH = "/opentelemetry-javaagent-all.jar";
5657

5758
protected final Network network = Network.newNetwork();
5859

5960
private static final String COLLECTOR_HOSTNAME = "collector";
6061
private static final int COLLECTOR_PORT = 4317;
62+
protected static final String COLLECTOR_HTTP_ENDPOINT =
63+
"http://" + COLLECTOR_HOSTNAME + ":" + COLLECTOR_PORT;
6164

6265
protected final GenericContainer<?> mockCollector =
6366
new GenericContainer<>("aws-appsignals-mock-collector")
@@ -67,29 +70,7 @@ public abstract class ContractTestBase {
6770
.withNetwork(network)
6871
.withNetworkAliases(COLLECTOR_HOSTNAME);
6972

70-
protected final GenericContainer<?> application =
71-
new GenericContainer<>(getApplicationImageName())
72-
.dependsOn(getDependsOn())
73-
.withExposedPorts(getApplicationPort())
74-
.withNetwork(network)
75-
.withLogConsumer(new Slf4jLogConsumer(applicationLogger))
76-
.withCopyFileToContainer(
77-
MountableFile.forHostPath(AGENT_PATH), "/opentelemetry-javaagent-all.jar")
78-
.waitingFor(getApplicationWaitCondition())
79-
.withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
80-
.withEnv("OTEL_METRIC_EXPORT_INTERVAL", "100") // 100 ms
81-
.withEnv("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "true")
82-
.withEnv("OTEL_METRICS_EXPORTER", "none")
83-
.withEnv("OTEL_BSP_SCHEDULE_DELAY", "0") // Don't wait to export spans to the collector
84-
.withEnv(
85-
"OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT",
86-
"http://" + COLLECTOR_HOSTNAME + ":" + COLLECTOR_PORT)
87-
.withEnv(
88-
"OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
89-
"http://" + COLLECTOR_HOSTNAME + ":" + COLLECTOR_PORT)
90-
.withEnv("OTEL_RESOURCE_ATTRIBUTES", getApplicationOtelResourceAttributes())
91-
.withEnv(getApplicationExtraEnvironmentVariables())
92-
.withNetworkAliases(getApplicationNetworkAliases().toArray(new String[0]));
73+
protected final GenericContainer<?> application = getApplicationContainer();
9374

9475
protected MockCollectorClient mockCollectorClient;
9576
protected WebClient appClient;
@@ -108,10 +89,8 @@ private void stopCollector() {
10889
protected void setupClients() {
10990
application.start();
11091

111-
appClient = WebClient.of("http://localhost:" + application.getMappedPort(8080));
112-
mockCollectorClient =
113-
new MockCollectorClient(
114-
WebClient.of("http://localhost:" + mockCollector.getMappedPort(4317)));
92+
appClient = getApplicationClient();
93+
mockCollectorClient = getMockCollectorClient();
11594
}
11695

11796
@AfterEach
@@ -127,11 +106,55 @@ private List<Startable> getDependsOn() {
127106
return dependencies;
128107
}
129108

109+
protected WebClient getApplicationClient() {
110+
return WebClient.of("http://localhost:" + application.getMappedPort(8080));
111+
}
112+
113+
protected MockCollectorClient getMockCollectorClient() {
114+
return new MockCollectorClient(
115+
WebClient.of("http://localhost:" + mockCollector.getMappedPort(4317)));
116+
}
117+
118+
protected GenericContainer<?> getApplicationContainer() {
119+
return new GenericContainer<>(getApplicationImageName())
120+
.dependsOn(getDependsOn())
121+
.withExposedPorts(getApplicationPort())
122+
.withNetwork(network)
123+
.withLogConsumer(new Slf4jLogConsumer(applicationLogger))
124+
.withCopyFileToContainer(MountableFile.forHostPath(AGENT_PATH), MOUNT_PATH)
125+
.waitingFor(getApplicationWaitCondition())
126+
.withEnv(getApplicationEnvironmentVariables())
127+
.withEnv(getApplicationExtraEnvironmentVariables())
128+
.withNetworkAliases(getApplicationNetworkAliases().toArray(new String[0]));
129+
}
130+
130131
/** Methods that should be overridden in sub classes * */
131132
protected int getApplicationPort() {
132133
return 8080;
133134
}
134135

136+
protected Map<String, String> getApplicationEnvironmentVariables() {
137+
return Map.of(
138+
"JAVA_TOOL_OPTIONS",
139+
"-javaagent:" + MOUNT_PATH,
140+
"OTEL_METRIC_EXPORT_INTERVAL",
141+
"100", // 100 ms
142+
"OTEL_AWS_APPLICATION_SIGNALS_ENABLED",
143+
"true",
144+
"OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED",
145+
isRuntimeEnabled(),
146+
"OTEL_METRICS_EXPORTER",
147+
"none",
148+
"OTEL_BSP_SCHEDULE_DELAY",
149+
"0", // Don't wait to export spans to the collector
150+
"OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT",
151+
COLLECTOR_HTTP_ENDPOINT,
152+
"OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
153+
COLLECTOR_HTTP_ENDPOINT,
154+
"OTEL_RESOURCE_ATTRIBUTES",
155+
getApplicationOtelResourceAttributes());
156+
}
157+
135158
protected Map<String, String> getApplicationExtraEnvironmentVariables() {
136159
return Map.of();
137160
}
@@ -159,4 +182,8 @@ protected String getApplicationOtelServiceName() {
159182
protected String getApplicationOtelResourceAttributes() {
160183
return "service.name=" + getApplicationOtelServiceName();
161184
}
185+
186+
protected String isRuntimeEnabled() {
187+
return "false";
188+
}
162189
}

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

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.opentelemetry.appsignals.test.base;
17+
18+
import static org.assertj.core.api.Assertions.assertThat;
19+
20+
import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
21+
import java.util.List;
22+
import java.util.Map;
23+
import java.util.Set;
24+
import java.util.function.Consumer;
25+
import software.amazon.opentelemetry.appsignals.test.utils.JMXMetricsConstants;
26+
27+
public abstract class JMXMetricsContractTestBase extends ContractTestBase {
28+
29+
@Override
30+
protected Map<String, String> getApplicationEnvironmentVariables() {
31+
return Map.of(
32+
"JAVA_TOOL_OPTIONS", "-javaagent:" + MOUNT_PATH,
33+
"OTEL_METRIC_EXPORT_INTERVAL", "100", // 100 ms
34+
"OTEL_METRICS_EXPORTER", "none",
35+
"OTEL_LOGS_EXPORTER", "none",
36+
"OTEL_TRACES_EXPORTER", "none",
37+
"OTEL_EXPORTER_OTLP_PROTOCOL", "http/protobuf",
38+
"OTEL_JMX_ENABLED", "true",
39+
"OTEL_AWS_JMX_EXPORTER_METRICS_ENDPOINT", COLLECTOR_HTTP_ENDPOINT + "/v1/metrics");
40+
}
41+
42+
protected void doTestMetrics() {
43+
var response = appClient.get("/success").aggregate().join();
44+
45+
assertThat(response.status().isSuccess()).isTrue();
46+
assertMetrics();
47+
}
48+
49+
protected void assertMetrics() {
50+
var metrics = mockCollectorClient.getRuntimeMetrics(getExpectedMetrics());
51+
metrics.forEach(
52+
metric -> {
53+
var dataPoints = metric.getMetric().getGauge().getDataPointsList();
54+
assertGreaterThanOrEqual(dataPoints, getThreshold(metric.getMetric().getName()));
55+
});
56+
}
57+
58+
protected abstract Set<String> getExpectedMetrics();
59+
60+
protected long getThreshold(String metricName) {
61+
long threshold = 0;
62+
switch (metricName) {
63+
// If maximum memory size is undefined, then value is -1
64+
// https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/MemoryUsage.html#getMax()
65+
case JMXMetricsConstants.JVM_HEAP_MAX:
66+
case JMXMetricsConstants.JVM_NON_HEAP_MAX:
67+
case JMXMetricsConstants.JVM_POOL_MAX:
68+
threshold = -1;
69+
default:
70+
}
71+
return threshold;
72+
}
73+
74+
private void assertGreaterThanOrEqual(List<NumberDataPoint> dps, long threshold) {
75+
assertDataPoints(dps, (value) -> assertThat(value).isGreaterThanOrEqualTo(threshold));
76+
}
77+
78+
private void assertDataPoints(List<NumberDataPoint> dps, Consumer<Long> consumer) {
79+
dps.forEach(datapoint -> consumer.accept(datapoint.getAsInt()));
80+
}
81+
}

0 commit comments

Comments
 (0)