Skip to content
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

[wip] flaky aws test investigation/fix #54

Closed
wants to merge 8 commits into from
Closed

[wip] flaky aws test investigation/fix #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbef136
re-enable test
SylvainJuge Nov 29, 2023
99053b5
enable verbose log for investigation
SylvainJuge Nov 29, 2023
7524662
log start/end for investigation
SylvainJuge Nov 30, 2023
896e4b1
add logging in the resource caching
SylvainJuge Nov 30, 2023
a67dca4
log extra resource
SylvainJuge Nov 30, 2023
b526474
reformat
SylvainJuge Nov 30, 2023
67e99f4
provide shared git hook + automatic gradle setup
SylvainJuge Nov 30, 2023
e371eb9
Merge branch 'main' of github.com:elastic/elastic-otel-java into flak…
SylvainJuge Dec 1, 2023
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
2 changes: 2 additions & 0 deletions custom/src/main/java/co/elastic/otel/ElasticExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public Resource wrapResource(Resource resource) {
// because original resources are immutable
Resource result = cachedResources.get(resource);
if (result != null) {
logger.info("wrap resource: cached for key : " + result + " >>> " + resource);
return result;
}
Objects.requireNonNull(resourceFuture);
Expand All @@ -101,6 +102,7 @@ public Resource wrapResource(Resource resource) {
} catch (InterruptedException | ExecutionException | TimeoutException e) {
logger.log(Level.WARNING, "unable capture resource attributes", e);
}
logger.info("wrap resource: new cached value for key : " + resource + " >>> " + result);
return result;
}

Expand Down
13 changes: 12 additions & 1 deletion resources/src/main/java/co/elastic/otel/resources/ElasticResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,21 @@ public Resource createResource(ConfigProperties config) {
}

private Resource getBaseResource(ConfigProperties config) {
long start = System.currentTimeMillis();
logger.info("start get base resource");
// application server providers : file parsing only thus fast
return invokeResourceProvider(new AppServerServiceNameProvider());
Resource resource = invokeResourceProvider(new AppServerServiceNameProvider());
logger.info("end get base resource duration (ms): " + (System.currentTimeMillis() - start));
return resource;
}

/**
* @return extra resource attributes that are expected to take some time due to making requests to
* external systems
*/
public Resource getExtraResource() {
long start = System.currentTimeMillis();
logger.info("start get extra resource");
List<ResourceProvider> providers =
Arrays.asList(
// ec2 relies on http calls without pre-checks
Expand All @@ -83,6 +89,11 @@ public Resource getExtraResource() {
for (ResourceProvider provider : providers) {
resource = resource.merge(invokeResourceProvider(provider));
}
logger.info(
"end get extra resource duration (ms): "
+ (System.currentTimeMillis() - start)
+ " >>> "
+ resource);
return resource;
}

Expand Down
1 change: 0 additions & 1 deletion smoke-tests/src/test/java/com/example/javaagent/smoketest/AwsResourceProvidersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.MountableFile;

@Disabled // because currently flaky
public class AwsResourceProvidersTest extends TestAppSmokeTest {

protected static final String MOCK_SERVER_HOST = "mock-server";
Expand Down Expand Up @@ -125,7 +124,7 @@
testResourceProvider(
attributes ->
attributes
.containsEntry(

Check failure on line 127 in smoke-tests/src/test/java/com/example/javaagent/smoketest/AwsResourceProvidersTest.java

View workflow job for this annotation

GitHub Actions / JUnit Tests

com.example.javaagent.smoketest.AwsResourceProvidersTest ► beanstalk() 

Failed test found in:
  smoke-tests/build/test-results/test/TEST-com.example.javaagent.smoketest.AwsResourceProvidersTest.xml
Error:
  java.lang.AssertionError:
Raw output 
java.lang.AssertionError: 
Expecting map:
  {"container.id"=string_value: "7b9a067fd4c44cddf6f093b1a73060eaf2cff8c7eaae5d96e812bb1babe7f02b"
, "host.arch"=string_value: "amd64"
, "host.name"=string_value: "7b9a067fd4c4"
, "os.description"=string_value: "Linux 6.2.0-1016-azure"
, "os.type"=string_value: "linux"
, "process.command_args"=array_value {
  values {
    string_value: "/usr/lib/jvm/java-17-openjdk-amd64/bin/java"
  }
  values {
    string_value: "-cp"
  }
  values {
    string_value: "/app/resources:/app/classes:/app/libs/*"
  }
  values {
    string_value: "co.elastic.otel.test.AppMain"
  }
}
, "process.executable.path"=string_value: "/usr/lib/jvm/java-17-openjdk-amd64/bin/java"
, "process.pid"=int_value: 1
, "process.runtime.description"=string_value: "Debian OpenJDK 64-Bit Server VM 17.0.9+9-Debian-1deb11u1"
, "process.runtime.name"=string_value: "OpenJDK Runtime Environment"
, "process.runtime.version"=string_value: "17.0.9+9-Debian-1deb11u1"
, "service.name"=string_value: "unknown_service:java"
, "telemetry.auto.version"=string_value: "elastic-0.0.1-SNAPSHOT-otel-1.30.0"
, "telemetry.sdk.language"=string_value: "java"
, "telemetry.sdk.name"=string_value: "opentelemetry"
, "telemetry.sdk.version"=string_value: "1.30.1"
}
to contain entries:
  ["cloud.platform"=string_value: "aws_elastic_beanstalk"
]
but could not find the following map entries:
  ["cloud.platform"=string_value: "aws_elastic_beanstalk"
]
	at com.example.javaagent.smoketest.AwsResourceProvidersTest.lambda$beanstalk$4(AwsResourceProvidersTest.java:127)
	at com.example.javaagent.smoketest.SmokeTest.lambda$checkTracesResources$3(SmokeTest.java:239)
	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
	at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197)
	at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1625)
	at java.base/java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:762)
	at java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:276)
	at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1625)
	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
	at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150)
	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173)
	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
	at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596)
	at com.example.javaagent.smoketest.SmokeTest.checkTracesResources(SmokeTest.java:239)
	at com.example.javaagent.smoketest.AwsResourceProvidersTest.testResourceProvider(AwsResourceProvidersTest.java:213)
	at com.example.javaagent.smoketest.AwsResourceProvidersTest.beanstalk(AwsResourceProvidersTest.java:124)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:728)
	at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60)
	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131)
	at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:156)
	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:147)
	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:86)
	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(InterceptingExecutableInvoker.java:103)
	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.lambda$invoke$0(InterceptingExecutableInvoker.java:93)
	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106)
	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64)
	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45)
	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37)
	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:92)
	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:86)
	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$7(TestMethodTestDescriptor.java:218)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:214)
	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:139)
	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:69)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:151)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54)
	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:107)
	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:88)
	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:54)
	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:67)
	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:52)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:86)
	at org.junit.platform.launcher.core.DefaultLauncherSession$DelegatingLauncher.execute(DefaultLauncherSession.java:86)
	at org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestClassProcessor$CollectAllTestClassesExecutor.processAllTestClasses(JUnitPlatformTestClassProcessor.java:118)
	at org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestClassProcessor$CollectAllTestClassesExecutor.access$000(JUnitPlatformTestClassProcessor.java:93)
	at org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestClassProcessor.stop(JUnitPlatformTestClassProcessor.java:88)
	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.stop(SuiteTestClassProcessor.java:62)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
	at jdk.proxy1/jdk.proxy1.$Proxy2.stop(Unknown Source)
	at org.gradle.api.internal.tasks.testing.worker.TestWorker$3.run(TestWorker.java:193)
	at org.gradle.api.internal.tasks.testing.worker.TestWorker.executeAndMaintainThreadName(TestWorker.java:129)
	at org.gradle.api.internal.tasks.testing.worker.TestWorker.execute(TestWorker.java:100)
	at org.gradle.api.internal.tasks.testing.worker.TestWorker.execute(TestWorker.java:60)
	at org.gradle.process.internal.worker.child.ActionExecutionWorker.execute(ActionExecutionWorker.java:56)
	at org.gradle.process.internal.worker.child.SystemApplicationClassLoaderWorker.call(SystemApplicationClassLoaderWorker.java:113)
	at org.gradle.process.internal.worker.child.SystemApplicationClassLoaderWorker.call(SystemApplicationClassLoaderWorker.java:65)
	at worker.org.gradle.process.internal.worker.GradleWorkerMain.run(GradleWorkerMain.java:69)
	at worker.org.gradle.process.internal.worker.GradleWorkerMain.main(GradleWorkerMain.java:74)
ResourceAttributes.CLOUD_PLATFORM.getKey(),
attributeValue(ResourceAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK))
.containsEntry(ResourceAttributes.SERVICE_VERSION.getKey(), attributeValue("2")));
Expand Down
1 change: 1 addition & 0 deletions smoke-tests/src/test/java/com/example/javaagent/smoketest/TestAppSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public static void startTestApp(Consumer<GenericContainer<?>> customizeContainer
customizeContainer.andThen(
container ->
container
.withEnv("OTEL_JAVAAGENT_DEBUG", "true")
.withExposedPorts(PORT)
.waitingFor(Wait.forHttp("/health").forPort(PORT))));
}
Expand Down
Loading