File tree Expand file tree Collapse file tree 1 file changed +24
-0
lines changed Expand file tree Collapse file tree 1 file changed +24
-0
lines changed Original file line number Diff line number Diff line change 38
38
</p>
39
39
40
40
---
41
+ # Airbnb-specific fork of the open-telemetry/opentelemetry-collector-contrib OSS repo.
42
+
43
+ As of 8/4/2022, changes are localized only to receiver/statsdreceiver.
44
+
45
+ ## To update the fork from upstream:
46
+ Prerequisites:
47
+ * Upstream set
48
+ * ` git remote add upstream https://github.com/open-telemetry/opentelemetry-collector-contrib.git `
49
+ * Local repo up to date
50
+ * ` git fetch --all --prune --jobs=10 `
51
+ * ` git pull `
52
+
53
+ Update fork:
54
+ * Check out main ` airbnb ` branch
55
+ * ` git checkout origin/airbnb `
56
+ * Apply airbnb commits on top of new release
57
+ * ` git rebase --onto <tag of new release> upstream/main `
58
+ * Create new branch and push for review
59
+ * ` git checkout -b <branch_name> `
60
+ * Push branch and open for review. Gain a PR approval and passing CI
61
+ * Force push commits from branch onto remote airbnb branch
62
+ * ` git push --force origin <branch_name>:airbnb `
63
+
64
+ ---
41
65
42
66
# OpenTelemetry Collector Contrib
43
67
You can’t perform that action at this time.
0 commit comments