Skip to content
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.

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

[OpenTelemetry] Initial local only implementation #1743

Merged
merged 3 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from 2 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
10 changes: 10 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
coreLibraryDesugaringEnabled true
}

packagingOptions {
Expand Down Expand Up @@ -789,6 +790,15 @@ dependencies {

// openwnn (bundled because it is not published outside of JCenter, which is deprecated)
implementation fileTree(dir: "${project.rootDir}/libs/openwnn/", include: ['*.aar'])

// OpenTelemetry
implementation libs.opentelemetry.android.core
implementation libs.opentelemetry.android.instrumentation.activity
implementation libs.opentelemetry.android.instrumentation.anr
implementation libs.opentelemetry.android.instrumentation.crash
implementation libs.opentelemetry.android.instrumentation.sessions
implementation libs.opentelemetry.exporter.logging
coreLibraryDesugaring libs.desugar.jdk.libs
}

if (findProject(':servo')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import com.igalia.wolvic.search.SearchEngineWrapper;
import com.igalia.wolvic.speech.SpeechRecognizer;
import com.igalia.wolvic.speech.SpeechServices;
import com.igalia.wolvic.telemetry.OpenTelemetry;
import com.igalia.wolvic.telemetry.TelemetryService;
import com.igalia.wolvic.ui.OffscreenDisplay;
import com.igalia.wolvic.ui.adapters.Language;
Expand Down Expand Up @@ -284,6 +285,11 @@ protected void onCreate(Bundle savedInstanceState) {

SettingsStore.getInstance(getBaseContext()).setPid(Process.myPid());
((VRBrowserApplication)getApplication()).onActivityCreate(this);

if (!DeviceType.isHVRBuild() && SettingsStore.getInstance(getBaseContext()).isTelemetryEnabled()) {
TelemetryService.setService(new OpenTelemetry(getApplication()));
}

// Fix for infinite restart on startup crashes.
long count = SettingsStore.getInstance(getBaseContext()).getCrashRestartCount();
boolean cancelRestart = count > CrashReporterService.MAX_RESTART_COUNT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public class VRBrowserApplication extends Application implements AppServicesProv

protected void onActivityCreate(@NonNull Context activityContext) {
onConfigurationChanged(activityContext.getResources().getConfiguration());
TelemetryService.init(activityContext);
mAppExecutors = new AppExecutors();
TelemetryService.init(activityContext);
mConnectivityManager = new ConnectivityReceiver(activityContext);
mConnectivityManager.init();
mPlaces = new Places(activityContext);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package com.igalia.wolvic.telemetry;

import static io.opentelemetry.api.common.AttributeKey.stringKey;

import android.app.Application;
import android.os.Bundle;

import com.igalia.wolvic.BuildConfig;
import com.igalia.wolvic.VRBrowserApplication;

import java.util.concurrent.Executor;

import io.opentelemetry.android.OpenTelemetryRum;
import io.opentelemetry.android.OpenTelemetryRumBuilder;
import io.opentelemetry.android.config.OtelRumConfig;
import io.opentelemetry.android.features.diskbuffering.DiskBufferingConfiguration;
import io.opentelemetry.android.instrumentation.activity.ActivityLifecycleInstrumentation;
import io.opentelemetry.android.instrumentation.sessions.SessionInstrumentation;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.exporter.logging.LoggingSpanExporter;

public class OpenTelemetry implements ITelemetry {
private final Application application;
private OpenTelemetryRum rum;
private OpenTelemetryRumBuilder rumBuilder;
private final String instrumentationScopeName = BuildConfig.APPLICATION_ID;
private final String instrumentationScopeVersion = "1.0.0";
private final Executor diskIOExecutor;

public OpenTelemetry(Application app) {
application = app;
diskIOExecutor = ((VRBrowserApplication) application).getExecutors().diskIO();
}

private void initializeOpenTelemetryAndroid() {
DiskBufferingConfiguration diskBufferingConfiguration = DiskBufferingConfiguration.builder()
.setEnabled(true)
.setMaxCacheSize(10 * 1024 * 1024)
.setMaxFileAgeForWriteMillis(1000 * 5)
.build();
OtelRumConfig config = new OtelRumConfig()
.setDiskBufferingConfiguration(diskBufferingConfiguration);
rumBuilder = OpenTelemetryRum.builder(application, config)
.addSpanExporterCustomizer(exporter -> LoggingSpanExporter.create())
.addInstrumentation(new SessionInstrumentation())
.addInstrumentation(new ActivityLifecycleInstrumentation());
try {
rum = rumBuilder.build();
} catch (Exception e) {
e.printStackTrace();
}
}

private void runOnDiskIO(Runnable runnable) { diskIOExecutor.execute(runnable); }

@Override
public void start() {
assert rum == null;
initializeOpenTelemetryAndroid();
}

@Override
public void stop() {
rum = null;
rumBuilder = null;
}

@Override
public void customEvent(String name) {
assert rum != null;
runOnDiskIO(() -> {
rum.getOpenTelemetry().getTracer(instrumentationScopeName, instrumentationScopeVersion)
.spanBuilder(name)
.startSpan()
.end();
});
}

@Override
public void customEvent(String name, Bundle bundle) {
assert rum != null;
runOnDiskIO(() -> {
SpanBuilder spanBuilder = rum.getOpenTelemetry().getTracer(instrumentationScopeName, instrumentationScopeVersion)
.spanBuilder(name);
for (String key : bundle.keySet()) {
spanBuilder.setAttribute(key, bundle.get(key).toString());
}
spanBuilder.startSpan().end();
});
}
}
13 changes: 13 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[versions]
desugar_jdk_libs = "2.1.4"
opentelemetryApi = "1.46.0"
opentelemetryAndroid = "0.9.1-alpha"

[libraries]
desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
opentelemetry-exporter-logging = { module = "io.opentelemetry:opentelemetry-exporter-logging", version.ref = "opentelemetryApi" }
opentelemetry-android-core = { module = "io.opentelemetry.android:core", version.ref = "opentelemetryAndroid" }
opentelemetry-android-instrumentation-activity = { module = "io.opentelemetry.android:instrumentation-activity", version.ref = "opentelemetryAndroid" }
opentelemetry-android-instrumentation-anr = { module = "io.opentelemetry.android:instrumentation-anr", version.ref = "opentelemetryAndroid" }
opentelemetry-android-instrumentation-crash = { module = "io.opentelemetry.android:instrumentation-crash", version.ref = "opentelemetryAndroid" }
opentelemetry-android-instrumentation-sessions = { module = "io.opentelemetry.android:instrumentation-sessions", version.ref = "opentelemetryAndroid" }
6 changes: 3 additions & 3 deletions versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ versions.atsl_rules = "1.5.0"
versions.atsl_junit = "1.1.5"
versions.espresso = "3.5.1"
versions.android_gradle_plugin = '8.7.2'
versions.kotlin = "1.9.21"
versions.kotlin = "2.1.0"
versions.kotlin_coroutines = "1.7.3"
versions.snakeyaml = "2.0"
versions.gson = "2.10.1"
Expand Down Expand Up @@ -191,8 +191,8 @@ build_versions.target_sdk_wave = 31
build_versions.target_sdk_aosp = 29
build_versions.target_sdk_spaces = 29
build_versions.target_sdk_visionglass = 33
build_versions.compile_sdk = 34
build_versions.build_tools = "34.0.0"
build_versions.compile_sdk = 35
build_versions.build_tools = "35.0.0"
ext.build_versions = build_versions

ext.deps = deps
Expand Down
Loading