Merge branch 'main' into k8sprocessor-add-ignore-pod-names-as-parameter

CONTRIBUTING.md

@@ -8,10 +8,19 @@
 To contribute you will need to ensure you have the following setup:
 
 - working Go environment
+- installed `opentelemetry-collector-builder`
+
+  `opentelemetry-collector-builder` can be installed using following command:
+
+  ```bash
+  cd otelcolbuilder && \
+  sudo make install-builder BUILDER_BIN_PATH=/usr/local/bin/opentelemetry-collector-builder && \
+  cd ..
+  ```
 
 ## How to build
 
-```
+```bash
 $ cd otelcolbuilder && make build
 opentelemetry-collector-builder \
                 --config .otelcol-builder.yaml \
@@ -27,7 +36,7 @@ opentelemetry-collector-builder \
 In order to build for a different platform one can use `otelcol-sumo-${platform}_${arch}`
 make targets e.g.:
 
-```
+```bash
 $ cd otelcolbuilder && make otelcol-sumo-linux_arm64
 GOOS=linux   GOARCH=arm64 /Library/Developer/CommandLineTools/usr/bin/make build BINARY_NAME=otelcol-sumo-linux_arm64
 opentelemetry-collector-builder \

Dockerfile_dev

@@ -10,7 +10,7 @@ RUN apk --update add ca-certificates
 FROM alpine:3.15.0 as directories
 RUN mkdir /etc/otel/
 
-FROM golang:1.17.3
+FROM golang:1.17.4
 ARG BUILD_TAG=latest
 ENV TAG $BUILD_TAG
 ARG USER_UID=10001

Dockerfile_local

@@ -1,4 +1,4 @@
-FROM golang:1.17.3-alpine as builder
+FROM golang:1.17.4-alpine as builder
 ADD . /src
 WORKDIR /src/otelcolbuilder/
 ENV CGO_ENABLED=0