Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix container image builds for http fault injector and otel collector #9096

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Fix container image builds for http fault injector and otel collector #9096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e8aaad
Fix container image builds for http fault injector and otel collector
benbp Oct 3, 2024
bd108fc
Got it working with the latest, and specifying a specific version of …
Oct 4, 2024
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
2 changes: 1 addition & 1 deletion ...fault-injector/Azure.Sdk.Tools.HttpFaultInjector/Azure.Sdk.Tools.HttpFaultInjector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<VersionPrefix>0.2.0</VersionPrefix>
Expand Down
4 changes: 2 additions & 2 deletions tools/http-fault-injector/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0
# fault injector requires .NET 6
FROM mcr.microsoft.com/dotnet/sdk:8.0
# fault injector requires .NET 8

ARG FAULT_INJECTOR_VERSION=""
ARG NUGET_SOURCE="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
Expand Down
4 changes: 2 additions & 2 deletions tools/stress-cluster/services/otelcollector/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 as build
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 as build
RUN apt update -y && apt upgrade -y && apt install -y build-essential git

# this lets us build a custom otel-collector image, with a minimal set of
# adapters, etc...
RUN go install go.opentelemetry.io/collector/cmd/builder@latest
RUN go install go.opentelemetry.io/collector/cmd/builder@v0.110.0
COPY ./otel-builder.yml /otel-builder.yml
# builds to /tmp/dist
RUN builder --config=/otel-builder.yml
Expand Down
16 changes: 10 additions & 6 deletions tools/stress-cluster/services/otelcollector/otel-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# This is used as an input to the `ocb` app that lets you build a customized OpenTelemetry collector,
# This is used as an input to the `ocb` app that lets you build a customized OpenTelemetry collector,
# as described here: https://opentelemetry.io/docs/collector/custom-collector/
dist:
name: otelcol-custom
description: Local OpenTelemetry Collector binary
output_path: /tmp/dist
otelcol_version: 0.96.0
otelcol_version: 0.110.0
providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0

exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.96.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.110.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.110.0