-
Notifications
You must be signed in to change notification settings - Fork 849
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
[Prototype] How to support complex attributes in logs/events? (Option B) #6959
Open
trask
wants to merge
2
commits into
open-telemetry:main
Choose a base branch
from
trask:complex-attributes-option-b
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,5 +17,6 @@ public enum AttributeType { | |
STRING_ARRAY, | ||
BOOLEAN_ARRAY, | ||
LONG_ARRAY, | ||
DOUBLE_ARRAY | ||
DOUBLE_ARRAY, | ||
VALUE | ||
} |
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
63 changes: 63 additions & 0 deletions
63
api/all/src/main/java/io/opentelemetry/api/common/ValueBuilder.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,63 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.api.common; | ||
|
||
import static java.util.stream.Collectors.toList; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
|
||
public interface ValueBuilder { | ||
|
||
Value<?> build(); | ||
|
||
ValueBuilder put(String key, Value<?> value); | ||
|
||
default ValueBuilder put(String key, String value) { | ||
put(key, Value.of(value)); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, long value) { | ||
put(key, Value.of(value)); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, double value) { | ||
put(key, Value.of(value)); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, boolean value) { | ||
put(key, Value.of(value)); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, String... value) { | ||
put(key, Value.of(Arrays.stream(value).map(Value::of).collect(toList()))); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, long... value) { | ||
put(key, Value.of(Arrays.stream(value).mapToObj(Value::of).collect(toList()))); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, double... value) { | ||
put(key, Value.of(Arrays.stream(value).mapToObj(Value::of).collect(toList()))); | ||
return this; | ||
} | ||
|
||
default ValueBuilder put(String key, boolean... value) { | ||
List<Value<?>> values = new ArrayList<>(value.length); | ||
for (boolean val : value) { | ||
values.add(Value.of(val)); | ||
} | ||
put(key, Value.of(values)); | ||
return this; | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
api/all/src/main/java/io/opentelemetry/api/common/ValueBuilderImpl.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,20 @@ | ||
package io.opentelemetry.api.common; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
class ValueBuilderImpl implements ValueBuilder { | ||
|
||
private final List<KeyValue> keyValues = new ArrayList<>(); | ||
|
||
@Override | ||
public ValueBuilder put(String key, Value<?> value) { | ||
keyValues.add(KeyValue.of(key, value)); | ||
return this; | ||
} | ||
|
||
@Override | ||
public Value<?> build() { | ||
return Value.of(keyValues.toArray(new KeyValue[0])); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is specifically for building "maps"
another option is in #6761 that has separate map and list builders:
https://github.com/open-telemetry/opentelemetry-java/pull/6761/files#diff-11421657bbb9763b8bd1579fe3bc147d5955abc85a01a94eb567f641cdbb17a7R87-R93