Skip to content

feat: support modify loglevel over parameter & support log in tracereporter #520

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

Merged
merged 8 commits into from
Jun 18, 2024
Merged

feat: support modify loglevel over parameter & support log in tracereporter #520

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
958608f
feat: support trace reporting
andrewshan Jun 17, 2024
e7d4417
feat: restore version to 1.15.7-SNAPSHOT
andrewshan Jun 17, 2024
ea5261d
Merge branch 'polarismesh:main' into main
andrewshan Jun 17, 2024
b76ddf4
feat: add initService to AssemblyAPI
andrewshan Jun 17, 2024
1746201
test: add test for initService
andrewshan Jun 17, 2024
bc9f0f6
fix: TraceReporterConfig type mistake
andrewshan Jun 18, 2024
24bd7fc
Merge branch 'polarismesh:main' into main
andrewshan Jun 18, 2024
87dd61e
feat: support modify loglevel over parameter & support log in tracere…
andrewshan Jun 18, 2024
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
14 changes: 7 additions & 7 deletions polaris-common/polaris-logging/src/main/resources/polaris-log4j.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,31 +73,31 @@
</appender>

<logger name="com.tencent.polaris" additivity="false">
<level value="INFO"/>
<level value="${polaris.log.level:-INFO}"/>
<appender-ref ref="POLARIS_LOG_FILE"/>
</logger>
<logger name="polaris-update-event" additivity="false">
<level value="INFO"/>
<level value="${polaris.update.event.log.level:-INFO}"/>
<appender-ref ref="POLARIS_UPDATE_EVENT_LOG_FILE"/>
</logger>
<logger name="polaris-update-event-async" additivity="false">
<level value="INFO"/>
<level value="${polaris.update.event.async.log.level:-INFO}"/>
<appender-ref ref="POLARIS_UPDATE_EVENT_LOG_FILE_ASYNC"/>
</logger>
<logger name="polaris-circuitbreaker-event" additivity="false">
<level value="INFO"/>
<level value="${polaris.circuitbreaker.event.log.level:-INFO}"/>
<appender-ref ref="POLARIS_CIRCUIT_BREAKER_EVENT_LOG_FILE"/>
</logger>
<logger name="polaris-healthcheck-event" additivity="false">
<level value="INFO"/>
<level value="${polaris.healthcheck.event.log.level:-INFO}"/>
<appender-ref ref="POLARIS_HEALTH_CHECK_EVENT_LOG_FILE"/>
</logger>
<logger name="polaris-lossless-event" additivity="false">
<level value="INFO"/>
<level value="${polaris.lossless.event.log.level:-INFO}"/>
<appender-ref ref="POLARIS_LOSSLESS_EVENT_LOG_FILE"/>
</logger>
<logger name="polaris-instance-heartbeat" additivity="false">
<level value="INFO"/>
<level value="${polaris.instance.heartbeat.log.level:-INFO}"/>
<appender-ref ref="POLARIS_INSTANCE_HEARTBEAT_LOG_FILE"/>
</logger>
</log4j:configuration>
11 changes: 11 additions & 0 deletions polaris-plugins/polaris-plugins-observability/trace-otel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@
<groupId>com.tencent.polaris</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.tencent.polaris</groupId>
<artifactId>polaris-logging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions ...ity/trace-otel/src/main/java/com/tencent/polaris/plugins/stat/otel/OtelTraceReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,17 @@
import com.tencent.polaris.api.plugin.common.PluginTypes;
import com.tencent.polaris.api.plugin.compose.Extensions;
import com.tencent.polaris.api.plugin.stat.TraceReporter;
import com.tencent.polaris.logging.LoggerFactory;
import com.tencent.polaris.logging.PolarisLogging;
import io.opentelemetry.api.baggage.Baggage;
import io.opentelemetry.api.baggage.BaggageBuilder;
import io.opentelemetry.api.trace.Span;
import org.slf4j.Logger;

public class OtelTraceReporter implements TraceReporter {

private static final Logger LOGGER = LoggerFactory.getLogger(PolarisLogging.class);

@Override
public String getName() {
return TraceReporterConfig.DEFAULT_REPORTER_OTEL;
Expand Down Expand Up @@ -59,12 +64,14 @@ public void destroy() {

@Override
public void setSpanAttributes(Map<String, String> attributes) {
LOGGER.debug("OtelTraceReporter: setSpanAttributes: {}", attributes);
Span span = Span.current();
attributes.forEach(span::setAttribute);
}

@Override
public void setBaggageAttributes(Map<String, String> attributes) {
LOGGER.debug("OtelTraceReporter: setBaggageAttributes: {}", attributes);
BaggageBuilder builder = Baggage.current().toBuilder();
attributes.forEach(builder::put);
builder.build().makeCurrent();
Expand Down
Loading