Skip to content

Conversation

@ericywl
Copy link
Contributor

@ericywl ericywl commented Jul 7, 2025

Motivation/summary

8.19 and 9.1 no longer have the same apm-data resource version after elastic/elasticsearch#130478 and elastic/elasticsearch#130477 have been merged. So, it is expected that they will have lazy rollover across upgrades.

How to test these changes

Run workflow: https://github.com/elastic/apm-server/actions/runs/16112715129.

@ericywl ericywl requested a review from a team as a code owner July 7, 2025 09:07
@ericywl ericywl added the backport-skip Skip notification from the automated backport with mergify label Jul 7, 2025
@ericywl ericywl self-assigned this Jul 7, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Jul 7, 2025

This pull request does not have a backport label. Could you fix it @ericywl? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

kruskall
kruskall previously approved these changes Jul 7, 2025
simitt
simitt previously approved these changes Jul 7, 2025
carsonip
carsonip previously approved these changes Jul 7, 2025
@ericywl
Copy link
Contributor Author

ericywl commented Jul 7, 2025

The system test failed for unrelated reasons:

=== RUN   TestApprovedMetrics
    metrics_test.go:71:   []any{
          	... // 3 identical elements
          	map[string]any{"@timestamp": []any{string("2017-05-30T18:53:41.368Z")}, "agent.activation_method": []any{string("some_activation_method")}, "agent.name": []any{string("elastic-node")}, "agent.name.text": []any{string("elastic-node")}, ...},
          	map[string]any{"@timestamp": []any{string("2017-05-30T18:53:41.369Z")}, "agent.activation_method": []any{string("some_activation_method")}, "agent.name": []any{string("elastic-node")}, "agent.name.text": []any{string("elastic-node")}, ...},
        + 	map[string]any{
        + 		"@timestamp":                 []any{string("2017-05-30T18:53:00.000Z")},
        + 		"agent.name":                 []any{string("elastic-node")},
        + 		"agent.name.text":            []any{string("elastic-node")},
        + 		"data_stream.dataset":        []any{string("apm.service_summary.1m")},
        + 		"data_stream.namespace":      []any{string("default")},
        + 		"data_stream.type":           []any{string("metrics")},
        + 		"labels.tag1":                []any{string("one")},
        + 		"metricset.interval":         []any{string("1m")},
        + 		"metricset.name":             []any{string("service_summary")},
        + 		"numeric_labels.tag2":        []any{float64(2)},
        + 		"observer.hostname":          []any{string("dynamic")},
        + 		"observer.type":              []any{string("apm-server")},
        + 		"observer.version":           []any{string("dynamic")},
        + 		"processor.event":            []any{string("metric")},
        + 		"service.language.name":      []any{string("ecmascript")},
        + 		"service.language.name.text": []any{string("ecmascript")},
        + 		...
        + 	},
          	map[string]any{"@timestamp": []any{string("2017-05-30T18:53:42.281Z")}, "agent.activation_method": []any{string("some_activation_method")}, "agent.name": []any{string("elastic-node")}, "agent.name.text": []any{string("elastic-node")}, ...},
          }
        
        Test failed. Run `make check-approvals` to verify the diff.
        
    server.go:145: log file: /home/runner/work/apm-server/apm-server/systemtest/logs/TestApprovedMetrics/apm-server
--- FAIL: TestApprovedMetrics (1.36s)

@ericywl ericywl dismissed stale reviews from carsonip, simitt, and kruskall via 203d5fc July 7, 2025 10:41
@ericywl ericywl requested review from carsonip, kruskall and simitt July 7, 2025 15:14
@ericywl ericywl enabled auto-merge (squash) July 7, 2025 15:15
@ericywl ericywl requested a review from a team July 7, 2025 15:16
@ericywl ericywl merged commit 3adceb5 into main Jul 7, 2025
19 checks passed
@ericywl ericywl deleted the iservertest-fix-upgrade-config branch July 7, 2025 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants