Skip to content

Commit

Permalink
Merge branch 'task/2073-dotnet' of github.com:iblancasa/opentelemetry…
Browse files Browse the repository at this point in the history
…-operator into task/2073-dotnet
  • Loading branch information
iblancasa committed Sep 14, 2023
2 parents a84382f + 916bf99 commit 58e9119
Show file tree
Hide file tree
Showing 38 changed files with 221 additions and 342 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ change_type: enhancement
component: autoinstrumentation

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Bump dotnet instrumentation version to 1.0.0
note: Bump Go auto-instrumentation support to v0.3.0-alpha.

# One or more tracking issues related to the change
issues: [2096]
issues: [2123]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
16 changes: 0 additions & 16 deletions .chloggen/fix-otel-collector-service-reconciliation.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .chloggen/kube128.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .chloggen/limit-volume-inst.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .chloggen/route-grpc.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .chloggen/route-use-defaults.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
jobs:
unit-tests:
name: Unit tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Set up Go
uses: actions/setup-go@v3
Expand All @@ -28,7 +28,7 @@ jobs:

lint:
name: Code standards (linting)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Set up Go
uses: actions/setup-go@v4
Expand All @@ -52,7 +52,7 @@ jobs:

security:
name: Security
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
e2e-tests:
name: End-to-end tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
run: make e2e-log-operator KUBE_VERSION=$KUBE_VERSION

e2e-tests-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always()
needs: [e2e-tests]
steps:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-autoinstrumentation-apache-httpd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand All @@ -29,17 +29,17 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-apache-httpd
tags: |
type=match,pattern=v(.*),group=1,value=v${{ env.VERSION }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -50,14 +50,14 @@ jobs:
${{ runner.os }}-buildx-
- name: Login to GitHub Package Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: autoinstrumentation/apache-httpd
platforms: linux/amd64
Expand All @@ -66,4 +66,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
14 changes: 7 additions & 7 deletions .github/workflows/publish-autoinstrumentation-dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand All @@ -29,7 +29,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
otel/autoinstrumentation-dotnet
Expand All @@ -38,10 +38,10 @@ jobs:
type=match,pattern=v(.*),group=1,value=v${{ env.VERSION }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -52,22 +52,22 @@ jobs:
${{ runner.os }}-buildx-
- name: Log into Docker.io
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.event_name == 'push' }}
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Login to GitHub Package Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.event_name == 'push' }}
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: autoinstrumentation/dotnet
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-autoinstrumentation-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

jobs:
publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
otel/autoinstrumentation-java
Expand All @@ -39,10 +39,10 @@ jobs:
type=match,pattern=v(.*),group=1,value=v${{ env.VERSION }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -53,22 +53,22 @@ jobs:
${{ runner.os }}-buildx-
- name: Log into Docker.io
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.event_name == 'push' }}
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Login to GitHub Package Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.event_name == 'push' }}
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: autoinstrumentation/java
platforms: linux/amd64,linux/arm64
Expand Down
Loading

0 comments on commit 58e9119

Please sign in to comment.