Skip to content

Commit 1054ea6

Browse files
committed
checks
1 parent ce9443b commit 1054ea6

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

src/main/java/io/lumigo/core/SpansContainer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ public void init(Map<String, String> env, Reporter reporter, Context context, Ob
160160
: null)
161161
.event(
162162
Configuration.getInstance().isLumigoVerboseMode()
163-
? JsonUtils.getObjectAsJsonString(EventParserFactory.parseEvent(event))
163+
? JsonUtils.getObjectAsJsonString(
164+
EventParserFactory.parseEvent(event))
164165
: null)
165166
.build();
166167
}

src/main/java/io/lumigo/core/instrumentation/impl/ApacheKafkaProducerInstrumentation.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import io.lumigo.core.instrumentation.LumigoInstrumentationApi;
77
import io.lumigo.core.instrumentation.agent.Loader;
88
import io.lumigo.core.utils.LRUCache;
9+
import io.lumigo.models.KafkaSpan;
910
import java.nio.charset.StandardCharsets;
1011
import java.util.UUID;
11-
12-
import io.lumigo.models.KafkaSpan;
1312
import lombok.AllArgsConstructor;
1413
import net.bytebuddy.agent.builder.AgentBuilder;
1514
import net.bytebuddy.asm.Advice;

src/main/java/io/lumigo/core/parsers/event/EventParserFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.lumigo.core.parsers.event;
22

33
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
4-
import com.amazonaws.services.lambda.runtime.events.KafkaEvent;
54
import com.amazonaws.services.lambda.runtime.events.SNSEvent;
65
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
76
import org.pmw.tinylog.Logger;

src/main/java/io/lumigo/core/utils/AwsUtils.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.fasterxml.jackson.annotation.JsonInclude;
66
import io.lumigo.models.KafkaSpan;
77
import io.lumigo.models.Span;
8-
98
import java.nio.charset.StandardCharsets;
109
import java.util.*;
1110
import java.util.regex.Matcher;
@@ -164,7 +163,10 @@ public static TriggeredBy extractTriggeredByFromEvent(Object event) {
164163
for (KafkaEvent.KafkaEventRecord record : entry.getValue()) {
165164
for (Map<String, byte[]> headers : record.getHeaders()) {
166165
if (headers.containsKey(KafkaSpan.LUMIGO_MESSAGE_ID_KEY)) {
167-
messageIds.add(new String(headers.get(KafkaSpan.LUMIGO_MESSAGE_ID_KEY), StandardCharsets.UTF_8));
166+
messageIds.add(
167+
new String(
168+
headers.get(KafkaSpan.LUMIGO_MESSAGE_ID_KEY),
169+
StandardCharsets.UTF_8));
168170
break;
169171
}
170172
}

src/main/java/io/lumigo/models/KafkaSpanFactory.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ public static KafkaSpan createConsume(
119119
List<KafkaSpan.KafkaConsumerRecord> records = new ArrayList<>();
120120
consumerRecords.forEach(
121121
record -> {
122-
Header messageIdHeader = record.headers().lastHeader(KafkaSpan.LUMIGO_MESSAGE_ID_KEY);
122+
Header messageIdHeader =
123+
record.headers().lastHeader(KafkaSpan.LUMIGO_MESSAGE_ID_KEY);
123124
String messageId =
124125
messageIdHeader == null
125126
? null

src/test/java/infa/AwsLambdaEventGenerator.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord;
99
import com.amazonaws.services.lambda.runtime.events.models.s3.*;
1010
import com.sun.tools.javac.util.List;
11-
12-
import java.text.CollationElementIterator;
1311
import java.util.Collections;
1412
import java.util.Date;
1513
import java.util.HashMap;
@@ -164,16 +162,19 @@ public KafkaEvent kafkaEvent() {
164162
Collections.singletonMap(
165163
"msk-topic-0",
166164
Collections.singletonList(
167-
KafkaEvent.KafkaEventRecord
168-
.builder()
165+
KafkaEvent.KafkaEventRecord.builder()
169166
.withTopic("msk-topic")
170167
.withPartition(0)
171168
.withOffset(1612)
172169
.withTimestamp(1716147063028L)
173170
.withTimestampType("CREATE_TIME")
174171
.withKey("a2V5")
175172
.withValue("TWVzc2FnZSBhdCAxNzE2MTQ3MDYzMDE1")
176-
.withHeaders(Collections.singletonList(Collections.singletonMap("lumigoMessageId", "NjA1ZTU0YWItMA==".getBytes())))
173+
.withHeaders(
174+
Collections.singletonList(
175+
Collections.singletonMap(
176+
"lumigoMessageId",
177+
"NjA1ZTU0YWItMA==".getBytes())))
177178
.build())),
178179
"aws:kafka",
179180
"arn:aws:kafka:us-west-2:779055952581:cluster/MskLambdaStackCluster/8fff24de-4f6c-44ca-b072-61d7a1b450a4-2",

src/test/java/io/lumigo/core/utils/AwsUtilsTest.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,13 @@ void test_extractTriggeredByFromEvent_KafkaEvent() throws JSONException {
254254
Object event = awsLambdaEventGenerator.kafkaEvent();
255255

256256
JSONAssert.assertEquals(
257-
"{" +
258-
"\"triggeredBy\": \"kafka\", " +
259-
"\"arn\": \"arn:aws:kafka:us-west-2:779055952581:cluster/MskLambdaStackCluster/8fff24de-4f6c-44ca-b072-61d7a1b450a4-2\", " +
260-
"\"messageIds\": [\"NjA1ZTU0YWItMA==\"]"+
261-
"}",
262-
JsonUtils.getObjectAsJsonString(AwsUtils.extractTriggeredByFromEvent(event)), true);
257+
"{"
258+
+ "\"triggeredBy\": \"kafka\", "
259+
+ "\"arn\": \"arn:aws:kafka:us-west-2:779055952581:cluster/MskLambdaStackCluster/8fff24de-4f6c-44ca-b072-61d7a1b450a4-2\", "
260+
+ "\"messageIds\": [\"NjA1ZTU0YWItMA==\"]"
261+
+ "}",
262+
JsonUtils.getObjectAsJsonString(AwsUtils.extractTriggeredByFromEvent(event)),
263+
true);
263264
}
264265

265266
@ParameterizedTest

0 commit comments

Comments
 (0)