Skip to content

Commit 45ee4cf

Browse files
Merge branch 'main' into add-windowseventlogreceiver
2 parents 86e36e3 + cfd9085 commit 45ee4cf

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

internal/pkg/agent/application/coordinator/coordinator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ func (c *Coordinator) updateManagersWithConfig(model *component.Model) {
17791779
for _, comp := range otelModel.Components {
17801780
componentIDs = append(componentIDs, comp.ID)
17811781
}
1782-
c.logger.With("component_ids", componentIDs).Warn("The Otel runtime manager is HIGHLY EXPERIMENTAL and only intended for testing. Use at your own risk.")
1782+
c.logger.With("component_ids", componentIDs).Info("Using OpenTelemetry collector runtime.")
17831783
}
17841784
c.otelMgr.Update(c.otelCfg, otelModel.Components)
17851785
}

testing/integration/ess/upgrade_fleet_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func TestFleetManagedUpgradeUnprivileged(t *testing.T) {
5252
Local: false, // requires Agent installation
5353
Sudo: true, // requires Agent installation
5454
})
55-
t.Skip("Skipping test temporarily until the DRA with the code that supports windows/arm64 is produced")
5655
testFleetManagedUpgrade(t, info, true, false)
5756
}
5857

@@ -67,7 +66,6 @@ func TestFleetManagedUpgradePrivileged(t *testing.T) {
6766
Local: false, // requires Agent installation
6867
Sudo: true, // requires Agent installation
6968
})
70-
t.Skip("Skipping test temporarily until the DRA with the code that supports windows/arm64 is produced")
7169
testFleetManagedUpgrade(t, info, false, false)
7270
}
7371

@@ -126,7 +124,6 @@ func TestFleetAirGappedUpgradeUnprivileged(t *testing.T) {
126124
Local: false, // Needed as the test requires Agent installation
127125
Sudo: true, // Needed as the test uses iptables and installs the Agent
128126
})
129-
t.Skip("Skipping test temporarily until the DRA with the code that supports windows/arm64 is produced")
130127
testFleetAirGappedUpgrade(t, stack, true)
131128
}
132129

@@ -139,7 +136,6 @@ func TestFleetAirGappedUpgradePrivileged(t *testing.T) {
139136
Local: false, // Needed as the test requires Agent installation
140137
Sudo: true, // Needed as the test uses iptables and installs the Agent
141138
})
142-
t.Skip("Skipping test temporarily until the DRA with the code that supports windows/arm64 is produced")
143139
testFleetAirGappedUpgrade(t, stack, false)
144140
}
145141

testing/integration/ess/upgrade_gpg_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func TestStandaloneUpgradeWithGPGFallback(t *testing.T) {
2929
Local: false, // requires Agent installation
3030
Sudo: true, // requires Agent installation
3131
})
32-
t.Skip("Skipping test temporarily until the DRA with the code that supports windows/arm64 is produced")
3332

3433
minVersion := upgradetest.Version_8_10_0_SNAPSHOT
3534
currentVersion, err := version.ParseVersion(define.Version())

0 commit comments

Comments
 (0)