-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ConnectionUtil refactoring (and splitting out a NetworkAttributesAppe… (
#412) * ConnectionUtil refactoring (and splitting out a NetworkAttributesAppender) * code review comments
- Loading branch information
Mateusz Rzeszutek
authored
Dec 1, 2022
1 parent
e2745d3
commit e3cf6db
Showing
10 changed files
with
177 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
splunk-otel-android/src/main/java/com/splunk/rum/ScreenAttributesAppender.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Copyright Splunk Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.splunk.rum; | ||
|
|
||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.sdk.trace.ReadWriteSpan; | ||
| import io.opentelemetry.sdk.trace.ReadableSpan; | ||
| import io.opentelemetry.sdk.trace.SpanProcessor; | ||
|
|
||
| class ScreenAttributesAppender implements SpanProcessor { | ||
|
|
||
| private final VisibleScreenTracker visibleScreenTracker; | ||
|
|
||
| ScreenAttributesAppender(VisibleScreenTracker visibleScreenTracker) { | ||
| this.visibleScreenTracker = visibleScreenTracker; | ||
| } | ||
|
|
||
| @Override | ||
| public void onStart(Context parentContext, ReadWriteSpan span) { | ||
| String currentScreen = visibleScreenTracker.getCurrentlyVisibleScreen(); | ||
| span.setAttribute(SplunkRum.SCREEN_NAME_KEY, currentScreen); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isStartRequired() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void onEnd(ReadableSpan span) {} | ||
|
|
||
| @Override | ||
| public boolean isEndRequired() { | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
splunk-otel-android/src/test/java/com/splunk/rum/NetworkAttributesAppenderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright Splunk Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.splunk.rum; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.sdk.trace.ReadWriteSpan; | ||
| import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| class NetworkAttributesAppenderTest { | ||
|
|
||
| @Mock ConnectionUtil connectionUtil; | ||
| @Mock ReadWriteSpan span; | ||
|
|
||
| @InjectMocks NetworkAttributesAppender underTest; | ||
|
|
||
| @Test | ||
| void shouldAppendNetworkAttributes() { | ||
| when(connectionUtil.getActiveNetwork()) | ||
| .thenReturn( | ||
| CurrentNetwork.builder(NetworkState.TRANSPORT_CELLULAR) | ||
| .subType("LTE") | ||
| .build()); | ||
|
|
||
| assertTrue(underTest.isStartRequired()); | ||
| underTest.onStart(Context.current(), span); | ||
|
|
||
| verify(span) | ||
| .setAllAttributes( | ||
| Attributes.of( | ||
| SemanticAttributes.NET_HOST_CONNECTION_TYPE, "cell", | ||
| SemanticAttributes.NET_HOST_CONNECTION_SUBTYPE, "LTE")); | ||
|
|
||
| assertFalse(underTest.isEndRequired()); | ||
| } | ||
| } |
Oops, something went wrong.