Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-9.4.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Gavin Halliday <[email protected]>

# Conflicts:
#	helm/hpcc/Chart.yaml
#	helm/hpcc/templates/_helpers.tpl
#	helm/hpcc/templates/dafilesrv.yaml
#	helm/hpcc/templates/dali.yaml
#	helm/hpcc/templates/dfuserver.yaml
#	helm/hpcc/templates/eclagent.yaml
#	helm/hpcc/templates/eclccserver.yaml
#	helm/hpcc/templates/eclscheduler.yaml
#	helm/hpcc/templates/esp.yaml
#	helm/hpcc/templates/localroxie.yaml
#	helm/hpcc/templates/roxie.yaml
#	helm/hpcc/templates/sasha.yaml
#	helm/hpcc/templates/thor.yaml
#	version.cmake
  • Loading branch information
ghalliday committed Feb 23, 2024
2 parents 2371a21 + eb80b9a commit 4edfd23
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion system/jlib/jtrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ class CSpan : public CInterfaceOf<ISpan>
void setSpanAttribute(const char *name, __uint64 value) override
{
if (span && !isEmptyString(name))
span->SetAttribute(name, value);
span->SetAttribute(name, (int64_t)value); // (uint64_t) would be even better but comments in attribute_value.h indicate that it is not supported by the standard.
}

void addSpanEvent(const char * eventName, IProperties * attributes) override
Expand Down

0 comments on commit 4edfd23

Please sign in to comment.