[aelnahas]

Motivation/summary

this PR updates the apm-data to v1.23.0 https://github.com/elastic/apm-data/releases/tag/v1.23.0 which includes the added support for semconv 1.33

Checklist

• Update CHANGELOG.asciidoc
• Documentation has been updated

For functional changes, consider:

• Is it observable through the addition of either logging or metrics?
• Is its use being published in telemetry to enable product improvement?
• Have system tests been added to avoid regression?

How to test these changes

1. Run es on docker container
   shdocker compose up -d elasticsearch
2. compile and run apm-server binary from this branch
3. to help with sending an otlp trace with the help of ai I have added the following convenient go script

import (
      "context"
      "time"

      "go.opentelemetry.io/otel/attribute"
      "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
      sdktrace "go.opentelemetry.io/otel/sdk/trace"
      "go.opentelemetry.io/otel/trace"
)

func main() {
      ctx := context.Background()
      exp, _ := otlptracegrpc.New(ctx, otlptracegrpc.WithEndpoint("127.0.0.1:8200"), otlptracegrpc.WithInsecure())
      tp := sdktrace.NewTracerProvider(sdktrace.WithBatcher(exp, sdktrace.WithBatchTimeout(time.Millisecond)))
      tracer := tp.Tracer("manual-verify")

      ctx, root := tracer.Start(ctx, "txn", trace.WithSpanKind(trace.SpanKindServer))
      _, child := tracer.Start(ctx, "db_call", trace.WithSpanKind(trace.SpanKindClient), trace.WithAttributes(
              attribute.String("db.system.name", "elasticsearch"), // should be supported now with semconv 1.33
      ))
      child.End()
      root.End()
      tp.Shutdown(ctx)
}

4. execute the script to send a trace
5. curl es for the indexed data

curl -s -u <user>:<password> "http://localhost:9200/traces-apm*/_search" \
  -H 'Content-Type: application/json' \
  -d '{"query":{"term":{"span.name":"db_call"}}}' | \
  jq '.hits.hits[0]._source.span | {type, subtype, db}'

you should see the following as a response of the curl request

{
  "type": "db",
  "subtype": "elasticsearch",
  "db": {
    "type": "elasticsearch"
  }

Related issues

Fixes: #20248

[github-actions]

🤖 GitHub comments

Just comment with:

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

[mergify]

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

• backport-8.19 is the label to automatically backport to the 8.19 branch.
• 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-9 is the label that automatically backports to all active minor branches for the 9 major.

[Copilot]

🟢 Approval recommended

No active review issues are identified for the dependency updates supporting OpenTelemetry database semantic conventions v1.33.

No open issues 🎉

What changed in this PR

Updates APM Server’s dependencies to support OpenTelemetry database semantic conventions v1.33, addressing database span recognition and destination service resource handling described in #20248.

Changes:

• Bumps apm-data from v1.22.2 to v1.23.0.
• Updates indirect dependency opentelemetry-lib from v0.39.0 to v0.49.0 and refreshes checksums.

File	Description
go.sum	Updates checksums for both upgraded dependencies.
go.mod	Selects the new dependency versions.

_{Review effort: Balanced}

[Copilot]

🟢 Approval recommended

No active review issues are reported for the dependency update adding OpenTelemetry database attribute support.

No open issues 🎉

_{Review effort: Balanced}

[kruskall]

Can you check why bumping semconv is adding these deps to the final binary ?

[Copilot]

🟢 Approval recommended

No active review issues are reported for the dependency update.

No open issues 🎉

_{Review effort: Balanced}

[infra-vault-gh-plugin-prod]

💚 Build Succeeded

• Buildkite Build
• Commit: 11b910f

History

• 💚 Build #13472 succeeded 8f6fcd8
• 💚 Build #13471 succeeded 9dc41bd

[carsonip]

thanks. for 9.6 backport please observe FF

[mergify]

This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again.

[github-actions]

@Mergifyio backport 9.6 9.5 9.4 8.19

[mergify]

backport 9.6 9.5 9.4 8.19

❌ No backport have been created

Details

• #22381 [9.6] (backport #22375) bump apm-data to v1.23.0 has been created for branch 9.6 but encountered conflicts

Cherry-pick of 378a4a7 has failed:

On branch mergify/bp/9.6/pr-22375
Your branch is up to date with 'origin/9.6'.

You are currently cherry-picking commit 378a4a7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

• #22382 [9.5] (backport #22375) bump apm-data to v1.23.0 has been created for branch 9.5 but encountered conflicts

Cherry-pick of 378a4a7 has failed:

On branch mergify/bp/9.5/pr-22375
Your branch is up to date with 'origin/9.5'.

You are currently cherry-picking commit 378a4a7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

• #22383 [9.4] (backport #22375) bump apm-data to v1.23.0 has been created for branch 9.4 but encountered conflicts

Cherry-pick of 378a4a7 has failed:

On branch mergify/bp/9.4/pr-22375
Your branch is up to date with 'origin/9.4'.

You are currently cherry-picking commit 378a4a7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

• Backport to branch 8.19 failed

Git failed in a way that is usually temporary. If this keeps happening, contact Mergify Support.