open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove afterburner from aws-lambda tests (#2271)

This commit is contained in:
Trask Stalnaker 2021-02-13 11:16:01 -08:00 committed by GitHub
parent 8a1c4ed29b
commit 45a81d24b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle
View File

@ -27,7 +27,6 @@ dependencies {
compileOnly( compileOnly(
'com.fasterxml.jackson.core:jackson-databind:2.10.5.1', 'com.fasterxml.jackson.core:jackson-databind:2.10.5.1',
'com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10',
'commons-io:commons-io:2.2') 'commons-io:commons-io:2.2')
compileOnly deps.slf4j compileOnly deps.slf4j
@ -38,7 +37,6 @@ dependencies {
testImplementation( testImplementation(
'com.fasterxml.jackson.core:jackson-databind:2.10.5.1', 'com.fasterxml.jackson.core:jackson-databind:2.10.5.1',
'com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10',
'commons-io:commons-io:2.2') 'commons-io:commons-io:2.2')
testImplementation deps.opentelemetryTraceProps testImplementation deps.opentelemetryTraceProps

5
instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/HeadersFactory.java
View File

@ -8,7 +8,6 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import java.io.InputStream; import java.io.InputStream;
import java.util.Map; import java.util.Map;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@ -21,10 +20,6 @@ class HeadersFactory {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
static {
OBJECT_MAPPER.registerModule(new AfterburnerModule());
}
@Nullable @Nullable
static Map<String, String> ofStream(InputStream inputStream) { static Map<String, String> ofStream(InputStream inputStream) {
try (JsonParser jParser = new JsonFactory().createParser(inputStream)) { try (JsonParser jParser = new JsonFactory().createParser(inputStream)) {

6
instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractorTest.java
View File

@ -16,6 +16,7 @@ import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.extension.trace.propagation.B3Propagator; import io.opentelemetry.extension.trace.propagation.B3Propagator;
import java.util.Map; import java.util.Map;
import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@ -35,6 +36,11 @@ public class ParentContextExtractorTest {
OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance()))); OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
} }
@AfterClass
public static void tearDown() {
GlobalOpenTelemetry.resetForTest();
}
@Test @Test
public void shouldUseHttpIfAwsParentNotSampled() { public void shouldUseHttpIfAwsParentNotSampled() {
// given // given