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.

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

Jump to bottom

Added os.description resource attribute #42

Merged
merged 7 commits into from
Aug 30, 2023
Merged

Added os.description resource attribute #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ad5c83
Added os.description resource attribute and updated AndroidResourceTest
surbhiia Aug 23, 2023
4d82211
Address comment
surbhiia Aug 24, 2023
5f34fc4
Merge branch 'main' into develop/add-resource-attributes
breedx-splk Aug 24, 2023
854b387
Merge branch 'main' into develop/add-resource-attributes
breedx-splk Aug 24, 2023
a54c1a2
Merge branch 'open-telemetry:main' into develop/add-resource-attributes
surbhiia Aug 29, 2023
06f498b
Adding API level to os.description string
surbhiia Aug 29, 2023
f011756
Merge branch 'main' into develop/add-resource-attributes
LikeTheSalad Aug 30, 2023
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
15 changes: 15 additions & 0 deletions instrumentation/src/main/java/io/opentelemetry/android/AndroidResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MANUFACTURER;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MODEL_IDENTIFIER;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MODEL_NAME;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_DESCRIPTION;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_NAME;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_TYPE;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_VERSION;
Expand All @@ -35,6 +36,7 @@ static Resource createDefault(Application application) {
.put(OS_NAME, "Android")
.put(OS_TYPE, "linux")
.put(OS_VERSION, Build.VERSION.RELEASE)
.put(OS_DESCRIPTION, getOSDescription())
.build();
}

Expand Down Expand Up @@ -68,4 +70,17 @@ private static String trapTo(Supplier<String> fn, String defaultValue) {
return defaultValue;
}
}

private static String getOSDescription() {
StringBuilder osDescriptionBuilder = new StringBuilder();
return osDescriptionBuilder
.append("Android Version ")
.append(Build.VERSION.RELEASE)
.append(" (Build ")
.append(Build.ID)
.append(" API level ")
.append(Build.VERSION.SDK_INT)
.append(")")
.toString();
}
}
17 changes: 17 additions & 0 deletions instrumentation/src/test/java/io/opentelemetry/android/AndroidResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
package io.opentelemetry.android;

import static io.opentelemetry.android.RumConstants.RUM_SDK_VERSION;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MANUFACTURER;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MODEL_IDENTIFIER;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.DEVICE_MODEL_NAME;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_DESCRIPTION;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_NAME;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_TYPE;
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_VERSION;
Expand All @@ -30,6 +32,16 @@ class AndroidResourceTest {

String appName = "robotron";
String rumSdkVersion = "1.2.3";
String osDescription =
new StringBuilder()
.append("Android Version ")
.append(Build.VERSION.RELEASE)
.append(" (Build ")
.append(Build.ID)
.append(" API level ")
.append(Build.VERSION.SDK_INT)
.append(")")
.toString();

@Mock(answer = Answers.RETURNS_DEEP_STUBS)
Application app;
Expand All @@ -38,6 +50,7 @@ class AndroidResourceTest {
void testFullResource() {
ApplicationInfo appInfo = new ApplicationInfo();
appInfo.labelRes = 12345;

when(app.getApplicationContext().getApplicationInfo()).thenReturn(appInfo);
when(app.getApplicationContext().getString(appInfo.labelRes)).thenReturn(appName);
when(app.getApplicationContext().getResources().getString(R.string.rum_version))
Expand All @@ -51,9 +64,11 @@ void testFullResource() {
.put(RUM_SDK_VERSION, rumSdkVersion)
.put(DEVICE_MODEL_NAME, Build.MODEL)
.put(DEVICE_MODEL_IDENTIFIER, Build.MODEL)
.put(DEVICE_MANUFACTURER, Build.MANUFACTURER)
.put(OS_NAME, "Android")
.put(OS_TYPE, "linux")
.put(OS_VERSION, Build.VERSION.RELEASE)
.put(OS_DESCRIPTION, osDescription)
.build());

Resource result = AndroidResource.createDefault(app);
Expand All @@ -74,9 +89,11 @@ void testProblematicContext() {
.put(RUM_SDK_VERSION, "unknown")
.put(DEVICE_MODEL_NAME, Build.MODEL)
.put(DEVICE_MODEL_IDENTIFIER, Build.MODEL)
.put(DEVICE_MANUFACTURER, Build.MANUFACTURER)
.put(OS_NAME, "Android")
.put(OS_TYPE, "linux")
.put(OS_VERSION, Build.VERSION.RELEASE)
.put(OS_DESCRIPTION, osDescription)
.build());

Resource result = AndroidResource.createDefault(app);
Expand Down