Merge branch 'main' into HEAD

grafana · May 18, 2024 · b681981 · b681981
2 parents a3d1b38 + c8840f8
commit b681981
Show file tree

Hide file tree

Showing 7,548 changed files with 767,496 additions and 230,327 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,4 +3,3 @@ example/
 integration/
 operations/
 opentelemetry-proto/
-tools/
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -105,7 +105,7 @@ local image_tag_for_cd() = {
 
 local build_binaries(arch) = {
   name: 'build-tempo-binaries',
-  image: 'golang:1.20.4-alpine',
+  image: 'golang:1.21.3-alpine',
   commands: [
     'apk --update --no-cache add make git bash',
   ] + [
@@ -114,14 +114,15 @@ local build_binaries(arch) = {
   ],
 };
 
-local docker_build(arch, app) = {
+local docker_build(arch, app, dockerfile='') = {
   name: 'build-%s-image' % app,
   image: 'plugins/docker',
   settings: {
-    dockerfile: 'cmd/%s/Dockerfile' % app,
+    dockerfile: if dockerfile != '' then dockerfile else 'cmd/%s/Dockerfile' % app,
     repo: 'grafana/%s' % app,
     username: { from_secret: docker_username_secret.name },
     password: { from_secret: docker_password_secret.name },
+    platform: '%s/%s' % ['linux', arch],
     build_args: [
       'TARGETARCH=' + arch,
     ],
@@ -199,6 +200,29 @@ local deploy_to_dev() = {
       for arch in archs
     ],
   },
+] + [
+  // Publish tools Docker manifests
+  (
+    pipeline('docker-ci-tools-%s' % arch, arch) {
+      steps+: [
+        image_tag(arch),
+        docker_build(arch, 'tempo-ci-tools', dockerfile='tools/Dockerfile'),
+      ],
+    }
+  )
+  for arch in archs
+] + [
+  // Publish Docker manifests
+  pipeline('manifest-ci-tools') {
+    steps+: [
+      image_tag(),
+      docker_manifest('tempo-ci-tools'),
+    ],
+    depends_on+: [
+      'docker-ci-tools-%s' % arch
+      for arch in archs
+    ],
+  },
 ] + [
   // Continuously Deploy to dev env
   pipeline('cd-to-dev-env') {
@@ -227,7 +251,7 @@ local deploy_to_dev() = {
     steps+: [
               {
                 name: 'build-tempo-serverless',
-                image: 'golang:1.20.4-alpine',
+                image: 'golang:1.21.3-alpine',
                 commands: [
                   'apk add make git zip bash',
                   './tools/image-tag | cut -d, -f 1 | tr A-Z a-z > .tags',  // values in .tags are used by the next step when pushing the image
@@ -324,7 +348,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'write-key',
-        image: 'golang:1.20.4',
+        image: 'golang:1.21.3',
         commands: ['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'],
         environment: {
           NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name },
@@ -333,7 +357,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'test release',
-        image: 'golang:1.20.4',
+        image: 'golang:1.21.3',
         commands: ['make release-snapshot'],
         environment: {
           NFPM_DEFAULT_PASSPHRASE: { from_secret: gpg_passphrase.name },
@@ -366,7 +390,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'release',
-        image: 'golang:1.20.4',
+        image: 'golang:1.21.3',
         commands: ['make release'],
         environment: {
           GITHUB_TOKEN: { from_secret: gh_token_secret.name },

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -17,7 +17,7 @@ steps:
   - COMPONENT=tempo GOARCH=amd64 make exe
   - COMPONENT=tempo-vulture GOARCH=amd64 make exe
   - COMPONENT=tempo-query GOARCH=amd64 make exe
-  image: golang:1.20.4-alpine
+  image: golang:1.21.3-alpine
   name: build-tempo-binaries
 - image: plugins/docker
   name: build-tempo-image
@@ -27,6 +27,7 @@ steps:
     dockerfile: cmd/tempo/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/amd64
     repo: grafana/tempo
     username:
       from_secret: docker_username
@@ -38,6 +39,7 @@ steps:
     dockerfile: cmd/tempo-vulture/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/amd64
     repo: grafana/tempo-vulture
     username:
       from_secret: docker_username
@@ -49,6 +51,7 @@ steps:
     dockerfile: cmd/tempo-query/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/amd64
     repo: grafana/tempo-query
     username:
       from_secret: docker_username
@@ -78,7 +81,7 @@ steps:
   - COMPONENT=tempo GOARCH=arm64 make exe
   - COMPONENT=tempo-vulture GOARCH=arm64 make exe
   - COMPONENT=tempo-query GOARCH=arm64 make exe
-  image: golang:1.20.4-alpine
+  image: golang:1.21.3-alpine
   name: build-tempo-binaries
 - image: plugins/docker
   name: build-tempo-image
@@ -88,6 +91,7 @@ steps:
     dockerfile: cmd/tempo/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/arm64
     repo: grafana/tempo
     username:
       from_secret: docker_username
@@ -99,6 +103,7 @@ steps:
     dockerfile: cmd/tempo-vulture/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/arm64
     repo: grafana/tempo-vulture
     username:
       from_secret: docker_username
@@ -110,6 +115,7 @@ steps:
     dockerfile: cmd/tempo-query/Dockerfile
     password:
       from_secret: docker_password
+    platform: linux/arm64
     repo: grafana/tempo-query
     username:
       from_secret: docker_username
@@ -171,6 +177,104 @@ trigger:
   - refs/heads/r??
   - refs/heads/r???
 ---
+depends_on: []
+kind: pipeline
+name: docker-ci-tools-amd64
+platform:
+  arch: amd64
+  os: linux
+steps:
+- commands:
+  - apk --update --no-cache add bash
+  - git fetch origin --tags
+  - echo $(./tools/image-tag)-amd64 > .tags
+  image: alpine/git:v2.30.2
+  name: image-tag
+- image: plugins/docker
+  name: build-tempo-ci-tools-image
+  settings:
+    build_args:
+    - TARGETARCH=amd64
+    dockerfile: tools/Dockerfile
+    password:
+      from_secret: docker_password
+    platform: linux/amd64
+    repo: grafana/tempo-ci-tools
+    username:
+      from_secret: docker_username
+trigger:
+  ref:
+  - refs/heads/main
+  - refs/tags/v*
+  - refs/heads/r?
+  - refs/heads/r??
+  - refs/heads/r???
+---
+depends_on: []
+kind: pipeline
+name: docker-ci-tools-arm64
+platform:
+  arch: arm64
+  os: linux
+steps:
+- commands:
+  - apk --update --no-cache add bash
+  - git fetch origin --tags
+  - echo $(./tools/image-tag)-arm64 > .tags
+  image: alpine/git:v2.30.2
+  name: image-tag
+- image: plugins/docker
+  name: build-tempo-ci-tools-image
+  settings:
+    build_args:
+    - TARGETARCH=arm64
+    dockerfile: tools/Dockerfile
+    password:
+      from_secret: docker_password
+    platform: linux/arm64
+    repo: grafana/tempo-ci-tools
+    username:
+      from_secret: docker_username
+trigger:
+  ref:
+  - refs/heads/main
+  - refs/tags/v*
+  - refs/heads/r?
+  - refs/heads/r??
+  - refs/heads/r???
+---
+depends_on:
+- docker-ci-tools-amd64
+- docker-ci-tools-arm64
+kind: pipeline
+name: manifest-ci-tools
+platform:
+  arch: amd64
+  os: linux
+steps:
+- commands:
+  - apk --update --no-cache add bash
+  - git fetch origin --tags
+  - echo $(./tools/image-tag) > .tags
+  image: alpine/git:v2.30.2
+  name: image-tag
+- image: plugins/manifest:1.4.0
+  name: manifest-tempo-ci-tools
+  settings:
+    password:
+      from_secret: docker_password
+    spec: .drone/docker-manifest.tmpl
+    target: tempo-ci-tools
+    username:
+      from_secret: docker_username
+trigger:
+  ref:
+  - refs/heads/main
+  - refs/tags/v*
+  - refs/heads/r?
+  - refs/heads/r??
+  - refs/heads/r???
+---
 depends_on:
 - manifest
 image_pull_secrets:
@@ -238,7 +342,7 @@ steps:
   - cd ./cmd/tempo-serverless
   - make build-docker-gcr-binary
   - make build-lambda-zip
-  image: golang:1.20.4-alpine
+  image: golang:1.21.3-alpine
   name: build-tempo-serverless
 - image: plugins/gcr
   name: deploy-tempo-serverless-gcr
@@ -308,15 +412,15 @@ steps:
     NFPM_SIGNING_KEY:
       from_secret: gpg_private_key
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20.4
+  image: golang:1.21.3
   name: write-key
 - commands:
   - make release-snapshot
   environment:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20.4
+  image: golang:1.21.3
   name: test release
 - commands:
   - ./tools/packaging/verify-deb-install.sh
@@ -342,7 +446,7 @@ steps:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20.4
+  image: golang:1.21.3
   name: release
   when:
     event:
@@ -426,6 +530,6 @@ kind: secret
 name: gpg_passphrase
 ---
 kind: signature
-hmac: beb2593e403f909da214e906b27317f8df0ed24dea4d98d04ba27e985b1ea701
+hmac: fd0d2fe13ee75cfc3a721fee180a293121c8aad04419e22e47e16793b45a2e33
 
 ...
diff --git a/.errcheck-exclude.txt b/.errcheck-exclude.txt
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "grafana/grafana-github-actions"
           path: ./actions