Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.grpc.ServerInterceptor;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry;
import io.opentelemetry.instrumentation.grpc.v1_6.internal.ContextStorageBridge;
Expand All @@ -37,21 +38,20 @@ public final class GrpcSingletons {
private static final AtomicReference<Context.Storage> STORAGE_REFERENCE = new AtomicReference<>();

static {
boolean emitMessageEvents =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
.getBoolean("emit_message_events", true);
ExtendedDeclarativeConfigProperties config =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc");
boolean emitMessageEvents = config.getBoolean("emit_message_events", true);

boolean experimentalSpanAttributes =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
.getBoolean("experimental_span_attributes/development", false);
config.getBoolean("experimental_span_attributes/development", false);

List<String> clientRequestMetadata =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
config
.get("capture_metadata")
.get("client")
.getScalarList("request", String.class, emptyList());
List<String> serverRequestMetadata =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
config
.get("capture_metadata")
.get("server")
.getScalarList("request", String.class, emptyList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties;
import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetricsBuilder;
import javax.annotation.Nullable;
Expand All @@ -21,19 +22,18 @@ private RuntimeMetricsConfigUtil() {}
@Nullable
public static RuntimeMetrics configure(
RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, String instrumentationMode) {
if (!DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry")
.getBoolean("enabled", instrumentationMode.equals("default"))) {
ExtendedDeclarativeConfigProperties config =
DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry");
if (!config.getBoolean("enabled", instrumentationMode.equals("default"))) {
// nothing is enabled
return null;
}

if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry")
.getBoolean("emit_experimental_telemetry/development", false)) {
if (config.getBoolean("emit_experimental_telemetry/development", false)) {
builder.emitExperimentalTelemetry();
}

if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry")
.getBoolean("capture_gc_cause", false)) {
if (config.getBoolean("capture_gc_cause", false)) {
builder.captureGcCause();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry;
import org.springframework.beans.factory.ObjectProvider;
Expand Down Expand Up @@ -36,17 +37,19 @@ public KafkaInstrumentationAutoConfiguration() {}
@Bean
static SpringKafkaTelemetry getTelemetry(ObjectProvider<OpenTelemetry> openTelemetryProvider) {
OpenTelemetry openTelemetry = openTelemetryProvider.getObject();
ExtendedDeclarativeConfigProperties commonConfig =
DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common");
return SpringKafkaTelemetry.builder(openTelemetry)
.setCaptureExperimentalSpanAttributes(
DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "kafka")
.getBoolean("experimental_span_attributes/development", false))
.setMessagingReceiveTelemetryEnabled(
DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common")
commonConfig
.get("messaging")
.get("receive_telemetry/development")
.getBoolean("enabled", false))
.setCapturedHeaders(
DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common")
commonConfig
.get("messaging")
.getScalarList("capture_headers/development", String.class, emptyList()))
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties;
import io.opentelemetry.instrumentation.spring.security.config.v6_0.EnduserAttributesCapturer;
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;

Expand All @@ -27,20 +28,15 @@ private static EnduserAttributesCapturer createEndUserAttributesCapturerFromConf
capturer.setEnduserRoleEnabled(AgentCommonConfig.get().getEnduserConfig().isRoleEnabled());
capturer.setEnduserScopeEnabled(AgentCommonConfig.get().getEnduserConfig().isScopeEnabled());

String rolePrefix =
ExtendedDeclarativeConfigProperties endUserConfig =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "spring_security")
.get("enduser")
.get("role")
.getString("granted_authority_prefix");
.get("enduser");
String rolePrefix = endUserConfig.get("role").getString("granted_authority_prefix");
if (rolePrefix != null) {
capturer.setRoleGrantedAuthorityPrefix(rolePrefix);
}

String scopePrefix =
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "spring_security")
.get("enduser")
.get("scope")
.getString("granted_authority_prefix");
String scopePrefix = endUserConfig.get("scope").getString("granted_authority_prefix");
if (scopePrefix != null) {
capturer.setScopeGrantedAuthorityPrefix(scopePrefix);
}
Expand Down
Loading