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 @@ -17,6 +17,7 @@
package com.google.adk.plugins.agentanalytics;

import static com.google.adk.plugins.agentanalytics.BigQueryUtils.createAnalyticsViews;
import static com.google.adk.plugins.agentanalytics.BigQueryUtils.getVersionHeaderValue;
import static com.google.adk.plugins.agentanalytics.BigQueryUtils.maybeUpgradeSchema;
import static com.google.adk.plugins.agentanalytics.JsonFormatter.convertToJsonNode;
import static com.google.adk.plugins.agentanalytics.JsonFormatter.smartTruncate;
Expand All @@ -40,6 +41,7 @@
import com.google.adk.tools.ToolContext;
import com.google.adk.tools.mcp.AbstractMcpTool;
import com.google.adk.utils.AgentEnums.AgentOrigin;
import com.google.api.gax.rpc.FixedHeaderProvider;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.BigQueryException;
Expand Down Expand Up @@ -110,6 +112,8 @@ public BigQueryAgentAnalyticsPlugin(BigQueryLoggerConfig config, BigQuery bigQue

private static BigQuery createBigQuery(BigQueryLoggerConfig config) throws IOException {
BigQueryOptions.Builder builder = BigQueryOptions.newBuilder();
builder.setHeaderProvider(
FixedHeaderProvider.create(ImmutableMap.of("user-agent", getVersionHeaderValue())));
if (config.credentials() != null) {
builder.setCredentials(config.credentials());
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static java.util.stream.Collectors.toCollection;

import com.google.adk.Version;
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.BigQueryException;
import com.google.cloud.bigquery.Field;
Expand Down Expand Up @@ -136,6 +137,13 @@ final class BigQueryUtils {
"JSON_QUERY(content, '$.args') AS tool_args"))
.buildOrThrow();

private static final String FRAMEWORK_PREFIX = "google-adk-bq-logger-java";

/** Returns the telemetry header value. */
static String getVersionHeaderValue() {
return FRAMEWORK_PREFIX + "/" + Version.JAVA_ADK_VERSION;
}

/** Creates and/or replaces the analytics views in BigQuery. */
static void createAnalyticsViews(BigQuery bigQuery, BigQueryLoggerConfig config) {
for (Map.Entry<String, ImmutableList<String>> entry : EVENT_VIEW_DEFS.entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
package com.google.adk.plugins.agentanalytics;

import static com.google.adk.plugins.agentanalytics.BigQueryUtils.getVersionHeaderValue;
import static java.util.concurrent.TimeUnit.MILLISECONDS;

import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.FixedHeaderProvider;
import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings;
import com.google.cloud.bigquery.storage.v1.StreamWriter;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.VerifyException;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableMap;
import java.io.IOException;
import java.util.Collection;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -67,13 +71,14 @@ void markProcessed(String invocationId) {
}

protected BigQueryWriteClient createWriteClient(BigQueryLoggerConfig config) throws IOException {
BigQueryWriteSettings.Builder settingsBuilder =
BigQueryWriteSettings.newBuilder()
.setHeaderProvider(
FixedHeaderProvider.create(ImmutableMap.of("user-agent", getVersionHeaderValue())));
if (config.credentials() != null) {
return BigQueryWriteClient.create(
BigQueryWriteSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(config.credentials()))
.build());
settingsBuilder.setCredentialsProvider(FixedCredentialsProvider.create(config.credentials()));
}
return BigQueryWriteClient.create();
return BigQueryWriteClient.create(settingsBuilder.build());
}

protected StreamWriter createWriter() {
Expand All @@ -89,6 +94,7 @@ protected StreamWriter createWriter() {
String streamName = getStreamName(config);
try {
return StreamWriter.newBuilder(streamName, writeClient)
.setTraceId(BigQueryUtils.getVersionHeaderValue() + ":" + UUID.randomUUID())
.setRetrySettings(retrySettings)
.setWriterSchema(BigQuerySchema.getArrowSchema())
.build();
Expand Down
Loading