-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Leverage upstream improvements (#710)
* use GlobalAttributeSpanAppender via upstream mechanism * let upstream handle global attributes * let upstream handle screen attributes * spotless * spotless
- Loading branch information
1 parent
6c7e864
commit da903aa
Showing
5 changed files
with
110 additions
and
26 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
53 changes: 53 additions & 0 deletions
53
splunk-otel-android/src/main/java/com/splunk/rum/internal/GlobalAttributesSupplier.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,53 @@ | ||
| /* | ||
| * 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.internal; | ||
|
|
||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.common.AttributesBuilder; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Supplier; | ||
|
|
||
| /** | ||
| * Class to hold and update the set of global attributes that are appended to each span. This is | ||
| * used as the supplier to the GlobalAttributesSpanAppender. We need this because SplunkRum exposes | ||
| * a topmost update() method, and we can't break that contract, and there's no way to get a | ||
| * reference to the GlobalAttributesSpanAppender created by OtelRum. | ||
| * | ||
| * <p>When global attributes are more fleshed out in upstream, this will hopefully improve or go | ||
| * away. | ||
| * | ||
| * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change | ||
| * at any time. | ||
| */ | ||
| public class GlobalAttributesSupplier implements Supplier<Attributes> { | ||
| private Attributes attributes; | ||
|
|
||
| public GlobalAttributesSupplier(Attributes globalAttributes) { | ||
| this.attributes = globalAttributes; | ||
| } | ||
|
|
||
| @Override | ||
| public Attributes get() { | ||
| return attributes; | ||
| } | ||
|
|
||
| public void update(Consumer<AttributesBuilder> attributesUpdater) { | ||
| AttributesBuilder builder = attributes.toBuilder(); | ||
| attributesUpdater.accept(builder); | ||
| attributes = builder.build(); | ||
| } | ||
| } |
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
41 changes: 41 additions & 0 deletions
41
splunk-otel-android/src/test/java/com/splunk/rum/internal/GlobalAttributesSupplierTest.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,41 @@ | ||
| /* | ||
| * 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.internal; | ||
|
|
||
| import static io.opentelemetry.api.common.AttributeKey.stringKey; | ||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| import io.opentelemetry.api.common.Attributes; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class GlobalAttributesSupplierTest { | ||
|
|
||
| @Test | ||
| void update() { | ||
| Attributes initial = Attributes.of(stringKey("foo"), "bar", stringKey("bar"), "baz"); | ||
| GlobalAttributesSupplier testClass = new GlobalAttributesSupplier(initial); | ||
| testClass.update( | ||
| builder -> { | ||
| builder.put("jimbo", "hutch"); | ||
| builder.remove(stringKey("bar")); | ||
| }); | ||
| Attributes result = testClass.get(); | ||
| assertEquals("bar", result.get(stringKey("foo"))); | ||
| assertEquals("hutch", result.get(stringKey("jimbo"))); | ||
| assertNull(result.get(stringKey("bar"))); | ||
| } | ||
| } |