From 2d5c7617dbfb11839934619905bd26110725ac5a Mon Sep 17 00:00:00 2001
From: prodion23 <donnie@traceable.ai>
Date: Fri, 11 Nov 2022 14:59:28 -0500
Subject: [PATCH] Update protobuf, dont replace proto in CI

---
 .github/workflows/merge.yml   | 2 +-
 .github/workflows/release.yml | 2 +-
 Makefile                      | 2 +-
 requirements.txt              | 2 +-
 setup.py                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index a8d24a8f..367ea953 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -52,7 +52,7 @@ jobs:
           protoc --version
           pip uninstall --yes protobuf python3-protobuf
           pip install --upgrade --no-input pip
-          pip install --upgrade --no-input protobuf==3.19.4
+          pip install --upgrade --no-input protobuf==3.19.6
 
       - name: Run unit tests
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ab08f76..4585265a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
           protoc --version
           pip uninstall --yes protobuf python3-protobuf
           pip install --no-input --upgrade pip
-          pip install --no-input --upgrade protobuf==3.19.4
+          pip install --no-input --upgrade protobuf==3.19.6
 
       - name: Build package
         run: make build
diff --git a/Makefile b/Makefile
index a0526b1f..2cb0e136 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ build-proto:
 		    ./src/agent-config/proto/hypertrace/agent/config/v1/config.proto
 
 .PHONY: build
-build: build-proto
+build:
 	python -m build
 
 .PHONY: clean
diff --git a/requirements.txt b/requirements.txt
index e3b1f432..3ae01bdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ opentelemetry-sdk==1.8.0
 opentelemetry-util-http==0.27b0
 google>=3.0.0
 pyyaml
-protobuf<=3.19.4
+protobuf<=3.19.6
 deprecated==1.2.12
diff --git a/setup.py b/setup.py
index 1a9de035..24477657 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@
         "deprecated==1.2.12",
         "google>=3.0.0",
         "pyyaml",
-        "protobuf<=3.19.4"
+        "protobuf<=3.19.6"
     ],
     entry_points = {
         'console_scripts': [