diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/ApplyDetails.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/ApplyDetails.cs index 4af029ab7c64..209a24e09d26 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/ApplyDetails.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/ApplyDetails.cs @@ -18,7 +18,7 @@ public ApplyDetails(string filename) public string Filename { get; } - public uint ApplyState { get; set; } + public ulong ApplyState { get; set; } public string? Error { get; set; } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmCachedTargetFile.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmCachedTargetFile.cs index 6788f4ce836b..f27028def1e0 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmCachedTargetFile.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmCachedTargetFile.cs @@ -10,7 +10,7 @@ namespace Datadog.Trace.RemoteConfigurationManagement.Protocol { internal class RcmCachedTargetFile { - public RcmCachedTargetFile(string path, int length, List hashes) + public RcmCachedTargetFile(string path, long length, List hashes) { Path = path; Length = length; @@ -21,7 +21,7 @@ public RcmCachedTargetFile(string path, int length, List Hashes { get; } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmClientState.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmClientState.cs index b731f5406ca7..a5b9e5b30444 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmClientState.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmClientState.cs @@ -10,7 +10,7 @@ namespace Datadog.Trace.RemoteConfigurationManagement.Protocol { internal class RcmClientState { - public RcmClientState(int rootVersion, int targetsVersion, List configStates, bool hasError, string error, string backendClientState) + public RcmClientState(long rootVersion, long targetsVersion, List configStates, bool hasError, string error, string backendClientState) { RootVersion = rootVersion; TargetsVersion = targetsVersion; @@ -21,7 +21,7 @@ public RcmClientState(int rootVersion, int targetsVersion, List } [JsonProperty("root_version")] - public int RootVersion { get; } + public long RootVersion { get; } [JsonProperty("targets_version")] public long TargetsVersion { get; } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmConfigState.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmConfigState.cs index 539975d28777..8f7ea60eebc0 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmConfigState.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmConfigState.cs @@ -9,7 +9,7 @@ namespace Datadog.Trace.RemoteConfigurationManagement.Protocol { internal class RcmConfigState { - public RcmConfigState(string id, int version, string product, uint applyState, string applyError = null) + public RcmConfigState(string id, long version, string product, ulong applyState, string applyError = null) { Id = id; Version = version; @@ -22,13 +22,13 @@ public RcmConfigState(string id, int version, string product, uint applyState, s public string Id { get; } [JsonProperty("version")] - public int Version { get; } + public long Version { get; } [JsonProperty("product")] public string Product { get; } [JsonProperty("apply_state")] - public uint ApplyState { get; } + public ulong ApplyState { get; } [JsonProperty("apply_error")] public string ApplyError { get; } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Signed.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Signed.cs index cba37562359c..808490487bc6 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Signed.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Signed.cs @@ -14,7 +14,7 @@ internal class Signed public Dictionary Targets { get; set; } = new(); [JsonProperty("version")] - public int Version { get; set; } + public long Version { get; set; } [JsonProperty("custom")] public TargetsCustom Custom { get; set; } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Target.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Target.cs index b16812c78be3..cd91a2eb577f 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Target.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Target.cs @@ -17,6 +17,6 @@ internal class Target public Dictionary Hashes { get; set; } = new(); [JsonProperty("length")] - public int Length { get; set; } + public long Length { get; set; } } } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/TargetCustom.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/TargetCustom.cs index f7027c08b44e..11a39eeb246e 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/TargetCustom.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/TargetCustom.cs @@ -11,6 +11,6 @@ namespace Datadog.Trace.RemoteConfigurationManagement.Protocol.Tuf internal class TargetCustom { [JsonProperty("v")] - public int V { get; set; } + public long V { get; set; } } } diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RcmSubscriptionManager.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RcmSubscriptionManager.cs index 4031ba3f6693..9ab6f7108aa3 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RcmSubscriptionManager.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RcmSubscriptionManager.cs @@ -39,7 +39,7 @@ internal class RcmSubscriptionManager : IRcmSubscriptionManager private IReadOnlyList _subscriptions = []; private string? _backendClientState; - private int _targetsVersion; + private long _targetsVersion; private BigInteger _capabilities; private string? _lastPollError; diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfiguration.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfiguration.cs index 47549d31ce29..cce830aa25c5 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfiguration.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfiguration.cs @@ -14,9 +14,9 @@ internal class RemoteConfiguration : IEquatable public RemoteConfiguration( RemoteConfigurationPath path, byte[] contents, - int length, + long length, Dictionary hashes, - int version) + long version) { Path = path; Contents = contents; @@ -29,11 +29,11 @@ public RemoteConfiguration( public byte[] Contents { get; } - public int Length { get; } + public long Length { get; } public Dictionary Hashes { get; } - public int Version { get; } + public long Version { get; } public override bool Equals(object o) { diff --git a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfigurationCache.cs b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfigurationCache.cs index c55573124d84..6f27f39738b5 100644 --- a/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfigurationCache.cs +++ b/tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfigurationCache.cs @@ -10,7 +10,7 @@ namespace Datadog.Trace.RemoteConfigurationManagement { internal class RemoteConfigurationCache { - public RemoteConfigurationCache(RemoteConfigurationPath path, int length, Dictionary hashes, int version) + public RemoteConfigurationCache(RemoteConfigurationPath path, long length, Dictionary hashes, long version) { Path = path; Length = length; @@ -20,13 +20,13 @@ public RemoteConfigurationCache(RemoteConfigurationPath path, int length, Dictio public RemoteConfigurationPath Path { get; } - public int Length { get; } + public long Length { get; } public Dictionary Hashes { get; } - public int Version { get; } + public long Version { get; } - public uint ApplyState { get; private set; } = ApplyStates.UNACKNOWLEDGED; + public ulong ApplyState { get; private set; } = ApplyStates.UNACKNOWLEDGED; public string Error { get; private set; }