Skip to content

log4j2 vulnaribility changes #15

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

Open
surabhi-mahawar wants to merge 2 commits into
base: release-4.6.0
Choose a base branch
from
Open

log4j2 vulnaribility changes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66796b0
lighstep opentelemetry - tracing on message process
surabhi-mahawar Dec 3, 2021
43907a1
for log4j2 vulnaribility
surabhi-mahawar Dec 14, 2021
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
13 changes: 12 additions & 1 deletion src/main/java/com/uci/outbound/consumers/OutboundKafkaController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
import lombok.extern.slf4j.Slf4j;
import messagerosa.core.model.XMessage;
import com.uci.dao.utils.XMessageDAOUtils;

import io.grpc.Context;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Scope;
import messagerosa.xml.XMessageParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationStartedEvent;
Expand All @@ -31,15 +36,20 @@ public class OutboundKafkaController {

@Autowired
private XMessageRepository xMessageRepo;

@Autowired
private Tracer tracer;

@EventListener(ApplicationStartedEvent.class)
public void onMessage() {
reactiveKafkaReceiver
.doOnNext(new Consumer<ReceiverRecord<String, String>>() {
@Override
public void accept(ReceiverRecord<String, String> msg) {
Span rootSpan = tracer.spanBuilder("outbound-processMessage").startSpan();
Context currentContext = Context.current();
XMessage currentXmsg = null;
try {
try(Scope scope = rootSpan.makeCurrent()) {
currentXmsg = XMessageParser.parse(new ByteArrayInputStream(msg.value().getBytes()));
String channel = currentXmsg.getChannelURI();
String provider = currentXmsg.getProviderURI();
Expand All @@ -54,6 +64,7 @@ public void accept(XMessage xMessage) {
@Override
public void accept(XMessageDAO xMessageDAO) {
log.info("XMessage Object saved is with sent user ID >> " + xMessageDAO.getUserId());
rootSpan.end();
}
});
}
Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,13 @@ spring.r2dbc.password=${FORMS_DB_PASSWORD}
#Caffeine Cache
caffeine.cache.max.size=${CAFFEINE_CACHE_MAX_SIZE:#{1000}}
caffeine.cache.exprie.duration.seconds=${CAFFEINE_CACHE_EXPIRE_DURATION:#{300}}

#Opentelemetry Lighstep Config
opentelemetry.lightstep.tracer=${OPENTELEMETERY_LIGHTSTEP_TRACER}
opentelemetry.lightstep.tracer.version=${OPENTELEMETERY_LIGHTSTEP_TRACER_VERSION}
opentelemetry.lightstep.service=${OPENTELEMETERY_LIGHTSTEP_SERVICE}
opentelemetry.lightstep.access.token=${OPENTELEMETERY_LIGHTSTEP_ACCESS_TOKEN}
opentelemetry.lightstep.end.point=${OPENTELEMETERY_LIGHTSTEP_END_POINT}

#for log4j2 vulnerability
log4j2.formatMsgNoLookups=true