Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 57 additions & 32 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,76 @@ on:

env:
PROGRAM_NAME: otel
SPIN_VERSION: v2.6.0
jobs:
SPIN_VERSION: v3.2.0
jobs:
build:
name: Build plugin binaries
runs-on: ubuntu-latest
strategy:
matrix:
config:
# The architectures and operating systems accepted by Golang and the Pluginify tool are different for macos + arm64
- { goArch: "amd64", goOs: "linux", pluginifyArch: "amd64", pluginifyOs: linux}
- { goArch: "arm64", goOs: "linux", pluginifyArch: "aarch64", pluginifyOs: linux}
- { goArch: "amd64", goOs: "windows", pluginifyArch: "amd64", pluginifyOs: windows}
- { goArch: "arm64", goOs: "darwin", pluginifyArch: "amd64", pluginifyOs: macos}
- { goArch: "amd64", goOs: "darwin", pluginifyArch: "aarch64", pluginifyOs: macos}
- {
goArch: "amd64",
goOs: "linux",
pluginifyArch: "amd64",
pluginifyOs: linux,
}
- {
goArch: "arm64",
goOs: "linux",
pluginifyArch: "aarch64",
pluginifyOs: linux,
}
- {
goArch: "amd64",
goOs: "windows",
pluginifyArch: "amd64",
pluginifyOs: windows,
}
- {
goArch: "arm64",
goOs: "darwin",
pluginifyArch: "amd64",
pluginifyOs: macos,
}
- {
goArch: "amd64",
goOs: "darwin",
pluginifyArch: "aarch64",
pluginifyOs: macos,
}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: stable
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: stable

- name: Install Spin
uses: rajatjindal/setup-actions/spin@main
with:
version: ${{ env.SPIN_VERSION }}
- name: Install Spin
uses: rajatjindal/setup-actions/spin@main
with:
version: ${{ env.SPIN_VERSION }}

- name: Install Pluginify
run: spin plugins install --url https://github.com/itowlson/spin-pluginify/releases/download/canary/pluginify.json --yes
- name: Install Pluginify
run: spin plugins install --url https://github.com/itowlson/spin-pluginify/releases/download/canary/pluginify.json --yes

- name: Build Plugin Binary
run: GOOS=${{ matrix.config.goOs }} GOARCH=${{ matrix.config.goArch }} go build -o ${{ env.PROGRAM_NAME }} main.go
- name: Build Plugin Binary
run: GOOS=${{ matrix.config.goOs }} GOARCH=${{ matrix.config.goArch }} go build -o ${{ env.PROGRAM_NAME }} main.go

- name: Create Arch-Specific Plugin Manifest
run: spin pluginify --arch ${{ matrix.config.pluginifyArch }} --os ${{ matrix.config.pluginifyOs }}
- name: Create Arch-Specific Plugin Manifest
run: spin pluginify --arch ${{ matrix.config.pluginifyArch }} --os ${{ matrix.config.pluginifyOs }}

- name: Archive Binary and Manifest
uses: actions/upload-artifact@v4
with:
name: ${{ env.PROGRAM_NAME}}-${{ matrix.config.pluginifyOs }}-${{ matrix.config.pluginifyArch }}
path: |
*.tar.gz
*.json

- name: Archive Binary and Manifest
uses: actions/upload-artifact@v4
with:
name: ${{ env.PROGRAM_NAME}}-${{ matrix.config.pluginifyOs }}-${{ matrix.config.pluginifyArch }}
path: |
*.tar.gz
*.json

package:
name: Package Plugin
runs-on: ubuntu-latest
Expand Down Expand Up @@ -113,4 +138,4 @@ jobs:
if: github.ref == 'refs/heads/main'
run: gh release create ${{ env.RELEASE_VERSION }} --title "${{ env.RELEASE_VERSION }}" --prerelease --repo ${{ github.repository }} release-assets/*
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ github.token }}
2 changes: 1 addition & 1 deletion otel-config/compose.aspire.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
aspire-dashboard:
image: mcr.microsoft.com/dotnet/aspire-dashboard:8.1.0
image: mcr.microsoft.com/dotnet/aspire-dashboard:9.2.0
restart: always
environment:
- ASPIRE_ALLOW_UNSECURED_TRANSPORT=true
Expand Down
18 changes: 9 additions & 9 deletions otel-config/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.98.0
image: otel/opentelemetry-collector-contrib:0.127.0
restart: always
command:
- "--config=/etc/otel-collector-config.yaml"
Expand All @@ -26,9 +26,9 @@ services:
- "14268" # can accept spans directly from clients in jaeger.thrift format over binary thrift protocol

tempo:
image: grafana/tempo:2.4.1
image: grafana/tempo:2.7.2
command:
- '-config.file=/etc/tempo/config.yaml'
- "-config.file=/etc/tempo/config.yaml"
volumes:
- ./tempo.yaml:/etc/tempo/config.yaml
ports:
Expand All @@ -39,15 +39,15 @@ services:
image: prom/prometheus:latest
restart: always
command:
- '--config.file=/etc/prometheus/prometheus.yaml'
- '--web.enable-remote-write-receiver'
- "--config.file=/etc/prometheus/prometheus.yaml"
- "--web.enable-remote-write-receiver"
volumes:
- ./prometheus.yaml:/etc/prometheus/prometheus.yaml
ports:
- "9090:9090"

grafana:
image: grafana/grafana:10.4.2
image: grafana/grafana:12.0.1
ports:
- 5050:3000
volumes:
Expand All @@ -61,10 +61,10 @@ services:
- tempo

loki:
image: grafana/loki:2.9.8
image: grafana/loki:3.5.1
command:
- '-config.file=/etc/loki/config.yaml'
- "-config.file=/etc/loki/config.yaml"
volumes:
- ./loki.yaml:/etc/loki/config.yaml
ports:
- 3100:3100
- 3100:3100
12 changes: 6 additions & 6 deletions otel-config/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ server:

common:
path_prefix: /tmp/loki
storage:
filesystem:
chunks_directory: /tmp/loki/chunks
rules_directory: /tmp/loki/rules
replication_factor: 1
ring:
instance_addr: 127.0.0.1
Expand All @@ -18,12 +14,16 @@ common:
schema_config:
configs:
- from: 2020-09-07
store: boltdb-shipper
store: tsdb
object_store: filesystem
schema: v12
schema: v13
index:
prefix: loki_index_
period: 24h

storage_config:
filesystem:
directory: /tmp/loki/chunks

analytics:
reporting_enabled: false