fixup: apply changes according to the semconv

The semconv has changed, and some attributes have been
renamed. Furthermore, the body usage is deprecated
and should be part of the attributes.

see: open-telemetry/semantic-conventions#1990
Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

src/main/java/dev/openfeature/sdk/EvaluationEvent.java

@@ -18,14 +18,7 @@ public class EvaluationEvent {
     @Singular("attribute")
     private Map<String, Object> attributes;
 
-    @Singular("bodyElement")
-    private Map<String, Object> body;
-
     public Map<String, Object> getAttributes() {
         return new HashMap<>(attributes);
     }
-
-    public Map<String, Object> getBody() {
-        return new HashMap<>(body);
-    }
 }

src/main/java/dev/openfeature/sdk/Telemetry.java

@@ -14,11 +14,12 @@ private Telemetry() {}
      */
     public static final String TELEMETRY_KEY = "feature_flag.key";
     public static final String TELEMETRY_ERROR_CODE = "error.type";
-    public static final String TELEMETRY_VARIANT = "feature_flag.variant";
+    public static final String TELEMETRY_VARIANT = "feature_flag.result.variant";
+    public static final String TELEMETRY_VALUE = "feature_flag.result.value";
     public static final String TELEMETRY_CONTEXT_ID = "feature_flag.context.id";
     public static final String TELEMETRY_ERROR_MSG = "feature_flag.evaluation.error.message";
-    public static final String TELEMETRY_REASON = "feature_flag.evaluation.reason";
-    public static final String TELEMETRY_PROVIDER = "feature_flag.provider_name";
+    public static final String TELEMETRY_REASON = "feature_flag.result.reason";
+    public static final String TELEMETRY_PROVIDER = "feature_flag.provider.name";
     public static final String TELEMETRY_FLAG_SET_ID = "feature_flag.set.id";
     public static final String TELEMETRY_VERSION = "feature_flag.version";
 
@@ -28,68 +29,64 @@ private Telemetry() {}
     public static final String TELEMETRY_FLAG_META_FLAG_SET_ID = "flagSetId";
     public static final String TELEMETRY_FLAG_META_VERSION = "version";
 
-    // OpenTelemetry event body.
-    // Specification: https://opentelemetry.io/docs/specs/semconv/feature-flags/feature-flags-logs/
-    public static final String TELEMETRY_BODY = "value";
-
     public static final String FLAG_EVALUATION_EVENT_NAME = "feature_flag.evaluation";
 
     /**
      * Creates an EvaluationEvent using the provided HookContext and ProviderEvaluation.
      *
      * @param hookContext the context containing flag evaluation details
-     * @param providerEvaluation the evaluation result from the provider
+     * @param evaluationDetails the evaluation result from the provider
      *
      * @return an EvaluationEvent populated with telemetry data
      */
     public static EvaluationEvent createEvaluationEvent(
-            HookContext<?> hookContext, ProviderEvaluation<?> providerEvaluation) {
+            HookContext<?> hookContext, FlagEvaluationDetails<?> evaluationDetails) {
         EvaluationEvent.EvaluationEventBuilder evaluationEventBuilder = EvaluationEvent.builder()
                 .name(FLAG_EVALUATION_EVENT_NAME)
                 .attribute(TELEMETRY_KEY, hookContext.getFlagKey())
                 .attribute(TELEMETRY_PROVIDER, hookContext.getProviderMetadata().getName());
 
-        if (providerEvaluation.getReason() != null) {
+        if (evaluationDetails.getReason() != null) {
             evaluationEventBuilder.attribute(
-                    TELEMETRY_REASON, providerEvaluation.getReason().toLowerCase());
+                    TELEMETRY_REASON, evaluationDetails.getReason().toLowerCase());
         } else {
             evaluationEventBuilder.attribute(
                     TELEMETRY_REASON, Reason.UNKNOWN.name().toLowerCase());
         }
 
-        if (providerEvaluation.getVariant() != null) {
-            evaluationEventBuilder.attribute(TELEMETRY_VARIANT, providerEvaluation.getVariant());
+        if (evaluationDetails.getVariant() != null) {
+            evaluationEventBuilder.attribute(TELEMETRY_VARIANT, evaluationDetails.getVariant());
         } else {
-            evaluationEventBuilder.bodyElement(TELEMETRY_BODY, providerEvaluation.getValue());
+            evaluationEventBuilder.attribute(TELEMETRY_VALUE, evaluationDetails.getValue());
         }
 
-        String contextId = providerEvaluation.getFlagMetadata().getString(TELEMETRY_FLAG_META_CONTEXT_ID);
+        String contextId = evaluationDetails.getFlagMetadata().getString(TELEMETRY_FLAG_META_CONTEXT_ID);
         if (contextId != null) {
             evaluationEventBuilder.attribute(TELEMETRY_CONTEXT_ID, contextId);
         } else {
             evaluationEventBuilder.attribute(
                     TELEMETRY_CONTEXT_ID, hookContext.getCtx().getTargetingKey());
         }
 
-        String setID = providerEvaluation.getFlagMetadata().getString(TELEMETRY_FLAG_META_FLAG_SET_ID);
+        String setID = evaluationDetails.getFlagMetadata().getString(TELEMETRY_FLAG_META_FLAG_SET_ID);
         if (setID != null) {
             evaluationEventBuilder.attribute(TELEMETRY_FLAG_SET_ID, setID);
         }
 
-        String version = providerEvaluation.getFlagMetadata().getString(TELEMETRY_FLAG_META_VERSION);
+        String version = evaluationDetails.getFlagMetadata().getString(TELEMETRY_FLAG_META_VERSION);
         if (version != null) {
             evaluationEventBuilder.attribute(TELEMETRY_VERSION, version);
         }
 
-        if (Reason.ERROR.name().equals(providerEvaluation.getReason())) {
-            if (providerEvaluation.getErrorCode() != null) {
-                evaluationEventBuilder.attribute(TELEMETRY_ERROR_CODE, providerEvaluation.getErrorCode());
+        if (Reason.ERROR.name().equals(evaluationDetails.getReason())) {
+            if (evaluationDetails.getErrorCode() != null) {
+                evaluationEventBuilder.attribute(TELEMETRY_ERROR_CODE, evaluationDetails.getErrorCode());
             } else {
                 evaluationEventBuilder.attribute(TELEMETRY_ERROR_CODE, ErrorCode.GENERAL);
             }
 
-            if (providerEvaluation.getErrorMessage() != null) {
-                evaluationEventBuilder.attribute(TELEMETRY_ERROR_MSG, providerEvaluation.getErrorMessage());
+            if (evaluationDetails.getErrorMessage() != null) {
+                evaluationEventBuilder.attribute(TELEMETRY_ERROR_MSG, evaluationDetails.getErrorMessage());
             }
         }